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

Devops for v2.4.9#241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
minjk-bl merged 14 commits intovisualpython:devopsfromminjk-bl:devops
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
14 commits
Select commitHold shift + click to select a range
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletionvisualpython/css/component/alertModal.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
top: 50%;
transform:translate(-50%, -50%);
width: 400px;
height:150px;
height:170px;
padding: 15px;
background-color: var(--vp-background-color);
box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14), 0 3px 1px -2px rgba(0,0,0,0.12), 0 1px 5px 0 rgba(0,0,0,0.2);
Expand DownExpand Up@@ -59,10 +59,23 @@
font-size: 13px;
font-weight: 700;
}
.vp-alertModal-detailStr {
color: var(--vp-primary-text);
background-color: var(--vp-light-gray-color);
border-radius: 5px;
padding: 10px;
border: 0.25px solid var(--vp-grid-line-color);
height: 60px;
}
.vp-alertModal-detailStr > pre {
border: 0px;
padding: 0px;
}
.vp-alertModal-style-flex-column-evenly {
display: flex;
flex-direction: column;
justify-content: space-evenly;
row-gap: 3px;
}
.vp-alertModal-style-flex-row-center {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletionsvisualpython/css/component/multiSelector.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,9 @@
background-color: #F5F5F5;
}
/* Item Sorting FIXME: change span to class */
.right .vp-cs-select-item span {
/*.right .vp-cs-select-item span {
padding: 0px 10px 0px 0px;
}
} */
/* TODO: If sortable, apply this style */
/* .right .vp-cs-select-item span:hover {
cursor: n-resize;
Expand Down
16 changes: 14 additions & 2 deletionsvisualpython/css/component/popupComponent.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,14 +222,14 @@
margin-top: 9px;
margin-right: 10px;
}
.vp-popup-button[data-type="run"] {
.vp-popup-run-button {
display: inline-block;
width: 60px;
min-width: 60px;
border-radius: 3px 0px 0px 3px;
border-right: 0.25px solid white !important;
}
.vp-popup-button[data-type="show-detail"] {
.vp-popup-button.vp-popup-show-detail-button {
display: inline-block;
width: 20px;
min-width: 20px;
Expand All@@ -251,11 +251,23 @@
}
.vp-popup-detail-button {
color: var(--vp-font-primary);
display: grid;
grid-template-columns: 25px calc(100% - 25px);
}
.vp-popup-detail-button:hover {
color: var(--vp-font-highlight);
background: var(--vp-light-gray-color);
}
.vp-popup-detail-button > label {
border-right: 0.25px solid var(--vp-border-gray-color);
margin: 0;
padding-left: 5px;
}
.vp-popup-detail-button > .vp-popup-detail-action-button {
text-align: left;
line-height: 35px;
padding-left: 5px;
}
.vp-popup-save-button {
float: right;
height: 30px;
Expand Down
4 changes: 2 additions & 2 deletionsvisualpython/css/root.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@
src: url(../fonts/consola.ttf) format("font-truetype");
}
/* font style */
.vp-primary {
color: var(--vp-font-highlight);
.vp-primary-text {
color: var(--vp-font-primary);
}
.vp-orange-text {
color: var(--vp-font-highlight);
Expand Down
3 changes: 3 additions & 0 deletionsvisualpython/html/component/alertModal.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,9 @@
vp-alertModal-style-text-center
vp-alertModal-style-font-weight-700">

</div>
<divclass="vp-alertModal-detailStr vp-scrollbar">

</div>
<divclass="vp-alertModal-style-flex-row-center">
<inputclass="vp-alertModal-yes
Expand Down
18 changes: 14 additions & 4 deletionsvisualpython/html/component/popupComponent.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,16 +105,26 @@
<button type="button" class="vp-button vp-popup-button" data-type="help">Help</button>

<div class="vp-popup-runadd-box">
<button type="button" class="vp-button activated vp-popup-button" data-type="run" title="Save to block &Runcell">Run</button>
<button type="button" class="vp-button activated vp-popup-button" data-type="show-detail">
<button type="button" class="vp-button activated vp-popup-button vp-popup-run-button" data-type="run" title="Runcode">Run</button>
<button type="button" class="vp-button activated vp-popup-button vp-popup-show-detail-button" data-type="show-detail">
<!-- LAB: img to url -->
<!-- <img src="${vp_base}/img/arrow_short_up.svg"/> -->
<div class="vp-icon-arrow-short-up"></div>
</button>
<div class="vp-popup-run-detailbox vp-cursor vp-close-on-blur">
<!-- <div class="vp-popup-detail-button" data-type="apply" title="Save to block">Save to block</div> -->
<div class="vp-popup-detail-button" data-type="run-save" title="Save to block & Run code">Run & Save</div>
<div class="vp-popup-detail-button" data-type="add" title="Add code to cell">Code to cell</div>
<div class="vp-popup-detail-button" title="Run code">
<label><input type="radio" class="vp-popup-run-type" name="runType" value="run" checked/><span></span></label>
<span class="vp-popup-detail-action-button" data-type="run">Run</span>
</div>
<div class="vp-popup-detail-button" title="Save to block & Run code">
<label><input type="radio" class="vp-popup-run-type" name="runType" value="run-save" /><span></span></label>
<span class="vp-popup-detail-action-button" data-type="run-save">Run & Save</span>
</div>
<div class="vp-popup-detail-button" title="Add code to cell">
<label><input type="radio" class="vp-popup-run-type" name="runType" value="add" /><span></span></label>
<span class="vp-popup-detail-action-button" data-type="add">Code to cell</span>
</div>
</div>
</div>
<button type="button" class="vp-button activated vp-popup-button vp-popup-save-button" data-type="save" title="Save to target" style="display:none;">OK</button>
Expand Down
7 changes: 6 additions & 1 deletionvisualpython/html/m_visualize/seaborn.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -231,13 +231,18 @@
<label for="showValuesPrecision">Decimal place</label>
<input type="number" id="showValuesPrecision" class="vp-state" placeholder="Type decimal places(0~5)" min="0" max="5"/>
</div>
</div>
<div class="vp-grid-box sb-option">
<hr style="margin:5px;"/>
<label class="vp-bold">Errorbar</label>
<input type="text" id="errorbar" class="vp-input vp-state" placeholder="('ci', 95)"/>
<hr style="margin:5px;"/>
</div>
<label for="useLegend" class="vp-bold">Legend</label>
<div class="vp-grid-col-p50">
<select id="legendPos" class="vp-select vp-state">
<!-- Legend Position FIXME: -->

</select>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletionsvisualpython/js/com/com_Config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ define([
this.data = {
// Configuration
'vpcfg': {

'runType': 'run'
},
// User defined code for Snippets
'vpudf': {
Expand DownExpand Up@@ -636,7 +636,7 @@ define([
/**
* Set configuration data (on server)
* @param {Object} dataObj
* @param {String} configKey
* @param {String} configKeyvpcfg / vpudf / vpimport / vppackman
*/
setData(dataObj, configKey='vpudf') {
let that = this;
Expand Down
7 changes: 6 additions & 1 deletionvisualpython/js/com/com_generatorV2.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -739,6 +739,11 @@ define([
let colList = pageThis.autoGen[obj.name].getDataList();
pageThis.state[obj.name] = colList.map(data => { return data.code });
value = colList.map(data => { return data.code }).join(',');
if (colList.length == 0) {
value = '';
} else if (colList.length > 0) {
value = '[' + value + ']';
}
$(pageThis.wrapSelector('#'+obj.name)).val(value);
break;
case 'file-open':
Expand DownExpand Up@@ -1293,7 +1298,7 @@ define([
let value = list.map(data => { return data.code }).join(',');
if (list.length == 0) {
value = '';
} else if (list.length >1) {
} else if (list.length >0) {
value = '[' + value + ']';
}
pageThis.state[compId] = list.map(data => { return data.code });
Expand Down
26 changes: 26 additions & 0 deletionsvisualpython/js/com/com_util.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -245,6 +245,31 @@ define([
return label;
}

/**
* Pack the code with ignoring the warnings
* @param {*} code
*/
var ignoreWarning = function(code) {
var convertedCode = new com_String();
convertedCode.appendLine('import warnings');
convertedCode.appendLine('from IPython.display import display');
convertedCode.appendLine('with warnings.catch_warnings():');
convertedCode.appendLine(" warnings.simplefilter('ignore')");
let codeLines = code.split('\n');
codeLines.forEach((line, idx) => {
if (idx > 0) {
convertedCode.appendLine();
}
if (codeLines.length == idx + 1) {
// last line
convertedCode.appendFormat(" display({0})", line);
} else {
convertedCode.appendFormat(" {0}", line);
}
});
return convertedCode.toString();
}

//============================================================================
// Cross-browser RegEx Split
//============================================================================
Expand DownExpand Up@@ -377,6 +402,7 @@ define([
setIsAPIListRunCode: setIsAPIListRunCode,
getIsAPIListRunCode: getIsAPIListRunCode,
safeString: safeString,
ignoreWarning: ignoreWarning,

regex_split: regex_split
}
Expand Down
20 changes: 16 additions & 4 deletionsvisualpython/js/com/component/AlertModal.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,9 +21,14 @@ define([

/**
* AlertModal
* com_util.renderAlertModal(title, detail);
* - title: string
* - detail: object
* - content: string
* - type: text / code
*/
class AlertModal extends Component {
constructor(title, detail='') {
constructor(title, detail={ content:'', type:'text' }) {
super($('body'), { title: title, detail: detail });
}

Expand All@@ -44,9 +49,16 @@ define([

// set title
$(this.wrapSelector('.vp-alertModal-titleStr')).text(this.state.title);
// set detail as tooltip
if (this.state.detail) {
$(this.wrapSelector('.vp-alertModal-titleStr')).attr({ title: this.state.detail });
// set detail
let { content='', type='text' } = this.state.detail;
if (content !== '') {
if (type === 'code') {
$(this.wrapSelector('.vp-alertModal-detailStr')).html('<pre>' + content + '</pre>')
} else {
$(this.wrapSelector('.vp-alertModal-detailStr')).text(content);
}
} else {
$(this.wrapSelector('.vp-alertModal-detailStr')).hide();
}
}

Expand Down
8 changes: 4 additions & 4 deletionsvisualpython/js/com/component/DataSelector.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -766,7 +766,7 @@ define([
case 'list':
code.append(data);
// start / end value
if ((slicingStart1 && slicingStart1 != '') || (slicingEnd1 && slicingEnd1 != '')) {
if ((slicingStart1!= null&& slicingStart1 != '') || (slicingEnd1 != null && slicingEnd1 != '')) {
code.appendFormat('[{0}:{1}]', slicingStart1, slicingEnd1);
}
break;
Expand All@@ -781,7 +781,7 @@ define([
let colCode = '';
if (ndRowType == 'slicing') {
// slicing start / end value
if ((slicingStart1 && slicingStart1 != '') || (slicingEnd1 && slicingEnd1 != '')) {
if ((slicingStart1!= null&& slicingStart1 != '') || (slicingEnd1 != null && slicingEnd1 != '')) {
rowCode = com_util.formatString('{0}:{1}', slicingStart1, slicingEnd1);
}
} else {
Expand All@@ -802,7 +802,7 @@ define([
}
if (ndColType == 'slicing') {
// slicing start / end value
if ((slicingStart2 && slicingStart2 != '') || (slicingEnd2 && slicingEnd2 != '')) {
if ((slicingStart2!= null&& slicingStart2 != '') || (slicingEnd2 != null && slicingEnd2 != '')) {
colCode = com_util.formatString('{0}:{1}', slicingStart2, slicingEnd2);
}
} else {
Expand DownExpand Up@@ -830,7 +830,7 @@ define([
}
} else {
// start / end value
if ((slicingStart1 && slicingStart1 != '') || (slicingEnd1 && slicingEnd1 != '')) {
if ((slicingStart1!= null&& slicingStart1 != '') || (slicingEnd1 != null && slicingEnd1 != '')) {
code.appendFormat('[{0}:{1}]', slicingStart1, slicingEnd1);
}
}
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp