Commit303c112

authored

Merge pull request#257 from Minku-Koo/devops

Fixed#256 : [BUG] Scrolling Issue with iloc in Subset App

2 parentsfca3d9b +e7565a1 commit303c112Copy full SHA for 303c112

File tree

+16

-8

lines changed

+16

-8

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -610,10 +610,14 @@ define([`
`610`	`610`	`@param {} dataframe`
`611`	`611`	`*@returns`
`612`	`612`	`*/`
`613`		`-getRowList(dataframe){`
	`613`	`+getRowList(dataframe,start_idx){`
`614`	`614`	`varthat=this;`
	`615`	`+if(typeofstart_idx==='undefined'){`
	`616`	`+start_idx=0;`
	`617`	`+}`
	`618`	`+`
`615`	`619`	`returnnewPromise(function(resolve,reject){`
`616`		`-that.execute(com_util.formatString('_vp_print(_vp_get_rows_list({0}))',dataframe))`
	`620`	`+that.execute(com_util.formatString('_vp_print(_vp_get_rows_list({0}, {1}))',dataframe,start_idx))`
`617`	`621`	`.then(function(resultObj){`
`618`	`622`	`resolve(resultObj);`
`619`	`623`	`}).catch(function(err){`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -343,10 +343,13 @@ define([`
`343`	`343`	`$(this.wrapSelector('.select-row .vp-ds-select-box.left')).on('scroll',function(){`
`344`	`344`	`if($(this).scrollTop()+$(this).innerHeight()>=($(this)[0].scrollHeight-2)){`
`345`	`345`	`letscrollPos=$(this).scrollTop();`
	`346`	`+if(that.state.rowLimit>that.state.rowList.length){`
	`347`	`+return;// Prevents scroll from being fixed downwards`
	`348`	`+}`
`346`	`349`	`letstart=that.state.rowLimit;`
`347`	`350`	`letend=start+10;`
`348`	`351`	`letsubsetVariable=com_util.formatString('{0}.iloc[{1}:{2}]',that.state.pandasObject,start,end);`
`349`		`-vpKernel.getRowList(subsetVariable).then(function(resultObj){`
	`352`	`+vpKernel.getRowList(subsetVariable,start).then(function(resultObj){`
`350`	`353`	`let{ result}=resultObj;`
`351`	`354`	`var{list:rowList}=JSON.parse(result);`
`352`	`355`	`rowList=rowList.map(function(x){`
`@@ -361,9 +364,9 @@ define([`
`361`	`364`	`rowList=rowList.map(function(x){`
`362`	`365`	`return{`
`363`	`366`	`...x,`
`364`		`-label:x.location+'',`
`365`		`-value:x.location+'',`
`366`		`-code:x.location+'',`
	`367`	`+label:x.label+'',`
	`368`	`+value:x.value+'',`
	`369`	`+code:x.code+'',`
`367`	`370`	`};`
`368`	`371`	`});`
`369`	`372`	`}`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,16 @@`
`11`	`11`	`# from IPython.core.display is deprecated since IPython 7.14`
`12`	`12`	`fromIPython.displayimportdisplay`
`13`	`13`
`14`		`-def_vp_get_rows_list(df):`
	`14`	`+def_vp_get_rows_list(df,start_idx=0):`
`15`	`15`	`"""`
`16`	`16`	`Get Rows List with Detail Information`
`17`	`17`	`"""`
`18`	`18`	`rowInfo= {'name':df.index.name,'level':df.index.nlevels,'list': [] }`
`19`	`19`	`indexType=str(df.index.dtype)`
`20`	`20`	`# make dict for rows info`
`21`	`21`	`fori,rinenumerate(df.index):`
`22`		`-rInfo= {'label':r,'value':r,'location':i }`
	`22`	`+rInfo= {'label':r,'value':r,'location':start_idx+i }`
	`23`	`+`
`23`	`24`	`# value`
`24`	`25`	`iftype(r).__name__=='str':`
`25`	`26`	`rInfo['value']="'{}'".format(r)`

Comments

(0)