Commitb136d12

minjk-bl

committed

Edit Frame, Subset app to support DataSelector on allocating variable

1 parentfce2b63 commitb136d12Copy full SHA for b136d12

File tree

+24

-6

lines changed

+24

-6

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ define([`
`20`	`20`	`'vp_base/js/com/com_util',`
`21`	`21`	`'vp_base/js/com/component/PopupComponent',`
`22`	`22`	`'vp_base/js/com/component/SuggestInput',`
`23`		`-'vp_base/js/com/component/VarSelector',`
	`23`	`+'vp_base/js/com/component/DataSelector',`
`24`	`24`	`'vp_base/js/m_apps/Subset'`
`25`		`-],function(frameHtml,frameCss,com_Const,com_String,com_util,PopupComponent,SuggestInput,VarSelector,Subset){`
	`25`	`+],function(frameHtml,frameCss,com_Const,com_String,com_util,PopupComponent,SuggestInput,DataSelector,Subset){`
`26`	`26`
`27`	`27`	`/**`
`28`	`28`	`* Frame`
`@@ -516,7 +516,14 @@ define([`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`templateForBody(){`
`519`		`-returnframeHtml;`
	`519`	`+letpage=$(frameHtml);`
	`520`	`+`
	`521`	`+letallocateSelector=newDataSelector({`
	`522`	`+pageThis:this,id:'vp_feReturn',placeholder:'Variable name',required:true,value:'_vp'`
	`523`	`+});`
	`524`	`+$(page).find('#vp_feReturn').replaceWith(allocateSelector.toTagString());`
	`525`	`+`
	`526`	`+returnpage;`
`520`	`527`	`}`
`521`	`528`
`522`	`529`	`render(){`

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ define([`
`21`	`21`	`'vp_base/js/com/component/PopupComponent',`
`22`	`22`	`'vp_base/js/com/component/SuggestInput',`
`23`	`23`	`'vp_base/js/com/component/VarSelector',`
`24`		`-'vp_base/js/com/component/MultiSelector'`
`25`		`-],function(subsetHtml,subsetCss,com_Const,com_String,com_util,PopupComponent,SuggestInput,VarSelector,MultiSelector){`
	`24`	`+'vp_base/js/com/component/DataSelector'`
	`25`	`+],function(subsetHtml,subsetCss,com_Const,com_String,com_util,PopupComponent,SuggestInput,VarSelector,DataSelector){`
`26`	`26`
`27`	`27`	`/**`
`28`	`28`	`* Subset`
`@@ -142,7 +142,18 @@ define([`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`templateForBody(){`
`145`		`-returnsubsetHtml;`
	`145`	`+letpage=$(subsetHtml);`
	`146`	`+`
	`147`	`+letthat=this;`
	`148`	`+letallocateSelector=newDataSelector({`
	`149`	`+pageThis:this,id:'allocateTo',classes:VP_DS_ALLOCATE_TO,placeholder:'New variable name',required:true,`
	`150`	`+finish:function(){`
	`151`	`+that.generateCode();`
	`152`	`+}`
	`153`	`+});`
	`154`	`+$(page).find('.'+VP_DS_ALLOCATE_TO).replaceWith(allocateSelector.toTagString());`
	`155`	`+`
	`156`	`+returnpage;`
`146`	`157`	`}`
`147`	`158`	`templateForDataView(){`
`148`	`159`	`lettag=newcom_String();`

Comments

(0)