NotificationsYou must be signed in to change notification settings
Fork118
Star915

Commitfda8a13

minjk-bl

committed

Apps > Merge -> Apps > Bind - app name changed

1 parent0367d92 commitfda8a13Copy full SHA for fda8a13

File tree

6 files changed

+118

-118

lines changed

css/common
- bind.css
resource/apps
- apps_bind.svg
src
- api_block
- common
  - vpBind.js

6 files changed

+118

-118

lines changed

`‎css/common/merge.css‎renamed to ‎css/common/bind.css‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,27 @@`
`1`		`-.vp-mg-container {`
	`1`	`+.vp-bd-container {`
`2`	`2`	`width:700px;`
`3`	`3`	`height:550px;`
`4`	`4`	`}`
`5`	`5`
`6`		`-.vp-mg-container .vp-pp-body {`
	`6`	`+.vp-bd-container .vp-pp-body {`
`7`	`7`	`overflow: hidden;`
`8`	`8`	`}`
`9`	`9`
`10`		`-.vp-mg-df-box {`
	`10`	`+.vp-bd-df-box {`
`11`	`11`	`display: grid;`
`12`	`12`	`grid-template-rows:30px;`
`13`	`13`	`grid-row-gap:5px;`
`14`	`14`	`}`
`15`	`15`
`16`		`-.vp-mg-df-refresh {`
	`16`	`+.vp-bd-df-refresh {`
`17`	`17`	`display: inline-block;`
`18`	`18`	`cursor: pointer;`
`19`	`19`	`margin-left:5px;`
`20`	`20`	`}`
`21`		`-.vp-mg-df-boxlabel {`
	`21`	`+.vp-bd-df-boxlabel {`
`22`	`22`	`font-weight: bold;`
`23`	`23`	`}`
`24`		`-.vp-mg-df-boxselect,`
`25`		`-.vp-mg-df-boxinput {`
	`24`	`+.vp-bd-df-boxselect,`
	`25`	`+.vp-bd-df-boxinput {`
`26`	`26`	`width:160px;`
`27`	`27`	`}`

`‎resource/apps/apps_merge.svg‎renamed to ‎resource/apps/apps_bind.svg‎`

File renamed without changes.

`‎src/api_block/constData.js‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -811,11 +811,11 @@ define([`
`811`	`811`	`color:2,`
`812`	`812`	`config:{width:'700px',height:'550px'}`
`813`	`813`	`},`
`814`		`-'merge':{`
`815`		`-label:'Merge',`
`816`		`-tooltip:'Work In Progress',// FIXME:`
`817`		`-file:'nbextensions/visualpython/src/common/vpMerge',`
`818`		`-icon:'/nbextensions/visualpython/resource/apps/apps_merge.svg',`
	`814`	`+'bind':{`
	`815`	`+label:'Bind',`
	`816`	`+tooltip:'Bind pandas objects',`
	`817`	`+file:'nbextensions/visualpython/src/common/vpBind',`
	`818`	`+icon:'/nbextensions/visualpython/resource/apps/apps_bind.svg',`
`819`	`819`	`color:3,`
`820`	`820`	`},`
`821`	`821`	`'reshape':{`

`‎src/api_block/createAppsBtn.js‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ define([`
`95`	`95`	`case'profiling':`
`96`	`96`	`case'pdf':`
`97`	`97`	`case'groupby':`
`98`		`-case'merge':`
	`98`	`+case'bind':`
`99`	`99`	`case'reshape':`
`100`	`100`	`blockContainer.setSelectBlock(null);`
`101`	`101`	`blockContainer.createAppsPage(menu,file,config);`

`‎src/api_block/init.js‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ define([`
`130`	`130`	`/** Apps menu 생성 */`
`131`	`131`	`varappsList=[`
`132`	`132`	`'import','file','variable','snippets','frame','subset','instance','groupby',`
`133`		`-'merge','reshape','chart','markdown','pdf','profiling'`
	`133`	`+'bind','reshape','chart','markdown','pdf','profiling'`
`134`	`134`	`];`
`135`	`135`	`appsList.forEach(menu=>{`
`136`	`136`	`varapp=newCreateAppsBtn(blockContainer,menu);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitfda8a13

File tree

6 files changed

6 files changed

`‎css/common/merge.css‎renamed to ‎css/common/bind.css‎`

`‎resource/apps/apps_merge.svg‎renamed to ‎resource/apps/apps_bind.svg‎`

`‎src/api_block/constData.js‎`

`‎src/api_block/createAppsBtn.js‎`

`‎src/api_block/init.js‎`

0 commit comments