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

Commitb29d9df

Browse files
author
minjk-bl
committed
Subset - add all adding/deleting columns or indexes
1 parent3e2992a commitb29d9df

File tree

2 files changed

+52
-8
lines changed

2 files changed

+52
-8
lines changed

‎css/common/subsetEditor.css‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,16 +242,11 @@
242242
margin: auto;
243243
display: inherit;
244244
}
245-
.vp-ds-select-add-btn {
245+
.vp-ds-select-btn-boxbutton {
246246
height:24px;
247247
background:#FFFFFF;
248248
border:0.25px solid#E4E4E4;
249-
}
250-
.vp-ds-select-del-btn {
251-
height:24px;
252-
background:#FFFFFF;
253-
border:0.25px solid#E4E4E4;
254-
margin-top:5px;
249+
grid-row-gap:5px;
255250
}
256251
.vp-ds-btn-add-condition {
257252
width:95px;

‎src/common/vpSubsetEditor.js‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ define([
7272
constVP_DS_DRAGGABLE='vp-ds-draggable';
7373

7474
/** select btns */
75+
constVP_DS_SELECT_ADD_ALL_BTN='vp-ds-select-add-all-btn';
7576
constVP_DS_SELECT_ADD_BTN='vp-ds-select-add-btn';
7677
constVP_DS_SELECT_DEL_BTN='vp-ds-select-del-btn';
78+
constVP_DS_SELECT_DEL_ALL_BTN='vp-ds-select-del-all-btn';
7779

7880
/** slicing box */
7981
constVP_DS_SLICING_BOX='vp-ds-slicing-box';
@@ -509,8 +511,12 @@ define([
509511
tag.appendLine('</div>');// VP_DS_SELECT_LEFT
510512
// row select - buttons
511513
tag.appendFormatLine('<div class="{0}">',VP_DS_SELECT_BTN_BOX);
514+
tag.appendFormatLine('<button type="button" class="{0} {1}" title="{2}">{3}</button>'
515+
,VP_DS_SELECT_ADD_ALL_BTN,'select-row','Add all items','<img src="/nbextensions/visualpython/resource/arrow_right_double.svg"/></i>');
512516
tag.appendFormatLine('<button type="button" class="{0} {1}">{2}</button>',VP_DS_SELECT_ADD_BTN,'select-row','<img src="/nbextensions/visualpython/resource/arrow_right.svg"/>');
513517
tag.appendFormatLine('<button type="button" class="{0} {1}">{2}</button>',VP_DS_SELECT_DEL_BTN,'select-row','<img src="/nbextensions/visualpython/resource/arrow_left.svg"/>');
518+
tag.appendFormatLine('<button type="button" class="{0} {1}" title="{2}">{3}</button>'
519+
,VP_DS_SELECT_DEL_ALL_BTN,'select-row','Remove all items','<img src="/nbextensions/visualpython/resource/arrow_left_double.svg"/>');
514520
tag.appendLine('</div>');// VP_DS_SELECT_BTNS
515521
// row select - right
516522
tag.appendFormatLine('<div class="{0}">',VP_DS_SELECT_RIGHT);
@@ -612,8 +618,12 @@ define([
612618
tag.appendLine('</div>');// VP_DS_SELECT_LEFT
613619
// col select - buttons
614620
tag.appendFormatLine('<div class="{0}">',VP_DS_SELECT_BTN_BOX);
621+
tag.appendFormatLine('<button type="button" class="{0} {1}" title="{2}">{3}</button>'
622+
,VP_DS_SELECT_ADD_ALL_BTN,'select-col','Add all items','<img src="/nbextensions/visualpython/resource/arrow_right_double.svg"/></i>');
615623
tag.appendFormatLine('<button type="button" class="{0} {1}">{2}</button>',VP_DS_SELECT_ADD_BTN,'select-col','<img src="/nbextensions/visualpython/resource/arrow_right.svg"/></i>');
616624
tag.appendFormatLine('<button type="button" class="{0} {1}">{2}</button>',VP_DS_SELECT_DEL_BTN,'select-col','<img src="/nbextensions/visualpython/resource/arrow_left.svg"/>');
625+
tag.appendFormatLine('<button type="button" class="{0} {1}" title="{2}">{3}</button>'
626+
,VP_DS_SELECT_DEL_ALL_BTN,'select-col','Remove all items','<img src="/nbextensions/visualpython/resource/arrow_left_double.svg"/>');
617627
tag.appendLine('</div>');// VP_DS_SELECT_BTNS
618628
// col select - right
619629
tag.appendFormatLine('<div class="{0}">',VP_DS_SELECT_RIGHT);
@@ -1320,8 +1330,10 @@ define([
13201330
$(document).off('change',this.wrapSelector('.select-row .'+VP_DS_SELECT_SEARCH));
13211331
$(document).off('change',this.wrapSelector('.select-col .'+VP_DS_SELECT_SEARCH));
13221332
$(document).off('click',this.wrapSelector('.'+VP_DS_SELECT_ITEM));
1333+
$(document).off('click',this.wrapSelector('.'+VP_DS_SELECT_ADD_ALL_BTN));
13231334
$(document).off('click',this.wrapSelector('.'+VP_DS_SELECT_ADD_BTN));
13241335
$(document).off('click',this.wrapSelector('.'+VP_DS_SELECT_DEL_BTN));
1336+
$(document).off('click',this.wrapSelector('.'+VP_DS_SELECT_DEL_ALL_BTN));
13251337
$(document).off('click',this.wrapSelector('.vp-add-col'));
13261338
$(document).off('click',this.wrapSelector('.vp-del-col'));
13271339
$(document).off('change',this.wrapSelector('.vp-ds-slicing-box input[type="text"]'));
@@ -1653,6 +1665,21 @@ define([
16531665
}
16541666
});
16551667

1668+
// item indexing - add all
1669+
$(document).on('click',this.wrapSelector('.'+VP_DS_SELECT_ADD_ALL_BTN),function(event){
1670+
varitemType=$(this).hasClass('select-row')?'row':'col';
1671+
varselector='.select-'+itemType;
1672+
1673+
$(that.wrapSelector('.'+VP_DS_SELECT_BOX+'.left .'+VP_DS_SELECT_ITEM+selector)).appendTo(
1674+
$(that.wrapSelector(selector+' .'+VP_DS_SELECT_BOX+'.right'))
1675+
);
1676+
$(that.wrapSelector(selector+' .'+VP_DS_SELECT_BOX+' .'+VP_DS_SELECT_ITEM)).addClass('added');
1677+
$(that.wrapSelector('.'+VP_DS_SELECT_ITEM+'.selected')).removeClass('selected');
1678+
that.state[itemType+'Pointer']={start:-1,end:-1};
1679+
1680+
that.generateCode();
1681+
});
1682+
16561683
// item indexing - add
16571684
$(document).on('click',this.wrapSelector('.'+VP_DS_SELECT_ADD_BTN),function(event){
16581685
varitemType=$(this).hasClass('select-row')?'row':'col';
@@ -1691,6 +1718,28 @@ define([
16911718
that.generateCode();
16921719
});
16931720

1721+
// item indexing - del all
1722+
$(document).on('click',this.wrapSelector('.'+VP_DS_SELECT_DEL_ALL_BTN),function(event){
1723+
varitemType=$(this).hasClass('select-row')?'row':'col';
1724+
varselector='.select-'+itemType;
1725+
1726+
vartargetBoxQuery=that.wrapSelector(selector+' .'+VP_DS_SELECT_BOX+'.left');
1727+
$(that.wrapSelector(selector+' .'+VP_DS_SELECT_ITEM)).appendTo(
1728+
$(targetBoxQuery)
1729+
);
1730+
// sort
1731+
$(targetBoxQuery+' .'+VP_DS_SELECT_ITEM).sort(function(a,b){
1732+
return($(b).data('idx'))<($(a).data('idx')) ?1 :-1;
1733+
}).appendTo(
1734+
$(targetBoxQuery)
1735+
);
1736+
$(that.wrapSelector(selector+' .'+VP_DS_SELECT_ITEM)).removeClass('added');
1737+
$(that.wrapSelector(selector+' .'+VP_DS_SELECT_ITEM)).removeClass('selected');
1738+
that.state[itemType+'Pointer']={start:-1,end:-1};
1739+
1740+
that.generateCode();
1741+
});
1742+
16941743
// row-column condition add
16951744
$(document).on('click',this.wrapSelector('.vp-add-col'),function(event){
16961745
that.handleColumnAdd();
@@ -2122,7 +2171,7 @@ define([
21222171
varrowList=[];
21232172
for(vari=0;i<rowTags.length;i++){
21242173
varrowValue=$(rowTags[i]).data('code');
2125-
if(rowValue){
2174+
if(rowValue!=undefined){
21262175
rowList.push(rowValue);
21272176
}
21282177
}

0 commit comments

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