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

Commitfb08194

Browse files
authored
Merge pull request#241 from minjk-bl/devops
Devops for v2.4.9
2 parents39a0a01 +f4eb5cf commitfb08194

File tree

22 files changed

+328
-90
lines changed

22 files changed

+328
-90
lines changed

‎visualpython/css/component/alertModal.css‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
top:50%;
1414
transform:translate(-50%,-50%);
1515
width:400px;
16-
height:150px;
16+
height:170px;
1717
padding:15px;
1818
background-color:var(--vp-background-color);
1919
box-shadow:02px2px0rgba(0,0,0,0.14),03px1px-2pxrgba(0,0,0,0.12),01px5px0rgba(0,0,0,0.2);
@@ -59,10 +59,23 @@
5959
font-size:13px;
6060
font-weight:700;
6161
}
62+
.vp-alertModal-detailStr {
63+
color:var(--vp-primary-text);
64+
background-color:var(--vp-light-gray-color);
65+
border-radius:5px;
66+
padding:10px;
67+
border:0.25px solidvar(--vp-grid-line-color);
68+
height:60px;
69+
}
70+
.vp-alertModal-detailStr>pre {
71+
border:0px;
72+
padding:0px;
73+
}
6274
.vp-alertModal-style-flex-column-evenly {
6375
display: flex;
6476
flex-direction: column;
6577
justify-content: space-evenly;
78+
row-gap:3px;
6679
}
6780
.vp-alertModal-style-flex-row-center {
6881
display: flex;

‎visualpython/css/component/multiSelector.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
background-color:#F5F5F5;
4545
}
4646
/* Item Sorting FIXME: change span to class */
47-
.right .vp-cs-select-itemspan {
47+
/*.right .vp-cs-select-item span {
4848
padding: 0px 10px 0px 0px;
49-
}
49+
} */
5050
/* TODO: If sortable, apply this style */
5151
/* .right .vp-cs-select-item span:hover {
5252
cursor: n-resize;

‎visualpython/css/component/popupComponent.css‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,14 @@
222222
margin-top:9px;
223223
margin-right:10px;
224224
}
225-
.vp-popup-button[data-type="run"] {
225+
.vp-popup-run-button {
226226
display: inline-block;
227227
width:60px;
228228
min-width:60px;
229229
border-radius:3px0px0px3px;
230230
border-right:0.25px solid white!important;
231231
}
232-
.vp-popup-button[data-type="show-detail"] {
232+
.vp-popup-button.vp-popup-show-detail-button {
233233
display: inline-block;
234234
width:20px;
235235
min-width:20px;
@@ -251,11 +251,23 @@
251251
}
252252
.vp-popup-detail-button {
253253
color:var(--vp-font-primary);
254+
display: grid;
255+
grid-template-columns:25pxcalc(100%-25px);
254256
}
255257
.vp-popup-detail-button:hover {
256258
color:var(--vp-font-highlight);
257259
background:var(--vp-light-gray-color);
258260
}
261+
.vp-popup-detail-button>label {
262+
border-right:0.25px solidvar(--vp-border-gray-color);
263+
margin:0;
264+
padding-left:5px;
265+
}
266+
.vp-popup-detail-button> .vp-popup-detail-action-button {
267+
text-align: left;
268+
line-height:35px;
269+
padding-left:5px;
270+
}
259271
.vp-popup-save-button {
260272
float: right;
261273
height:30px;

‎visualpython/css/root.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
src: url(../fonts/consola.ttf) format("font-truetype");
4444
}
4545
/* font style */
46-
.vp-primary {
47-
color:var(--vp-font-highlight);
46+
.vp-primary-text {
47+
color:var(--vp-font-primary);
4848
}
4949
.vp-orange-text {
5050
color:var(--vp-font-highlight);

‎visualpython/html/component/alertModal.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
vp-alertModal-style-text-center
2525
vp-alertModal-style-font-weight-700">
2626

27+
</div>
28+
<divclass="vp-alertModal-detailStr vp-scrollbar">
29+
2730
</div>
2831
<divclass="vp-alertModal-style-flex-row-center">
2932
<inputclass="vp-alertModal-yes

‎visualpython/html/component/popupComponent.html‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,26 @@
105105
<buttontype="button"class="vp-button vp-popup-button"data-type="help">Help</button>
106106

107107
<divclass="vp-popup-runadd-box">
108-
<buttontype="button"class="vp-button activated vp-popup-button"data-type="run"title="Save to block &Runcell">Run</button>
109-
<buttontype="button"class="vp-button activated vp-popup-button"data-type="show-detail">
108+
<buttontype="button"class="vp-button activated vp-popup-button vp-popup-run-button"data-type="run"title="Runcode">Run</button>
109+
<buttontype="button"class="vp-button activated vp-popup-button vp-popup-show-detail-button"data-type="show-detail">
110110
<!-- LAB: img to url -->
111111
<!-- <img src="${vp_base}/img/arrow_short_up.svg"/> -->
112112
<divclass="vp-icon-arrow-short-up"></div>
113113
</button>
114114
<divclass="vp-popup-run-detailbox vp-cursor vp-close-on-blur">
115115
<!-- <div class="vp-popup-detail-button" data-type="apply" title="Save to block">Save to block</div> -->
116-
<divclass="vp-popup-detail-button"data-type="run-save"title="Save to block & Run code">Run & Save</div>
117-
<divclass="vp-popup-detail-button"data-type="add"title="Add code to cell">Code to cell</div>
116+
<divclass="vp-popup-detail-button"title="Run code">
117+
<label><inputtype="radio"class="vp-popup-run-type"name="runType"value="run"checked/><span></span></label>
118+
<spanclass="vp-popup-detail-action-button"data-type="run">Run</span>
119+
</div>
120+
<divclass="vp-popup-detail-button"title="Save to block & Run code">
121+
<label><inputtype="radio"class="vp-popup-run-type"name="runType"value="run-save"/><span></span></label>
122+
<spanclass="vp-popup-detail-action-button"data-type="run-save">Run & Save</span>
123+
</div>
124+
<divclass="vp-popup-detail-button"title="Add code to cell">
125+
<label><inputtype="radio"class="vp-popup-run-type"name="runType"value="add"/><span></span></label>
126+
<spanclass="vp-popup-detail-action-button"data-type="add">Code to cell</span>
127+
</div>
118128
</div>
119129
</div>
120130
<buttontype="button"class="vp-button activated vp-popup-button vp-popup-save-button"data-type="save"title="Save to target"style="display:none;">OK</button>

‎visualpython/html/m_visualize/seaborn.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,18 @@
231231
<labelfor="showValuesPrecision">Decimal place</label>
232232
<inputtype="number"id="showValuesPrecision"class="vp-state"placeholder="Type decimal places(0~5)"min="0"max="5"/>
233233
</div>
234+
</div>
235+
<divclass="vp-grid-box sb-option">
236+
<hrstyle="margin:5px;"/>
237+
<labelclass="vp-bold">Errorbar</label>
238+
<inputtype="text"id="errorbar"class="vp-input vp-state"placeholder="('ci', 95)"/>
234239
<hrstyle="margin:5px;"/>
235240
</div>
236241
<labelfor="useLegend"class="vp-bold">Legend</label>
237242
<divclass="vp-grid-col-p50">
238243
<selectid="legendPos"class="vp-select vp-state">
239244
<!-- Legend Position FIXME: -->
240-
245+
241246
</select>
242247
</div>
243248
</div>

‎visualpython/js/com/com_Config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ define([
6565
this.data={
6666
// Configuration
6767
'vpcfg':{
68-
68+
'runType':'run'
6969
},
7070
// User defined code for Snippets
7171
'vpudf':{
@@ -636,7 +636,7 @@ define([
636636
/**
637637
* Set configuration data (on server)
638638
*@param {Object} dataObj
639-
*@param {String} configKey
639+
*@param {String} configKeyvpcfg / vpudf / vpimport / vppackman
640640
*/
641641
setData(dataObj,configKey='vpudf'){
642642
letthat=this;

‎visualpython/js/com/com_generatorV2.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,11 @@ define([
739739
letcolList=pageThis.autoGen[obj.name].getDataList();
740740
pageThis.state[obj.name]=colList.map(data=>{returndata.code});
741741
value=colList.map(data=>{returndata.code}).join(',');
742+
if(colList.length==0){
743+
value='';
744+
}elseif(colList.length>0){
745+
value='['+value+']';
746+
}
742747
$(pageThis.wrapSelector('#'+obj.name)).val(value);
743748
break;
744749
case'file-open':
@@ -1293,7 +1298,7 @@ define([
12931298
letvalue=list.map(data=>{returndata.code}).join(',');
12941299
if(list.length==0){
12951300
value='';
1296-
}elseif(list.length>1){
1301+
}elseif(list.length>0){
12971302
value='['+value+']';
12981303
}
12991304
pageThis.state[compId]=list.map(data=>{returndata.code});

‎visualpython/js/com/com_util.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,31 @@ define([
245245
returnlabel;
246246
}
247247

248+
/**
249+
* Pack the code with ignoring the warnings
250+
*@param {*} code
251+
*/
252+
varignoreWarning=function(code){
253+
varconvertedCode=newcom_String();
254+
convertedCode.appendLine('import warnings');
255+
convertedCode.appendLine('from IPython.display import display');
256+
convertedCode.appendLine('with warnings.catch_warnings():');
257+
convertedCode.appendLine(" warnings.simplefilter('ignore')");
258+
letcodeLines=code.split('\n');
259+
codeLines.forEach((line,idx)=>{
260+
if(idx>0){
261+
convertedCode.appendLine();
262+
}
263+
if(codeLines.length==idx+1){
264+
// last line
265+
convertedCode.appendFormat(" display({0})",line);
266+
}else{
267+
convertedCode.appendFormat(" {0}",line);
268+
}
269+
});
270+
returnconvertedCode.toString();
271+
}
272+
248273
//============================================================================
249274
// Cross-browser RegEx Split
250275
//============================================================================
@@ -377,6 +402,7 @@ define([
377402
setIsAPIListRunCode:setIsAPIListRunCode,
378403
getIsAPIListRunCode:getIsAPIListRunCode,
379404
safeString:safeString,
405+
ignoreWarning:ignoreWarning,
380406

381407
regex_split:regex_split
382408
}

0 commit comments

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