Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc05176e

Browse files
author
minjk-bl
committed
Bind fix
1 parent3c98b18 commitc05176e

File tree

2 files changed

+30
-14
lines changed

2 files changed

+30
-14
lines changed

‎src/common/component/vpMultiSelector.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,14 @@ define([
233233
dataList&&dataList.forEach((data,idx)=>{
234234
// for column : data.array parsing
235235
varinfo=vpCommon.safeString(data.array);
236+
if(info){
237+
info=data.value+':\n';
238+
}else{
239+
info='';
240+
}
236241
// render item box
237242
tag.appendFormatLine('<div class="{0} {1}" data-idx="{2}" data-name="{3}" data-type="{4}" data-code="{5}" title="{6}"><span>{7}</span></div>'
238-
,APP_SELECT_ITEM,APP_DRAGGABLE,data.location,data.value,data.type,data.code,info?data.value+': \n'+info:'',data.value);
243+
,APP_SELECT_ITEM,APP_DRAGGABLE,data.location,data.value,data.type,data.code,info,data.value);
239244
});
240245
tag.appendLine('</div>');// APP_SELECT_BOX
241246
returntag.toString();
@@ -248,9 +253,14 @@ define([
248253
dataList&&dataList.forEach((data,idx)=>{
249254
// for column : data.array parsing
250255
varinfo=vpCommon.safeString(data.array);
256+
if(info){
257+
info=data.value+':\n';
258+
}else{
259+
info='';
260+
}
251261
// render item box
252262
tag.appendFormatLine('<div class="{0} {1} {2}" data-idx="{3}" data-name="{4}" data-type="{5}" data-code="{6}" title="{7}"><span>{8}</span></div>'
253-
,APP_SELECT_ITEM,APP_DRAGGABLE,'added',data.location,data.value,data.type,data.code,info?data.value+': \n'+info:'',data.value);
263+
,APP_SELECT_ITEM,APP_DRAGGABLE,'added',data.location,data.value,data.type,data.code,info,data.value);
254264
});
255265
tag.appendLine('</div>');// APP_SELECT_BOX
256266
returntag.toString();

‎src/common/vpBind.js‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ define([
7272
this.codepreview=undefined;
7373

7474
this.howList=[
75-
{label:'inner',value:'Inner'},
76-
{label:'outer',value:'Outer'},
77-
{label:'left',value:'Left'},
78-
{label:'right',value:'Right'},
79-
{label:'cross',value:'Cross'},
75+
{label:'Inner',value:'inner'},
76+
{label:'Outer',value:'outer'},
77+
{label:'Left',value:'left'},
78+
{label:'Right',value:'right'},
79+
{label:'Cross',value:'cross'},
8080
]
8181
}
8282

@@ -377,15 +377,15 @@ define([
377377
page.appendFormatLine('<input type="text" id="{0}" placeholder="{1}" disabled>','vp_bdLeftOn','Left key');
378378
page.appendFormatLine('<button id="{0}" class="{1}">{2}</button>','vp_bdLeftOnSelect','vp-button wp50','Edit');
379379
// left use index
380-
page.appendFormatLine('<label><input type="checkbox"/><span>{1}</span></label>','vp_bdRightIndex','use index');
380+
page.appendFormatLine('<label><input type="checkbox"/><span>{1}</span></label>','vp_bdLeftIndex','use index');
381381
page.appendLine('</div>');
382382
// right on
383383
page.appendLine('<div>');
384384
page.appendFormatLine('<label for="{0}" class="{1}">{2}</label>','vp_bdRightOn','wp100','Right on');
385385
page.appendFormatLine('<input type="text" id="{0}" placeholder="{1}" disabled>','vp_bdRightOn','Right key');
386386
page.appendFormatLine('<button id="{0}" class="{1}">{2}</button>','vp_bdRightOnSelect','vp-button wp50','Edit');
387387
// right use index
388-
page.appendFormatLine('<label><input type="checkbox"/><span>{1}</span></label>','vp_bdLeftIndex','use index');
388+
page.appendFormatLine('<label><input type="checkbox"/><span>{1}</span></label>','vp_bdRightIndex','use index');
389389
page.appendLine('</div>');
390390
// suffixes
391391
page.appendLine('<div>');
@@ -467,7 +467,7 @@ define([
467467

468468
/**
469469
* Open Inner popup page for column selection
470-
*@param {string} targetVariable
470+
*@param {Array<string>} targetVariable
471471
*@param {Object} targetSelector
472472
*@param {string} title
473473
*/
@@ -481,7 +481,7 @@ define([
481481

482482
this.popup.MultiSelector=newvpMultiSelector(
483483
this._wrapSelector('.'+APP_POPUP_BODY),
484-
{mode:'columns',parent:[targetVariable],selectedList:previousList}
484+
{mode:'columns',parent:targetVariable,selectedList:previousList}
485485
);
486486

487487
// set title
@@ -660,7 +660,7 @@ define([
660660

661661
// on change event
662662
$(document).on('change',this._wrapSelector('#vp_bdOn'),function(event){
663-
varcolList=event.colList;
663+
varcolList=event.dataList;
664664
that.state.merge.on=colList;
665665

666666
if(colList&&colList.length>0){
@@ -680,7 +680,7 @@ define([
680680

681681
// Left on change event
682682
$(document).on('change',this._wrapSelector('#vp_bdLeftOn'),function(event){
683-
varcolList=event.colList;
683+
varcolList=event.dataList;
684684
that.state.merge.left.on=colList;
685685

686686
if((colList&&colList.length>0)
@@ -711,7 +711,7 @@ define([
711711

712712
// Right on change event
713713
$(document).on('change',this._wrapSelector('#vp_bdRightOn'),function(event){
714-
varcolList=event.colList;
714+
varcolList=event.dataList;
715715
that.state.merge.right.on=colList;
716716

717717
if((colList&&colList.length>0)
@@ -896,6 +896,9 @@ define([
896896
code.appendFormat('pd.{0}(',type);
897897

898898
if(type=='concat'){
899+
//====================================================================
900+
// Concat
901+
//====================================================================
899902
// FIXME: consider default
900903
code.appendFormat("[{0}], join='{1}', axis={2}",concat.variable.map(data=>data.code).join(','),concat.join,concat.axis);
901904

@@ -915,6 +918,9 @@ define([
915918

916919
code.append(')');
917920
}else{
921+
//====================================================================
922+
// Merge
923+
//====================================================================
918924
code.appendFormat('{0}, {1}',merge.left.variable,merge.right.variable);
919925

920926
if(merge.on&&merge.on.length>0){

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp