Commit083f864

minjk-bl

committed

Apps > Merge - prototype

1 parent6934c50 commit083f864Copy full SHA for 083f864

File tree

+604

-68

lines changed

+604

-68

lines changed

Lines changed: 23 additions & 0 deletions

Lines changed: 3 additions & 1 deletion

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,12 @@ def _vp_get_multi_columns_list(dfs = []):`
`51`	`51`	`"""`
`52`	`52`	`Get Columns List with Detail Information of multiple dataframe`
`53`	`53`	`"""`
`54`		`-common_set= {}`
`55`		`-fordfindfs:`
`56`		`-common_set=common_set&set(df)`
	`54`	`+iflen(dfs)<=0:`
	`55`	`+return []`
	`56`	`+`
	`57`	`+common_set=set(dfs[0].columns)`
	`58`	`+fordfindfs[1:]:`
	`59`	`+common_set=common_set&set(df.columns)`
`57`	`60`	`common_columns=list(common_set)`
`58`	`61`
`59`	`62`	`colList= []`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,6 @@ define([`
`358`	`358`	`page.appendLine('<div>');`
`359`	`359`	`page.appendFormatLine('<label for="{0}" class="{1}">{2}</label>','vp_gbAllocateTo','wp80','Allocate to');`
`360`	`360`	`page.appendFormatLine('<input type="text" id="{0}" placeholder="{1}"/>','vp_gbAllocateTo','New variable name');`
`361`		`-`
`362`	`361`	`page.appendLine('</div>');`
`363`	`362`
`364`	`363`	`page.appendLine('</div>');// end of df-box`
`@@ -663,6 +662,8 @@ define([`
`663`	`662`	`$(that._wrapSelector('#vp_gbBy')).val('');`
`664`	`663`	`$(that._wrapSelector('#vp_gbDisplay')).val('');`
`665`	`664`	`that.state.variable=newVal;`
	`665`	`+that.state.groupby=[];`
	`666`	`+that.state.display=[];`
`666`	`667`	`}`
`667`	`668`	`});`
`668`	`669`

Comments

(0)