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

Commit36e2c88

Browse files
authored
Merge pull request#195 from minjk-bl/devops
Devops for v2.3.2
2 parents4e61297 +9454bc0 commit36e2c88

File tree

10 files changed

+4698
-4585
lines changed

10 files changed

+4698
-4585
lines changed

‎jupyterlab/package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎jupyterlab/yarn.lock‎

Lines changed: 4592 additions & 4568 deletions
Large diffs are not rendered by default.

‎visualpython/css/component/dataSelector.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@
9595
.vp-ds-df-option-box {
9696
height:100%;
9797
}
98-
.vp-ds-df-multiselector {
98+
.vp-ds-df-multiselector,
99+
.vp-ds-df-index-box {
99100
height:calc(100%-25px);
100101
}
101102
.vp-nd-row-box,

‎visualpython/css/component/multiSelector.css‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,21 @@
6262
background:#FFFFFF;
6363
border:0.25px solid#E4E4E4;
6464
border-radius:3px;
65+
cursor: pointer;
6566
}
6667
.vp-cs-select-btn-boxbutton:not(:nth-child(1)) {
6768
margin-top:5px;
6869
}
6970
.vp-cs-select-btn-boxbutton:hover {
7071
background:#F8F8F8;
72+
}
73+
.vp-cs-add-item-name {
74+
padding-right:25px;
75+
}
76+
.vp-cs-add-item-btn {
77+
display: inline-block;
78+
position: absolute;
79+
right:35px;
80+
bottom:63px;
81+
cursor: pointer;
7182
}

‎visualpython/css/mainFrame.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ div#vp_wrapper.colab * {
5656
height:100%!important;
5757
min-width:273px!important;
5858
}
59+
#vp_wrapper.lab* {
60+
box-sizing: border-box!important;
61+
}
5962

6063
/* resizing handle */
6164
#vp_wrapper> .ui-resizable-handle {

‎visualpython/html/component/dataSelector.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
</div>
2222
</div>
23-
<hrstyle="margin: 0px;"/>
2423
<divclass="vp-ds-option-box">
2524
<labelclass="vp-bold">Option Page</label>
2625
<divclass="vp-ds-option-inner-box">

‎visualpython/js/com/component/DataSelector.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ define([
368368
<div class="vp-ds-df-multiselector"${this.state.useIndex===true?'style="display:none;"':''}>
369369
</div>
370370
<div class="vp-ds-df-index-box"${this.state.useIndex===false?'style="display:none;"':''}>
371-
<div><label>Index selected.</label>
371+
<div><label>Index selected.</label>
372372
<div class="vp-cs-select-container no-selection">
373373
<div class="vp-cs-select-left">
374374
<input type="text" class="vp-input wp100" placeholder="Search" value="" readonly>
@@ -384,9 +384,9 @@ define([
384384
-->
385385
<!-- LAB: img to url -->
386386
<button type="button" class="vp-cs-select-add-all-btn" title="Add all items"><div class="vp-icon-arrow-right-double"></div></button>
387-
<button type="button"x x-first x-last"> vp-icon-arrow-right" title="Add selected items"><div></div></button>
388-
<button type="button"x x-first x-last"> vp-icon-arrow-left" title="Remove selected items"><div></div></button>
389-
<button type="button"x x-first x-last"> vp-icon-arrow-left-double" title="Remove all items"><div></div></button>
387+
<button type="button" title="Add selected items"><div></div></button>
388+
<button type="button" title="Remove selected items"><div></div></button>
389+
<button type="button" title="Remove all items"><div></div></button>
390390
</div>
391391
<div class="vp-cs-select-right">
392392
<div class="vp-cs-select-box right vp-cs-droppable no-selection vp-scrollbar ui-droppable">
@@ -548,7 +548,7 @@ define([
548548
$(this.wrapSelector('.vp-ds-option-inner-box')).html(this.templateForMultiSelector());
549549
// column selecting
550550
this._columnSelector=newMultiSelector(this.wrapSelector('.vp-ds-df-multiselector'),
551-
{mode:'columns',parent:[data],selectedList:this.state.indexing}
551+
{mode:'columns',parent:[data],selectedList:this.state.indexing,allowAdd:true}
552552
);
553553

554554
// bind event

‎visualpython/js/com/component/MultiSelector.js‎

Lines changed: 78 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ define([
5050
/**
5151
*
5252
*@param {string} frameSelector query for parent component
53-
*@param {Object} config parent:[], selectedList=[], includeList=[]
53+
*@param {Object} config parent:[], selectedList=[], includeList=[], excludeList=[], allowAdd=true/false
5454
*/
5555
constructor(frameSelector,config){
5656
super(frameSelector,config,{});
@@ -62,12 +62,13 @@ define([
6262
// configuration
6363
this.config=this.state;
6464

65-
var{ mode, type, parent, dataList=[], selectedList=[], includeList=[], excludeList=[]}=this.config;
65+
var{ mode, type, parent, dataList=[], selectedList=[], includeList=[], excludeList=[], allowAdd=false}=this.config;
6666
this.mode=mode;// variable / columns / index / ndarray0 / ndarray1 / methods / data(given data)
6767
this.parent=parent;
6868
this.selectedList=selectedList;
6969
this.includeList=includeList;
7070
this.excludeList=excludeList;
71+
this.allowAdd=allowAdd;
7172

7273
this.dataList=dataList;// [ { value, code, type }, ... ]
7374
this.pointer={start:-1,end:-1};
@@ -305,6 +306,11 @@ define([
305306
tag.appendFormatLine('<div class="{0}">',APP_SELECT_RIGHT);
306307
varselectedList=this.dataList.filter(data=>that.selectedList.includes(data.code));
307308
tag.appendLine(this.renderSelectedBox(selectedList));
309+
if(this.allowAdd){
310+
// add item
311+
tag.appendLine('<input type="text" class="vp-cs-add-item-name vp-input wp100" placeholder="New item to add" value="">');
312+
tag.appendLine('<div class="vp-cs-add-item-btn vp-icon-plus"></div>');
313+
}
308314
tag.appendLine('</div>');// APP_SELECT_RIGHT
309315
tag.appendLine('</div>');// APP_SELECT_CONTAINER
310316
returntag.toString();
@@ -360,7 +366,7 @@ define([
360366
varaddedTags=$(that.wrapSelector('.'+APP_SELECT_RIGHT+' .'+APP_SELECT_ITEM+'.added'));
361367
varaddedList=[];
362368
for(vari=0;i<addedTags.length;i++){
363-
varvalue=$(addedTags[i]).attr('data-colname');
369+
varvalue=$(addedTags[i]).attr('data-name');
364370
addedList.push(value);
365371
}
366372
varfilteredList=that.dataList.filter(x=>x.value.includes(searchValue)&&!addedList.includes(x.value));
@@ -488,6 +494,75 @@ define([
488494
$(that.wrapSelector('.'+APP_SELECT_ITEM+'.selected')).removeClass('selected');
489495
that.pointer={start:-1,end:-1};
490496
});
497+
498+
// add new item
499+
$(this.wrapSelector('.vp-cs-add-item-btn')).on('click',function(event){
500+
letnewItemName=$(that.wrapSelector('.vp-cs-add-item-name')).val();
501+
that._addNewItem(newItemName);
502+
});
503+
// add new item (by pushing enter key)
504+
$(this.wrapSelector('.vp-cs-add-item-name')).on('keyup',function(event){
505+
varkeycode=event.keyCode
506+
?event.keyCode
507+
:event.which;
508+
if(keycode==13){// enter
509+
letnewItemName=$(this).val();
510+
that._addNewItem(newItemName);
511+
}
512+
});
513+
}
514+
515+
_addNewItem(newItemName){
516+
if(newItemName&&newItemName!==''){
517+
// check if it is already exist
518+
// - if it is already added, just select that item
519+
// get added items
520+
varaddedTags=$(this.wrapSelector('.'+APP_SELECT_RIGHT+' .'+APP_SELECT_ITEM+'.added'));
521+
varaddedList=[];
522+
for(vari=0;i<addedTags.length;i++){
523+
varvalue=$(addedTags[i]).attr('data-name');
524+
addedList.push(value);
525+
}
526+
if(addedList.includes(newItemName)){
527+
// just select that item and do nothing
528+
vartargetTag=$(this.wrapSelector(`.vp-cs-select-item.added[data-name="${newItemName}"]`));
529+
this.pointer={start:targetTag.index(),end:-1};
530+
// un-select others
531+
$(this.wrapSelector('.'+APP_SELECT_ITEM)).removeClass('selected');
532+
targetTag.addClass('selected');
533+
return;
534+
}
535+
varfilteredList=this.dataList.filter(x=>x.value===newItemName);
536+
if(filteredList.length>0){
537+
// already exist -> move it to selected-box
538+
vartargetTag=$(this.wrapSelector(`.vp-cs-select-item[data-name="${newItemName}"]`));
539+
$(targetTag).appendTo(
540+
$(this.wrapSelector('.'+APP_SELECT_BOX+'.right'))
541+
);
542+
this.pointer={start:targetTag.index(),end:-1};
543+
// un-select others
544+
$(this.wrapSelector('.'+APP_SELECT_ITEM)).removeClass('selected');
545+
targetTag.addClass('added');
546+
targetTag.addClass('selected');
547+
return;
548+
}
549+
550+
// add item
551+
letnewItemIndex=this.dataList.length;
552+
vartargetTag=$(`<div class="${APP_SELECT_ITEM}${APP_DRAGGABLE} added selected" data-idx="${newItemIndex}" data-name="${newItemName}" data-type="object" data-code="'${newItemName}'" title="${newItemName}: Added manually">
553+
<span>${newItemName}</span>
554+
</div>`);
555+
$(targetTag).appendTo(
556+
$(this.wrapSelector('.'+APP_SELECT_BOX+'.right'))
557+
);
558+
this.pointer={start:targetTag.index(),end:-1};
559+
// un-select others
560+
$(this.wrapSelector('.'+APP_SELECT_ITEM)).removeClass('selected');
561+
// clear item input
562+
$(this.wrapSelector('.vp-cs-add-item-name')).val('');
563+
// bind draggable
564+
this.bindDraggable();
565+
}
491566
}
492567

493568
bindDraggable(){

‎visualpython/js/m_apps/Markdown.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ define([
202202

203203
// CHROME: TODO: 4: marked is not loaded, before fix it comment it
204204
if(vpConfig.extensionType==='notebook'){
205-
varmarked=require('components/marked/lib/marked');
205+
varmarked=window.require('components/marked/lib/marked');
206206
varrenderer=newmarked.Renderer();
207207

208208
// get block

‎visualpython/js/m_apps/Subset.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,13 +467,13 @@ define([
467467
// tag.appendFormatLine('<button type="button" class="{0} {1}" title="{2}"><img src="{3}"/></button>',
468468
// VP_DS_SELECT_DEL_ALL_BTN, 'select-col', 'Remove all items', com_Const.IMAGE_PATH + 'arrow_left_double.svg');
469469
tag.appendFormatLine('<button type="button" class="{0} {1}" title="{2}"><div class="vp-icon-arrow-right-double"></div></button>',
470-
VP_DS_SELECT_ADD_ALL_BTN,'select-row','Add all items');
470+
VP_DS_SELECT_ADD_ALL_BTN,'select-col','Add all items');
471471
tag.appendFormatLine('<button type="button" class="{0} {1}"><div class="vp-icon-arrow-right"></div></button>',
472-
VP_DS_SELECT_ADD_BTN,'select-row');
472+
VP_DS_SELECT_ADD_BTN,'select-col');
473473
tag.appendFormatLine('<button type="button" class="{0} {1}"><div class="vp-icon-arrow-left"></div></button>',
474-
VP_DS_SELECT_DEL_BTN,'select-row');
474+
VP_DS_SELECT_DEL_BTN,'select-col');
475475
tag.appendFormatLine('<button type="button" class="{0} {1}" title="{2}"><div class="vp-icon-arrow-left-double"></div></button>',
476-
VP_DS_SELECT_DEL_ALL_BTN,'select-row','Remove all items');
476+
VP_DS_SELECT_DEL_ALL_BTN,'select-col','Remove all items');
477477
tag.appendLine('</div>');// VP_DS_SELECT_BTNS
478478

479479
// col select - right

0 commit comments

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