diff --git a/visualpython/html/component/packageManager.html b/visualpython/html/component/packageManager.html
new file mode 100644
index 00000000..956fd6e6
--- /dev/null
+++ b/visualpython/html/component/packageManager.html
@@ -0,0 +1,35 @@
+
+
+
\ No newline at end of file
diff --git a/visualpython/html/m_stats/anova.html b/visualpython/html/m_stats/anova.html
index 15cc0f06..17b356bd 100644
--- a/visualpython/html/m_stats/anova.html
+++ b/visualpython/html/m_stats/anova.html
@@ -51,9 +51,10 @@
Significance level
Post hoc analysis
-
-
diff --git a/visualpython/img/delete.svg b/visualpython/img/delete.svg
index 7e88533a..9ad2d368 100644
--- a/visualpython/img/delete.svg
+++ b/visualpython/img/delete.svg
@@ -1,5 +1,5 @@
-
diff --git a/visualpython/img/delete_activated.svg b/visualpython/img/delete_activated.svg
new file mode 100644
index 00000000..1662171e
--- /dev/null
+++ b/visualpython/img/delete_activated.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/visualpython/img/delete_disabled.svg b/visualpython/img/delete_disabled.svg
new file mode 100644
index 00000000..7e88533a
--- /dev/null
+++ b/visualpython/img/delete_disabled.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/visualpython/img/import_disabled.svg b/visualpython/img/import_disabled.svg
new file mode 100644
index 00000000..daba0d42
--- /dev/null
+++ b/visualpython/img/import_disabled.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/visualpython/img/non_numeric.svg b/visualpython/img/non_numeric.svg
new file mode 100644
index 00000000..a7d9e42b
--- /dev/null
+++ b/visualpython/img/non_numeric.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/visualpython/img/numeric.svg b/visualpython/img/numeric.svg
new file mode 100644
index 00000000..abedb779
--- /dev/null
+++ b/visualpython/img/numeric.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/visualpython/img/package_manager.svg b/visualpython/img/package_manager.svg
new file mode 100644
index 00000000..75dee2f0
--- /dev/null
+++ b/visualpython/img/package_manager.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/visualpython/img/package_manager_hover.svg b/visualpython/img/package_manager_hover.svg
new file mode 100644
index 00000000..47a3693c
--- /dev/null
+++ b/visualpython/img/package_manager_hover.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/visualpython/img/snippets/duplicate.svg b/visualpython/img/snippets/duplicate.svg
index ad8b11b8..8e65f311 100644
--- a/visualpython/img/snippets/duplicate.svg
+++ b/visualpython/img/snippets/duplicate.svg
@@ -1,3 +1,3 @@
-
diff --git a/visualpython/img/snippets/duplicate_disabled.svg b/visualpython/img/snippets/duplicate_disabled.svg
new file mode 100644
index 00000000..8be1cd9f
--- /dev/null
+++ b/visualpython/img/snippets/duplicate_disabled.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/visualpython/img/snippets/duplicated_activated.svg b/visualpython/img/snippets/duplicated_activated.svg
new file mode 100644
index 00000000..d59ce072
--- /dev/null
+++ b/visualpython/img/snippets/duplicated_activated.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/visualpython/img/snippets/run.svg b/visualpython/img/snippets/run.svg
index 8739260b..8fccce46 100644
--- a/visualpython/img/snippets/run.svg
+++ b/visualpython/img/snippets/run.svg
@@ -1,6 +1,13 @@
+
+
+
+
+
diff --git a/visualpython/img/snippets/run_activated.svg b/visualpython/img/snippets/run_activated.svg
new file mode 100644
index 00000000..fc9c405e
--- /dev/null
+++ b/visualpython/img/snippets/run_activated.svg
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
diff --git a/visualpython/img/snippets/run_disabled.svg b/visualpython/img/snippets/run_disabled.svg
new file mode 100644
index 00000000..0167ee8d
--- /dev/null
+++ b/visualpython/img/snippets/run_disabled.svg
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
diff --git a/visualpython/img/upgrade.svg b/visualpython/img/upgrade.svg
new file mode 100644
index 00000000..d06ee058
--- /dev/null
+++ b/visualpython/img/upgrade.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/visualpython/img/upgrade_activated.svg b/visualpython/img/upgrade_activated.svg
new file mode 100644
index 00000000..68adab28
--- /dev/null
+++ b/visualpython/img/upgrade_activated.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/visualpython/img/upgrade_disabled.svg b/visualpython/img/upgrade_disabled.svg
new file mode 100644
index 00000000..f0afdc8e
--- /dev/null
+++ b/visualpython/img/upgrade_disabled.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/visualpython/js/MainFrame.js b/visualpython/js/MainFrame.js
index 37981c13..551e0a2f 100644
--- a/visualpython/js/MainFrame.js
+++ b/visualpython/js/MainFrame.js
@@ -103,7 +103,7 @@ define([
// get visualpython minimum width
// resizable setting
// $('#vp_wrapper').resizable('disable');
- if (vpConfig.extensionType !== 'lab') {
+ if (vpConfig.extensionType !== 'lab' && vpConfig.extensionType !== 'lite') {
$('#vp_wrapper').resizable({
// alsoResize: '#vp_menuFrame',
helper: 'vp-wrapper-resizer',
@@ -151,7 +151,7 @@ define([
top: colabHeaderHeight + 'px'
});
this._resizeNotebook(vpWidth);
- } else if (vpConfig.extensionType === 'lab') {
+ } else if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
// LAB: do nothing
}
}
@@ -334,7 +334,7 @@ define([
this.boardFrame.hide();
newVpWidth = menuWidth + MENU_BOARD_SPACING;
$('#vp_wrapper').width(newVpWidth);
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
// LAB: set parent width and position, min-width
let target = $('#vp_wrapper').parent();
let prevWidth = target[0].getBoundingClientRect().width;
@@ -364,7 +364,7 @@ define([
this.boardFrame.show();
newVpWidth = vpWidth + BOARD_MIN_WIDTH + MENU_BOARD_SPACING;
$('#vp_wrapper').width(newVpWidth);
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
// LAB: set parent width and position, min-width
let target = $('#vp_wrapper').parent();
let prevWidth = target[0].getBoundingClientRect().width;
@@ -474,7 +474,7 @@ define([
this.boardFrame.showLoadingBar();
// create components
// LAB: use require
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
let parentBlock = null;
let prevBlock = null;
loadStateList.forEach(obj => {
diff --git a/visualpython/js/board/BoardFrame.js b/visualpython/js/board/BoardFrame.js
index e8e56b21..cf273e67 100644
--- a/visualpython/js/board/BoardFrame.js
+++ b/visualpython/js/board/BoardFrame.js
@@ -87,7 +87,7 @@ define([
get blockList() {
let sessionId = 'default';
// LAB: get session id
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
let panelId = vpKernel.getLabPanelId();
if (panelId) {
sessionId = panelId;
@@ -102,7 +102,7 @@ define([
set blockList(val) {
let sessionId = 'default';
// LAB: get session id
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
let panelId = vpKernel.getLabPanelId();
if (panelId) {
sessionId = panelId;
@@ -122,7 +122,7 @@ define([
addToBlockList(newVal, position=-1) {
let sessionId = 'default';
// LAB: get session id
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
let panelId = vpKernel.getLabPanelId();
if (panelId) {
sessionId = panelId;
@@ -154,7 +154,7 @@ define([
removeFromBlockList(removeVal) {
let sessionId = 'default';
// LAB: get session id
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
let panelId = vpKernel.getLabPanelId();
if (panelId) {
sessionId = panelId;
@@ -173,7 +173,7 @@ define([
getTitle() {
let sessionId = 'default';
// LAB: get session id
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
let panelId = vpKernel.getLabPanelId();
if (panelId) {
sessionId = panelId;
@@ -189,7 +189,7 @@ define([
setTitle(newTitle) {
let sessionId = 'default';
// LAB: get session id
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
let panelId = vpKernel.getLabPanelId();
if (panelId) {
sessionId = panelId;
@@ -479,7 +479,7 @@ define([
this.blockMenu = new BlockMenu(this);
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
let that = this;
vpLab.shell._currentChanged.connect(function(sender, value) {
// if lab tab changed, reset title and reload board
@@ -643,7 +643,7 @@ define([
let vpFilePath = filesPath[0].path;
let vpFileName = filesPath[0].file;
// read file
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
// LAB: read file using python open
vpKernel.readFile(vpFilePath).then(function(resultObj) {
try {
@@ -972,7 +972,7 @@ define([
moveBlock(startIdx, endIdx, parentBlock=null) {
let sessionId = 'default';
// LAB: get session id
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
let panelId = vpKernel.getLabPanelId();
if (panelId) {
sessionId = panelId;
diff --git a/visualpython/js/com/com_Config.js b/visualpython/js/com/com_Config.js
index e7451872..547374ea 100644
--- a/visualpython/js/com/com_Config.js
+++ b/visualpython/js/com/com_Config.js
@@ -48,15 +48,16 @@ define([
/**
*
* @param {*} initialData
- * @param {*} extensionType extension type: notebook/colab/lab
+ * @param {*} extensionType extension type: notebook/colab/lab/lite
*/
constructor(extensionType='notebook', initialData={}) {
// initial mode
+ this.isReady = false;
this.extensionType = extensionType;
this.parentSelector = 'body';
if (extensionType === 'notebook') {
this.parentSelector = '#site';
- } else if (extensionType === 'colab' || extensionType === 'lab') {
+ } else if (extensionType === 'colab' || extensionType === 'lab' || extensionType === 'lite') {
// this.parentSelector = '.notebook-horizontal';
this.parentSelector = 'body';
}
@@ -463,8 +464,8 @@ define([
// not mounted
reject('Colab Drive is not mounted!');
})
- } else if (that.extensionType === 'lab') {
- // CHROME: edited to use .visualpython files
+ } else if (that.extensionType === 'lab' || that.extensionType === 'lite') {
+ // LAB: edited to use .visualpython files
that._readFromLab('', configKey).then(function(result) {
resolve(result);
}).catch(function(err) {
@@ -526,7 +527,7 @@ define([
// not mounted
reject('Colab Drive is not mounted!');
})
- } else if (that.extensionType === 'lab') {
+ } else if (that.extensionType === 'lab' || that.extensionType === 'lite') {
// LAB: use local .visualpython files
that._readFromLab(configKey).then(function(result) {
let data = result;
@@ -604,7 +605,7 @@ define([
reject();
});
});
- } else if (that.extensionType === 'lab') {
+ } else if (that.extensionType === 'lab' || that.extensionType === 'lite') {
// LAB: use .visualpython files
that.getData('', configKey).then(function(data) {
let newDataObj = {};
@@ -649,7 +650,7 @@ define([
}).catch(function(err) {
reject(false);
})
- } else if (that.extensionType === 'lab') {
+ } else if (that.extensionType === 'lab' || that.extensionType === 'lite') {
// LAB: use .visualpython files
that.getData('', configKey).then(function(data) {
let dataObj = data;
@@ -838,7 +839,7 @@ define([
let that = this;
let nowVersion = this.getVpInstalledVersion();
let packageName = 'visualpython';
- if (this.extensionType === 'lab') {
+ if (this.extensionType === 'lab' || this.extensionType === 'lite') {
packageName = 'jupyterlab-visualpython';
}
this.getPackageVersion(packageName).then(function(latestVersion) {
@@ -908,6 +909,16 @@ define([
];
com_interface.insertCell('markdown', info.join('\n'));
com_interface.insertCell('code', '!pip install jupyterlab-visualpython --upgrade');
+ } else if (that.extensionType === 'lite') {
+ // LITE: update lab extension on lite
+ let info = [
+ '## Visual Python Upgrade',
+ 'NOTE: ',
+ '- Refresh your web browser to start a new version.',
+ '- Save VP Note before refreshing the page.'
+ ];
+ com_interface.insertCell('markdown', info.join('\n'));
+ com_interface.insertCell('code', "import piplite\npiplite.install('jupyterlab-visualpython==" + latestVersion + "')");
}
// update version_timestamp
diff --git a/visualpython/js/com/com_Kernel.js b/visualpython/js/com/com_Kernel.js
index 02bad35c..ec01e35a 100644
--- a/visualpython/js/com/com_Kernel.js
+++ b/visualpython/js/com/com_Kernel.js
@@ -239,7 +239,7 @@ define([
cell.runButton.click();
// set last focused cell
colab.global.notebook.focusCell(lastFocusedCellId);
- } else if (vpConfig.extensionType === 'lab') {
+ } else if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
// LAB:
// { code, stdin, stop_on_error, silent, ... }
var codeObj = {
@@ -249,7 +249,6 @@ define([
}
var kernelConnection = that.getLabKernel();
if (kernelConnection) {
- var future = kernelConnection.requestExecute(codeObj);
var onIOPub = function(msg) {
const msgType = msg.header.msg_type;
switch(msgType) {
@@ -380,149 +379,16 @@ define([
};
return;
}
- future.onIOPub = onIOPub;
- // future.onIOPub = (msg) => {
- // const msgType = msg.header.msg_type;
- // switch(msgType) {
- // case 'status':
- // // if(!isExpectingOutput){
- // // if(msg.content.execution_state === 'idle'){
- // // resolve();
- // // }
- // // }
- // return;
- // case 'execute_input':
- // // var content = msg.content;
- // // resolve({
- // // result: content,
- // // type: type,
- // // msg: {
- // // content: {
- // // name: type,
- // // data: {
- // // [type]: content
- // // }
- // // }
- // // }
- // // });
- // return;
- // case 'stream':
- // var content = msg.content;
- // var type = content.name;
- // switch(type){
- // case 'stdout':
- // var message = content.text;
- // resolve({
- // result: message,
- // type: type,
- // msg: {
- // content: {
- // name: type,
- // data: {
- // [type]: message
- // }
- // }
- // }
- // });
- // break;
- // case 'stderr':
- // var message = content.text;
- // reject({status: 'stderr', ename: 'stderr', evalue: message});
- // break;
- // default:
- // var message = '[jupyterLabTerminal]: Unknown stream type ' + type;
- // reject({status: 'error', ename: 'Unknown stream type', evalue: message});
- // }
- // break;
- // case 'error':
- // //stderr does not yield output for all errors
- // // var message = msg.content.ename + '\n' + msg.content.evalue;
- // // check if it has a problem on restarting vp inner function
- // // ex) "name '_vp_print' is not defined"
- // if (msg.content.ename === 'NameError'
- // && msg.content.evalue.includes('_vp_')
- // && msg.content.evalue.includes('is not defined')) {
- // // restart vp
- // vpConfig.readKernelFunction();
- // }
- // reject({status: 'error', ename: msg.content.ename, evalue: msg.content.evalue});
- // break;
- // case 'execute_result':
- // var type = 'text';
- // if (msg.content) {
- // try {
- // if (msg.content['text']) {
- // result = String(msg.content['text']);
- // type = 'text';
- // } else if (msg.content.data) {
- // if (msg.content.data['image/png']) {
- // result = String(msg.content.data['image/png']);
- // type = 'image/png';
- // } else if (msg.content.data['text/plain']) {
- // result = String(msg.content.data['text/plain']);
- // type = 'text/plain';
- // } else if (msg.content.data['text/html']) {
- // result = String(msg.content.data['text/html']);
- // type = 'text/html';
- // }
- // }
- // resolve({result: result, type: type, msg: msg});
- // } catch(ex) {
- // reject(ex);
- // }
- // } else {
- // resolve({result: result, type: type, msg: msg});
- // }
- // break;
- // case 'display_data':
- // var type = 'text';
- // if (msg.content) {
- // try {
- // if (msg.content['text']) {
- // result = String(msg.content['text']);
- // type = 'text';
- // } else if (msg.content.data) {
- // if (msg.content.data['image/png']) {
- // result = String(msg.content.data['image/png']);
- // type = 'image/png';
- // } else if (msg.content.data['text/plain']) {
- // result = String(msg.content.data['text/plain']);
- // type = 'text/plain';
- // } else if (msg.content.data['text/html']) {
- // result = String(msg.content.data['text/html']);
- // type = 'text/html';
- // }
- // }
- // resolve({result: result, type: type, msg: msg});
- // } catch(ex) {
- // reject(ex);
- // }
- // } else {
- // resolve({result: result, type: type, msg: msg});
- // }
- // break;
- // case 'update_display_data':
- // var result = msg.content;
- // resolve({
- // result: result,
- // type: msgType,
- // msg: {
- // content: {
- // name: msgType,
- // data: {
- // [msgType]: result
- // }
- // }
- // }
- // });
- // break;
- // default:
- // var message = '[jupyterLabTerminal]: Unknown message type ' + msgType;
- // reject({status: 'error', ename: 'Unknown message type', evalue: message});
-
- // };
- // return;
- // };
+ var future;
+ if (vpConfig.isReady === false) {
+ vpConfig.readKernelFunction().then(function() {
+ future = kernelConnection.requestExecute(codeObj);
+ future.onIOPub = onIOPub;
+ });
+ } else {
+ future = kernelConnection.requestExecute(codeObj);
+ future.onIOPub = onIOPub;
+ }
}
}
@@ -1023,6 +889,23 @@ define([
})
}
+ //====================================================================
+ // Package Manager
+ //====================================================================
+ getPackageList(packList=[]) {
+ var that = this;
+ let code = com_util.formatString("_vp_print(_vp_check_package_list({0}))", JSON.stringify(packList));
+ return new Promise(function(resolve, reject) {
+ that.execute(code).then(function(resultObj) {
+ // resolve
+ resolve(resultObj);
+ }).catch(function(err) {
+ // reject
+ reject(err);
+ })
+ });
+ }
+
//====================================================================
// Configuration api
//====================================================================
diff --git a/visualpython/js/com/com_interface.js b/visualpython/js/com/com_interface.js
index 46dc4818..7742a29c 100644
--- a/visualpython/js/com/com_interface.js
+++ b/visualpython/js/com/com_interface.js
@@ -104,7 +104,7 @@ define([
}
// move to executed cell
// CHROME: TODO:
- } else if (vpConfig.extensionType === 'lab') {
+ } else if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
var { NotebookActions } = require('@jupyterlab/notebook');
var { signalToPromise } = require('@jupyterlab/coreutils');
var notebookPanel = vpKernel.getLabNotebookPanel();
@@ -133,6 +133,7 @@ define([
// move to executed cell
$(vpKernel.getLabNotebookPanel().content.activeCell.node)[0].scrollIntoView(true);
} else if (sessionType === 'console') {
+ //TODO:LITE: console check needed
var labConsole = notebookPanel.content;
var widget = labConsole.widgets[0];
if (type === 'markdown') {
@@ -169,7 +170,7 @@ define([
*/
var insertCells = function(type, commands, exec=true, sigText='') {
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
var { NotebookActions } = require('@jupyterlab/notebook');
var notebookPanel = vpKernel.getLabNotebookPanel();
}
@@ -241,7 +242,7 @@ define([
}
} else if (vpConfig.extensionType === 'lab') {
if (notebookPanel && notebookPanel.sessionContext){
- var sessionContext = notebookPanel.sessionContext;
+ var sessionContext = notebookPanel.sessionContext;
let sessionType = sessionContext.type;
if (sessionType === 'notebook') {
var notebook = notebookPanel.content;
@@ -282,7 +283,7 @@ define([
} else if (vpConfig.extensionType === 'colab') {
// CHROME: TODO:
- } else if (vpConfig.extensionType === 'lab') {
+ } else if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
// LAB: TODO:
let activeCell = notebookPanel.content.activeCell;
let activeCellTop = $(activeCell.node).position().top;
diff --git a/visualpython/js/com/component/FileNavigation.js b/visualpython/js/com/component/FileNavigation.js
index ad06869c..d10de03b 100644
--- a/visualpython/js/com/component/FileNavigation.js
+++ b/visualpython/js/com/component/FileNavigation.js
@@ -120,7 +120,8 @@ define([
var pathType = $(this).attr('data-path');
var dirObj = {
direction: NAVIGATION_DIRECTION_TYPE.TO,
- destDir: '/'
+ destDir: '/',
+ useFunction: false
}
switch (pathType) {
case 'desktop':
@@ -142,6 +143,9 @@ define([
case 'drive':
dirObj.destDir = "/content/drive/MyDrive";
break;
+ case 'lite-home':
+ dirObj.destDir = "/drive";
+ break;
case '/':
default:
dirObj.direction = NAVIGATION_DIRECTION_TYPE.TOP;
@@ -203,6 +207,8 @@ define([
$(fileNaviBody).find('.fnp-sidebar-menu.colab').show();
} else if (vpConfig.extensionType === 'lab') {
$(fileNaviBody).find('.fnp-sidebar-menu.lab').show();
+ } else if (vpConfig.extensionType === 'lite') {
+ $(fileNaviBody).find('.fnp-sidebar-menu.lite').show();
}
return fileNaviBody;
}
diff --git a/visualpython/js/com/component/LibraryComponent.js b/visualpython/js/com/component/LibraryComponent.js
index c7050460..d7d0ff56 100644
--- a/visualpython/js/com/component/LibraryComponent.js
+++ b/visualpython/js/com/component/LibraryComponent.js
@@ -46,6 +46,7 @@ define([
return;
}
this.config.checkModules = ['pd'];
+ this.config.docs = 'https://pandas.pydata.org/docs/reference/index.html';
vpLog.display(VP_LOG_TYPE.DEVELOP, 'loading state', this.state);
}
diff --git a/visualpython/js/com/component/MultiSelector.js b/visualpython/js/com/component/MultiSelector.js
index 947122a3..516365f8 100644
--- a/visualpython/js/com/component/MultiSelector.js
+++ b/visualpython/js/com/component/MultiSelector.js
@@ -175,7 +175,8 @@ define([
...x,
value: x.label,
code: x.value,
- type: x.dtype
+ type: x.dtype,
+ isNumeric: x.is_numeric
};
});
callback(colList);
@@ -193,7 +194,8 @@ define([
...x,
value: x.label,
code: x.value,
- type: x.dtype
+ type: x.dtype,
+ isNumeric: x.is_numeric
};
});
callback(list);
@@ -340,6 +342,7 @@ define([
}
renderSelectionBox(dataList) {
+ let mode = this.mode;
var tag = new com_String();
tag.appendFormatLine('
', APP_SELECT_BOX, 'left', APP_DROPPABLE, 'no-selection vp-scrollbar');
// get data and make draggable items
@@ -351,9 +354,17 @@ define([
} else {
info = '';
}
+ let iconStr = '';
+ if (mode === 'columns') {
+ if (data.isNumeric === true) {
+ iconStr = '
';
+ } else {
+ iconStr = '
';
+ }
+ }
// render item box
- tag.appendFormatLine('
{7}
'
- , APP_SELECT_ITEM, APP_DRAGGABLE, data.location, data.value, data.type, data.code, info, data.value);
+ tag.appendFormatLine('
{7}{8}
'
+ , APP_SELECT_ITEM, APP_DRAGGABLE, data.location, data.value, data.type, data.code, info, iconStr, data.value);
});
tag.appendLine('
'); // APP_SELECT_BOX
return tag.toString();
@@ -371,9 +382,17 @@ define([
} else {
info = '';
}
+ let iconStr = '';
+ if (mode === 'columns') {
+ if (data.isNumeric === true) {
+ iconStr = '
';
+ } else {
+ iconStr = '
';
+ }
+ }
// render item box
- tag.appendFormatLine('
{8}
'
- , APP_SELECT_ITEM, APP_DRAGGABLE, 'added', data.location, data.value, data.type, data.code, info, data.value);
+ tag.appendFormatLine('
{8}{9}
'
+ , APP_SELECT_ITEM, APP_DRAGGABLE, 'added', data.location, data.value, data.type, data.code, info, iconStr, data.value);
});
tag.appendLine('
'); // APP_SELECT_BOX
return tag.toString();
diff --git a/visualpython/js/com/component/PackageManager.js b/visualpython/js/com/component/PackageManager.js
new file mode 100644
index 00000000..f98af4f3
--- /dev/null
+++ b/visualpython/js/com/component/PackageManager.js
@@ -0,0 +1,405 @@
+/*
+ * Project Name : Visual Python
+ * Description : GUI-based Python code generator
+ * File Name : PackageManager.js
+ * Author : Black Logic
+ * Note : Component > PackageManager
+ * License : GNU GPLv3 with Visual Python special exception
+ * Date : 2023. 06. 14
+ * Change Date :
+ */
+//============================================================================
+// [CLASS] PackageManager
+//============================================================================
+define([
+ __VP_TEXT_LOADER__('vp_base/html/component/packageManager.html'), // INTEGRATION: unified version of text loader
+ __VP_CSS_LOADER__('vp_base/css/component/packageManager'), // INTEGRATION: unified version of css loader
+ 'vp_base/js/com/com_util',
+ 'vp_base/js/com/com_Const',
+ 'vp_base/js/com/com_String',
+ 'vp_base/js/com/component/PopupComponent',
+ 'vp_base/js/com/component/FileNavigation'
+], function(ifHtml, ifCss, com_util, com_Const, com_String, PopupComponent, FileNavigation) {
+
+ /**
+ * PackageManager
+ */
+ class PackageManager extends PopupComponent {
+ _init() {
+ super._init();
+ /** Write codes executed before rendering */
+ this.name = 'Package Manager';
+ this.config.codeview = false;
+ this.config.dataview = false;
+ this.config.runButton = false;
+ this.config.sizeLevel = 1;
+
+ this.state = {
+ selected: '',
+ popupType: '',
+ ...this.state
+ }
+
+ this.packageLib = {};
+ this.packageLibTemplate = {
+ 'numpy': { pipName: 'numpy' },
+ 'pandas': { pipName: 'pandas' },
+ 'matplotlib': { pipName: 'matplotlib' },
+ 'seaborn': { pipName: 'seaborn' },
+ 'plotly': { pipName: 'plotly' },
+ 'wordcloud': { pipName: 'wordcloud' },
+ 'sklearn': { pipName: 'scikit-learn' },
+ 'scikit-posthocs': { pipName: 'scikit-posthocs' },
+ 'scipy': { pipName: 'scipy' },
+ 'statsmodels': { pipName: 'statsmodels' },
+ 'factor-analyzer': { pipName: 'factor-analyzer' },
+ 'pingouin': { pipName: 'pingouin' },
+ 'category_encoders': { pipName: 'category_encoders' },
+ 'imblearn': { pipName: 'imblearn' },
+ 'xgboost': { pipName: 'xgboost' },
+ 'lightgbm': { pipName: 'lightgbm' },
+ 'catboost': { pipName: 'catboost' },
+ 'auto-sklearn': { pipName: 'auto-sklearn' },
+ 'tpot': { pipName: 'tpot' },
+ 'PyMuPDF': { pipName: 'PyMuPDF' },
+ 'sweetviz': { pipName: 'sweetviz' },
+ }
+ }
+
+ _bindEvent() {
+ super._bindEvent();
+ /** Implement binding events */
+ let that = this;
+
+ // search item
+ $(this.wrapSelector('.vp-pm-search')).on('change', function(evt) {
+ var value = $(this).val();
+ if (value != '') {
+ $(that.wrapSelector('.vp-pm-item')).hide();
+ $(that.wrapSelector('.vp-pm-item')).filter(function() {
+ return $(this).data('key').search(value) >= 0;
+ }).show();
+ } else {
+ $(that.wrapSelector('.vp-pm-item')).show();
+ }
+ });
+
+ // sort menu popup
+ $(this.wrapSelector('.vp-pm-sort')).on('click', function(evt) {
+ evt.stopPropagation();
+ $(that.wrapSelector('.vp-pm-sort-menu-box')).toggle();
+ });
+
+ // sort item
+ $(this.wrapSelector('.vp-pm-sort-menu-item')).on('click', function() {
+ var menu = $(this).data('menu');
+ if (menu === 'name') {
+ // sort by name
+ $(that.wrapSelector('.vp-pm-item')).sort(function(a, b) {
+ var keyA = $(a).data('key');
+ var keyB = $(b).data('key');
+ return keyA > keyB ? 1 : -1
+ }).appendTo($(that.wrapSelector('.vp-pm-table')))
+ } else if (menu === 'installed') {
+ // sort by date
+ $(that.wrapSelector('.vp-pm-item')).sort(function(a, b) {
+ var insA = $(a).data('installed');
+ var insB = $(b).data('installed');
+ if (insA === insB) {
+ var keyA = $(a).data('key');
+ var keyB = $(b).data('key');
+ return keyA > keyB ? 1 : -1
+ }
+ return insA < insB ? 1 : -1
+ }).appendTo($(that.wrapSelector('.vp-pm-table')))
+ } else if (menu === 'uninstalled') {
+ $(that.wrapSelector('.vp-pm-item')).sort(function(a, b) {
+ var insA = $(a).data('installed');
+ var insB = $(b).data('installed');
+ if (insA === insB) {
+ var keyA = $(a).data('key');
+ var keyB = $(b).data('key');
+ return keyA > keyB ? 1 : -1
+ }
+ return insA > insB ? 1 : -1
+ }).appendTo($(that.wrapSelector('.vp-pm-table')))
+ }
+ });
+
+ // add package
+ $(this.wrapSelector('.vp-pm-add')).on('click', function() {
+ that.openOptionPopup('add');
+ });
+ }
+
+ bindItemEvent() {
+ let that = this;
+
+ // item menu click
+ $(this.wrapSelector('.vp-pm-item-menu-item')).off('click');
+ $(this.wrapSelector('.vp-pm-item-menu-item:not(.disabled)')).on('click', function(evt) {
+ var menu = $(this).data('menu');
+ var item = $(this).closest('.vp-pm-item');
+ var key = $(item).data('key');
+ if (menu === 'install') {
+ that.state.selected = key;
+ that.openOptionPopup('install');
+ } else if (menu === 'uninstall') {
+ var pipName = that.packageLib[key].pipName;
+ var code = com_util.formatString("!pip uninstall -y {0}", pipName);
+ if (vpConfig.extensionType === 'lite') {
+ code = com_util.formatString("import piplite\npiplite.uninstall('{0}')", pipName);
+ }
+ // create block and run it
+ $('#vp_wrapper').trigger({
+ type: 'create_option_page',
+ blockType: 'block',
+ menuId: 'lgExe_code',
+ menuState: { taskState: { code: code } },
+ afterAction: 'run'
+ });
+ } else if (menu === 'upgrade') {
+ var pipName = that.packageLib[key].pipName;
+ var code = com_util.formatString("!pip install --upgrade {0}", pipName);
+ if (vpConfig.extensionType === 'lite') {
+ code = com_util.formatString("%pip install --upgrade {0}", pipName);
+ }
+ // create block and run it
+ $('#vp_wrapper').trigger({
+ type: 'create_option_page',
+ blockType: 'block',
+ menuId: 'lgExe_code',
+ menuState: { taskState: { code: code } },
+ afterAction: 'run'
+ });
+ } else if (menu === 'delete') {
+ $(item).remove();
+ delete that.packageLib[key];
+ vpConfig.removeData('packageList', 'vppackman').then(function() {
+ vpConfig.setData({ 'packageList': that.packageLib }, 'vppackman');
+ });
+ }
+ evt.stopPropagation();
+ });
+ }
+
+ templateForBody() {
+ return ifHtml;
+ }
+
+ templateForAddPage() {
+ return `
+ Package name
+
+ Pip name
+
+
`;
+ }
+
+ templateForInstallPage() {
+ return `
+
Version selection
+
+
Latest version
+
+ Specified version
+
+
`;
+ }
+
+ openOptionPopup(type) {
+ let that = this;
+ let title = '';
+ let size = { width: 400, height: 250 };
+
+ $(this.wrapSelector('.vp-inner-popup-body')).empty();
+
+ this.state.popupType = type;
+ switch (type) {
+ case 'add':
+ title = 'Add new package to manage'
+ $(this.wrapSelector('.vp-inner-popup-body')).html(this.templateForAddPage());
+ break;
+ case 'install':
+ title = 'Install package'
+ // set content
+ $(this.wrapSelector('.vp-inner-popup-body')).html(this.templateForInstallPage());
+
+ $(this.wrapSelector('.vp-inner-popup-body input[name="ver_select"]')).on('change', function() {
+ let checkedType = $(this).val();
+ if (checkedType === 'specified') {
+ $(that.wrapSelector('.vp-inner-popup-version')).prop('disabled', false);
+ } else {
+ $(that.wrapSelector('.vp-inner-popup-version')).prop('disabled', true);
+ }
+ });
+ break;
+ }
+
+ // set size and position
+ $(this.wrapSelector('.vp-inner-popup-box')).css({
+ width: size.width,
+ height: size.height,
+ left: 'calc(50% - ' + (size.width/2) + 'px)',
+ top: 'calc(50% - ' + (size.height/2) + 'px)',
+ });
+
+ // show popup box
+ this.openInnerPopup(title);
+ }
+
+ handleInnerOk() {
+ switch (this.state.popupType) {
+ case 'add':
+ var packName = $(this.wrapSelector('.vp-inner-popup-package')).val();
+ var pipName = $(this.wrapSelector('.vp-inner-popup-pip')).val();
+ if (pipName === '') {
+ pipName = packName;
+ }
+ this.packageLib[packName] = { pipName: pipName };
+ vpConfig.setData({ 'packageList': this.packageLib }, 'vppackman');
+
+ // load package list
+ this.loadPackageList();
+ break;
+ case 'install':
+ let versionType = $(this.wrapSelector('.vp-inner-popup-body input[name="ver_select"]:checked')).val();
+ var pipName = this.packageLib[this.state.selected].pipName;
+ var code = com_util.formatString("!pip install {0}", pipName);
+ if (vpConfig.extensionType === 'lite') {
+ code = com_util.formatString("import piplite\npiplite.install('{0}')", pipName);
+ }
+ if (versionType === 'specified') {
+ // specified version
+ let version = $(this.wrapSelector('.vp-inner-popup-version')).val();
+ if (version && version !== '') {
+ code = com_util.formatString("!pip install {0}=={1}", pipName, version);
+ if (vpConfig.extensionType === 'lite') {
+ code = com_util.formatString("import piplite\npiplite.install('{0}=={1}')", pipName, version);
+ }
+ } else {
+ $(this.wrapSelector('.vp-inner-popup-version')).focus();
+ return false;
+ }
+ }
+ // create block and run it
+ $('#vp_wrapper').trigger({
+ type: 'create_option_page',
+ blockType: 'block',
+ menuId: 'lgExe_code',
+ menuState: { taskState: { code: code } },
+ afterAction: 'run'
+ });
+ break;
+ }
+
+ this.closeInnerPopup();
+ }
+
+ render() {
+ super.render();
+
+ let that = this;
+ vpConfig.getData('', 'vppackman').then(function(savedData) {
+ // Reset abnormal data
+ if (savedData == undefined || savedData.packageList === undefined) {
+ savedData = { packageList: JSON.parse(JSON.stringify(that.packageLibTemplate)) };
+ vpConfig.setData({ savedData }, 'vppackman');
+ }
+
+ that.packageLib = {
+ ...savedData.packageList
+ };
+
+ // load package list
+ that.loadPackageList();
+ }).catch(function(err) {
+ vpLog.display(VP_LOG_TYPE.ERROR, err);
+
+ that.packageLib = {
+ ...that.packageLibTemplate
+ };
+
+ // load package list
+ that.loadPackageList();
+ });
+ }
+
+ /**
+ *
+ * @param {String} key
+ * @param {Object} info installed, version, path
+ * @returns
+ */
+ renderPackageItem(key, info) {
+ var item = new com_String();
+ item.appendFormatLine('
', 'vp-pm-item', key, info.installed===true?'1':'0');
+ item.appendFormatLine('
', 'vp-pm-item-header', (info.path?info.path:''));
+ item.appendFormatLine('
{0} ', key);
+ if (info.installed === true) {
+ item.appendFormatLine('
{0} ', info.version);
+ } else {
+ item.appendLine('
Not installed ');
+ }
+ item.appendFormatLine('
', 'vp-pm-item-menu');
+ // install
+ item.appendFormatLine('
'
+ , 'vp-pm-item-menu-item', 'install', 'Install');
+ if (vpConfig.extensionType !== 'lite') {
+ // upgrade
+ item.appendFormatLine('
'
+ , 'vp-pm-item-menu-item', (info.installed===true?'':'disabled'), 'upgrade', 'Upgrade');
+ // uninstall
+ item.appendFormatLine('
'
+ , 'vp-pm-item-menu-item', (info.installed===true?'':'disabled'), 'uninstall', 'Uninstall');
+ }
+ item.appendLine('
'); // end of vp-pm-item-menu
+ item.appendLine('
'); // end of vp-pm-item-header
+ // delete button
+ item.appendLine('');
+ item.appendLine('
'); // end of vp-pm-item
+ return item.toString();
+ }
+
+ generateCode() {
+ return '';
+ }
+
+ loadPackageList() {
+ var that = this;
+ // import importlib
+ // _vp_pack = importlib.import_module('numpy')
+ // print(_vp_pack.__version__)
+
+ // clear table except head
+ $(this.wrapSelector('.vp-pm-table')).html('');
+
+ let packageList = Object.keys(this.packageLib);
+ vpKernel.getPackageList(packageList).then(function(resultObj) {
+ let { result } = resultObj;
+ let packageInfo = JSON.parse(result);
+
+ // load code list
+ var innerFuncCode = new com_String();
+ Object.keys(packageInfo).forEach(key => {
+ let info = packageInfo[key]; // installed, version, path
+ if (info) {
+ var item = that.renderPackageItem(key, info);
+ innerFuncCode.append(item);
+ }
+ });
+ $(that.wrapSelector('.vp-pm-table')).html(innerFuncCode.toString());
+
+ // bind item menu event
+ that.bindItemEvent();
+ }).catch(function() {
+
+ });
+ }
+
+ }
+
+ return PackageManager;
+});
\ No newline at end of file
diff --git a/visualpython/js/com/component/PopupComponent.js b/visualpython/js/com/component/PopupComponent.js
index 57873c37..89a34983 100644
--- a/visualpython/js/com/component/PopupComponent.js
+++ b/visualpython/js/com/component/PopupComponent.js
@@ -15,7 +15,7 @@
// CHROME: notebook/js/codemirror-ipython
(function(mod) {
if (typeof exports == "object" && typeof module == "object"){ // CommonJS
- if (vpExtType === 'lab') {
+ if (vpExtType === 'lab' || vpExtType === 'lite') {
mod(require("codemirror/lib/codemirror"),
require("codemirror/mode/python/python")
);
@@ -81,7 +81,7 @@ define([
* Component
*/
class PopupComponent extends Component {
- constructor(state={ config: { id: 'popup', name: 'Popup title', path: 'path/file' }}, prop={}) {
+ constructor(state={ config: { id: 'popup', name: 'Popup title', path: 'path/file', category: '' }}, prop={}) {
// CHROME: FIXME: #site -> .notebook-vertical
// super($('#site'), state, prop);
super($(vpConfig.parentSelector), state, prop);
@@ -359,6 +359,9 @@ define([
// add install codes
var codes = that.generateInstallCode();
codes && codes.forEach(code => {
+ if (vpConfig.extensionType === 'lite') {
+ code = code.replace('!', '%');
+ }
com_interface.insertCell('code', code, true, that.getSigText());
});
});
@@ -398,6 +401,11 @@ define([
that._saveSingleState($(this)[0]);
});
+ // click input box with selection
+ $(document).on('focus', this.wrapSelector('input'), function() {
+ $(this).select();
+ });
+
// Click buttons
$(this.wrapSelector('.vp-popup-button')).on('click', function(evt) {
var btnType = $(this).data('type');
@@ -492,12 +500,13 @@ define([
_unbindEvent() {
$(document).off('change', this.wrapSelector('.vp-state'));
+ $(document).off('focus', this.wrapSelector('input'));
}
_bindDraggable() {
var that = this;
let containment = 'body';
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
containment = '#main';
}
$(this.wrapSelector()).draggable({
@@ -544,7 +553,11 @@ define([
this.$pageDom = $(popupComponentHtml.replaceAll('${vp_base}', com_Const.BASE_PATH));
// set title
// this.$pageDom.find('.vp-popup-title').text(this.category + ' > ' + this.name);
- this.$pageDom.find('.vp-popup-title').html(`
${this.name} `);
+ if (this.category && this.category !== '') {
+ this.$pageDom.find('.vp-popup-title').html(`
${this.name} `);
+ } else {
+ this.$pageDom.find('.vp-popup-title').html(`
${this.name} `);
+ }
// set body
let bodyTemplate = this.templateForBody();
// CHROME: check url keyword and replace it
@@ -792,7 +805,9 @@ define([
if (customKey && customKey != '') {
// allow custom key until level 2
let customKeys = customKey.split('.');
- if (customKeys.length == 2) {
+ if (customKeys.length === 3) {
+ this.state[customKeys[0]][customKeys[1]][customKeys[2]] = newValue;
+ } else if (customKeys.length === 2) {
this.state[customKeys[0]][customKeys[1]] = newValue;
} else {
this.state[customKey] = newValue;
diff --git a/visualpython/js/loadVisualpython.js b/visualpython/js/loadVisualpython.js
index 2e8ecc69..c279b2c8 100644
--- a/visualpython/js/loadVisualpython.js
+++ b/visualpython/js/loadVisualpython.js
@@ -99,7 +99,7 @@ define([
cfg = $.extend(true, {}, vpConfig.defaultConfig, cfg);
vpFrame = new MainFrame();
- if (vpConfig.extensionType !== 'lab') {
+ if (vpConfig.extensionType !== 'lab' && vpConfig.extensionType !== 'lite') {
vpFrame.loadMainFrame();
}
@@ -192,6 +192,9 @@ define([
} else if (window.vpExtType === 'lab') {
// LAB: added extType as 'lab'
window.vpConfig = new com_Config('lab');
+ } else if (window.vpExtType === 'lite') {
+ // LITE: added extType as 'lite'
+ window.vpConfig = new com_Config('lite');
} else {
window.vpConfig = new com_Config();
}
@@ -199,7 +202,7 @@ define([
/**
* visualpython kernel
*/
- if (vpConfig.extensionType === 'lab') {
+ if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
window.vpKernel = new com_Kernel(vpLab);
} else {
window.vpKernel = new com_Kernel();
@@ -270,6 +273,7 @@ define([
events.on('kernel_ready.Kernel', function (evt, info) {
vpLog.display(VP_LOG_TYPE.LOG, 'vp operations for kernel ready...');
// read vp functions
+ vpConfig.isReady = true;
vpConfig.readKernelFunction();
});
} else if (vpConfig.extensionType === 'colab') {
@@ -277,9 +281,10 @@ define([
colab.global.notebook.kernel.listen('connected', function(x) {
vpLog.display(VP_LOG_TYPE.LOG, 'vp operations for kernel ready...');
// read vp functions
+ vpConfig.isReady = true;
vpConfig.readKernelFunction();
});
- } else if (vpConfig.extensionType === 'lab') {
+ } else if (vpConfig.extensionType === 'lab' || vpConfig.extensionType === 'lite') {
// LAB: if widget is ready or changed, ready for lab kernel connected, and restart vp
vpLab.shell._currentChanged.connect(function(s1, value) {
var { newValue } = value;
@@ -287,12 +292,14 @@ define([
if (newValue && newValue.sessionContext) {
if (newValue.sessionContext.isReady) {
vpLog.display(VP_LOG_TYPE.LOG, 'vp operations for kernel ready...');
+ vpConfig.isReady = true;
vpConfig.readKernelFunction();
vpConfig.checkVersionTimestamp();
}
newValue.sessionContext._connectionStatusChanged.connect(function(s2, status) {
if (status === 'connected') {
vpLog.display(VP_LOG_TYPE.LOG, 'vp operations for kernel ready...');
+ vpConfig.isReady = true;
vpConfig.readKernelFunction();
vpConfig.checkVersionTimestamp();
}
diff --git a/visualpython/js/m_apps/Bind.js b/visualpython/js/m_apps/Bind.js
index 4778245c..24d882f0 100644
--- a/visualpython/js/m_apps/Bind.js
+++ b/visualpython/js/m_apps/Bind.js
@@ -566,6 +566,7 @@ define([
}
loadState() {
+ super.loadState();
var {
type, concat, merge, userOption, allocateTo, resetIndex, withoutColumn
} = this.state;
diff --git a/visualpython/js/m_apps/File.js b/visualpython/js/m_apps/File.js
index e6bf25dd..9540c0d1 100644
--- a/visualpython/js/m_apps/File.js
+++ b/visualpython/js/m_apps/File.js
@@ -61,7 +61,11 @@ define([
// // this.dataPath = com_Const.DATA_PATH + "sample_csv/";
// this.dataPath = 'https://raw.githubusercontent.com/visualpython/visualpython/main/data/sample_csv/';
// }
- this.dataPath = 'https://raw.githubusercontent.com/visualpython/visualpython/main/visualpython/data/sample_csv/';
+ if (vpConfig.extensionType === 'lite') {
+ this.dataPath = '/drive/data/';
+ } else {
+ this.dataPath = 'https://raw.githubusercontent.com/visualpython/visualpython/main/visualpython/data/sample_csv/';
+ }
this.state = {
fileExtension: 'csv',
@@ -369,7 +373,7 @@ define([
// prepend user option
let hasAllocateTo = $(this.wrapSelector(prefix + '#o0')).length > 0;
if (hasAllocateTo) {
- $(this.wrapSelector(prefix + '#o0')).closest('tr').before(
+ $(this.wrapSelector(prefix + '#o0')).closest('tr').after(
$('
').append($(`User Option ');
- edgeTbody.appendFormatLine(': ');
edgeTbody.appendFormatLine('~ ');
edgeTbody.appendFormatLine(' ');
- });
+ }
$(that.wrapSelector('.vp-inner-popup-range-table tbody')).html(edgeTbody.toString());
// label change event
@@ -1065,7 +1114,7 @@ define([
});
}).catch(function(errObj) {
- // TODO:
+ vpLog.display(VP_LOG_TYPE.ERROR, errObj);
});
}
@@ -1333,8 +1382,8 @@ define([
if (type === 'column') {
content.appendLine('
Add type ', 'vp-inner-popup-addtype');
- content.appendFormatLine('{1} ', 'variable', 'Variable');
- content.appendFormatLine('{1} ', 'value', 'Value');
+ content.appendFormatLine('{1} ', 'calculate', 'Calculate');
+ content.appendFormatLine('{1} ', 'replace', 'Replace');
content.appendFormatLine('{1} ', 'condition', 'Condition');
content.appendFormatLine('{1} ', 'apply', 'Apply');
content.appendLine(' ');
@@ -1344,8 +1393,8 @@ define([
content.appendLine('
');
- // tab 1. variable
- content.appendFormatLine('
', 'vp-inner-popup-tab', 'variable');
+ // tab 1. calculate
+ content.appendFormatLine('
', 'vp-inner-popup-tab', 'calculate');
content.appendLine('
');
content.appendLine('
'); // end of vp-inner-popup-tab value
- // tab 2. value
- content.appendFormatLine('
', 'vp-inner-popup-tab', 'value');
+ // tab 2. replace
+ content.appendFormatLine('
', 'vp-inner-popup-tab', 'replace');
content.appendFormatLine('
', 'vp-grid-col-120');
content.appendLine('
Target column ');
content.appendFormatLine('
', 'vp-inner-popup-value-col-list');
@@ -1396,31 +1445,49 @@ define([
// tab 3. condition
// replace page - 2. condition
content.appendFormatLine('', 'vp-inner-popup-tab', 'condition');
- // condition table
- content.appendLine('');
- content.appendLine('
');
// value
- content.appendLine('
');
- content.appendLine('
Value ');
+ content.appendLine('
');
+ // condition table
+ content.appendLine('');
+ content.appendLine('
');
// tab 4. apply
content.appendFormatLine('
', 'vp-inner-popup-tab', 'apply');
content.appendLine('
');
- content.appendLine('
');
- content.appendLine('
Column ');
+ content.appendLine('
');
+ content.appendLine('
Target column ');
+ content.appendLine('
');
content.appendLine(this.renderColumnList(this.state.columnList));
+ // else on/off
+ content.appendFormatLine('Else On ', 'vp-inner-popup-toggle-else');
+ content.appendLine('
');
+ content.appendLine('
');
+ // content.appendFormatLine('
'
+ // , 'vp_popupAddApply', 'vp-input vp-inner-popup-apply-lambda', 'Type code manually');
+ // render condition
+ content.appendLine('
');
+ content.appendLine('
'); // end of else value line
content.appendLine('
');
content.appendLine('
'); // end of vp-inner-popup-tab apply
content.appendLine('
'); // end of vp-inner-popup-addpage
@@ -1438,6 +1505,44 @@ define([
$(this.wrapSelector('.vp-inner-popup-body')).find('.vp-inner-popup-value:nth(' + idx + ')').replaceWith(valueSelector.toTagString());
}
+ templateForApplyCase() {
+ return ``;
+ }
+
+ templateForApplyCondition() {
+ return ``;
+ }
+
renderCalculator(idx) {
let content = new com_String();
content.appendFormatLine('
', 'vp-input s vp-inner-popup-oper', idx);
@@ -1718,15 +1823,15 @@ define([
content.appendLine('');
content.appendLine('Replace type ', 'vp-inner-popup-replacetype');
- content.appendFormatLine('{1} ', 'value', 'Value');
+ content.appendFormatLine('{1} ', 'replace', 'Replace');
content.appendFormatLine('{1} ', 'condition', 'Condition');
content.appendLine(' ', 'vp-inner-popup-tab value');
+ // replace page - 1. replace
+ content.appendFormatLine('
', 'vp-inner-popup-tab replace');
content.appendFormatLine('
{1} ', 'vp-inner-popup-use-regex', 'Use Regular Expression');
content.appendLine('
');
content.appendFormatLine('
', 'vp-inner-popup-replace-table');
@@ -1742,8 +1847,16 @@ define([
content.appendLine('
');
// replace page - 2. condition
content.appendFormatLine('
', 'vp-inner-popup-tab condition');
+ // value
+ content.appendLine('
');
// condition table
- content.appendLine('