NotificationsYou must be signed in to change notification settings
Fork118
Star915

Commit5571ddc

minjk-bl

committed

Fixed Load/Save operation for DataSelector, Seaborn, WordCloud

1 parent0792ab9 commit5571ddcCopy full SHA for 5571ddc

File tree

5 files changed

+210

-99

lines changed

css/component
- dataSelector.css
js
- com
  - com_generatorV2.js
  - component
    - DataSelector.js
- m_visualize
  - Seaborn.js
  - WordCloud.js

5 files changed

+210

-99

lines changed

`‎css/component/dataSelector.css‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@`
`9`	`9`	`right:25px;`
`10`	`10`	`cursor: pointer;`
`11`	`11`	`}`
`12`		`-.vp-ds-boxinput {`
	`12`	`+.vp-ds-boxinput.vp-ds-target {`
`13`	`13`	`padding-right:23px;`
`14`	`14`	`}`
`15`		`-.vp-ds-boxinput:disabled {`
	`15`	`+.vp-ds-boxinput.vp-ds-target:disabled {`
`16`	`16`	`background:var(--light-gray-color)!important;`
`17`	`17`	`cursor: not-allowed;`
`18`	`18`	`}`
`19`		`-.vp-ds-boxinput:disabled+ .vp-ds-filter {`
	`19`	`+.vp-ds-boxinput.vp-ds-target:disabled+ .vp-ds-filter {`
`20`	`20`	`cursor: not-allowed;`
`21`	`21`	`}`
`22`	`22`	`.vp-ds-item:hover {`

`‎js/com/com_generatorV2.js‎`

Lines changed: 8 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -654,26 +654,23 @@ define([`
`654`	`654`
`655`	`655`	`/**`
`656`	`656`	`* Bind columns source function`
`657`		`- *@param {string} selector thisWrapSelector`
`658`		`- *@param {object}target`
	`657`	`+ *@param {object} pageThis`
	`658`	`+ *@param {object}targetId`
`659`	`659`	`*@param {array} columnInputIdList`
`660`	`660`	`*@param {string} tagType input / select (tag type)`
`661`	`661`	`*@param {array/boolean} columnWithEmpty boolean array or value to decide whether select tag has empty space`
`662`	`662`	`*@param {array/boolean} columnWithIndex boolean array or value to decide whether select tag has index option`
`663`	`663`	`* Usage :`
`664`	`664`	`* $(document).on('change', this.wrapSelector('#dataframe_tag_id'), function() {`
`665`		`- * pdGen.vp_bindColumnSource(that.wrapSelector(), this, ['column_input_id'], 'select', [true, true, true]);`
	`665`	`+ * pdGen.vp_bindColumnSource(that, 'dataframe_tag_id', ['column_input_id'], 'select', [true, true, true]);`
`666`	`666`	`* });`
`667`	`667`	`*/`
`668`		`-varvp_bindColumnSource=function(selector,target,columnInputIdList,tagType="input",columnWithEmpty=false,columnWithIndex=false){`
`669`		`-varvarName='';`
`670`		`-if($(target).length>0){`
`671`		`-varName=$(target).val();`
`672`		`-}`
	`668`	`+varvp_bindColumnSource=function(pageThis,targetId,columnInputIdList,tagType="input",columnWithEmpty=false,columnWithIndex=false){`
	`669`	`+varvarName=pageThis.state[targetId];`
`673`	`670`	`if(varName===''){`
`674`	`671`	`// reset with no source`
`675`	`672`	`columnInputIdList&&columnInputIdList.forEach(columnInputId=>{`
`676`		`-letdefaultValue=$(selector+' #'+columnInputId).val();`
	`673`	`+letdefaultValue=pageThis.state[columnInputId];`
`677`	`674`	`if(defaultValue==null\|\|defaultValue==undefined){`
`678`	`675`	`defaultValue='';`
`679`	`676`	`}`
`@@ -735,7 +732,7 @@ define([`
`735`	`732`
`736`	`733`	`// columns using suggestInput`
`737`	`734`	`columnInputIdList&&columnInputIdList.forEach((columnInputId,idx)=>{`
`738`		`-letdefaultValue=$(selector+' #'+columnInputId).val();`
	`735`	`+letdefaultValue=pageThis.state[columnInputId];`
`739`	`736`	`if(defaultValue==null\|\|defaultValue==undefined){`
`740`	`737`	`defaultValue='';`
`741`	`738`	`}`
`@@ -771,7 +768,7 @@ define([`
`771`	`768`	`option.append(document.createTextNode(listVar.label));`
`772`	`769`	`$(tag).append(option);`
`773`	`770`	`});`
`774`		`-$(selector+'#'+columnInputId).replaceWith(function(){`
	`771`	`+$(pageThis.wrapSelector('#'+columnInputId)).replaceWith(function(){`
`775`	`772`	`return$(tag);`
`776`	`773`	`});`
`777`	`774`	`}`

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!

Commit5571ddc

File tree

5 files changed

5 files changed

`‎css/component/dataSelector.css‎`

`‎js/com/com_generatorV2.js‎`

0 commit comments