- Variable - + DataFrame +

Join diff --git a/js/m_apps/Bind.js b/js/m_apps/Bind.js index 5ceb9f5d..ea6b11d7 100644 --- a/js/m_apps/Bind.js +++ b/js/m_apps/Bind.js @@ -241,8 +241,10 @@ define([ if (useIndex || that.state.merge.right.useIndex) { $(that.wrapSelector('#vp_bdOn')).attr('disabled', true); + $(that.wrapSelector('#vp_bdLeftOn')).attr('disabled', true); } else { $(that.wrapSelector('#vp_bdOn')).attr('disabled', false); + $(that.wrapSelector('#vp_bdLeftOn')).attr('disabled', false); } }); @@ -272,8 +274,10 @@ define([ if (useIndex || that.state.merge.left.useIndex) { $(that.wrapSelector('#vp_bdOn')).attr('disabled', true); + $(that.wrapSelector('#vp_bdRightOn')).attr('disabled', true); } else { $(that.wrapSelector('#vp_bdOn')).attr('disabled', false); + $(that.wrapSelector('#vp_bdRightOn')).attr('disabled', false); } }); From 3a0fc6b201bda038d9c7e4c60b77e5765ea38fb2 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Thu, 2 Jun 2022 14:02:01 +0900 Subject: [PATCH 06/39] Fix Reshape --- html/m_apps/reshape.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/html/m_apps/reshape.html b/html/m_apps/reshape.html index 6785eb29..cfcc3d1f 100644 --- a/html/m_apps/reshape.html +++ b/html/m_apps/reshape.html @@ -1,11 +1,5 @@

- DataFrame - -

Reshape Type

+ DataFrame + +

Index From af272ea4fdb2535b9f62963bb5352c22b78b6ea4 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Thu, 2 Jun 2022 14:02:31 +0900 Subject: [PATCH 07/39] Fix MultiSelector for multiple dataframe selected --- js/com/component/MultiSelector.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/com/component/MultiSelector.js b/js/com/component/MultiSelector.js index 9077dabd..950cee5e 100644 --- a/js/com/component/MultiSelector.js +++ b/js/com/component/MultiSelector.js @@ -141,8 +141,8 @@ define([ } _getColumnList(parent, callback) { - if (parent && parent.length > 1) { - vpKernel.getColumnList(parent).then(function(resultObj) { + if (Array.isArray(parent) && parent.length > 1) { + vpKernel.getCommonColumnList(parent).then(function(resultObj) { let { result } = resultObj; try { var colList = JSON.parse(result); From 3d3a62410957bd0419816d9826fa395051ab05e8 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Thu, 2 Jun 2022 14:03:24 +0900 Subject: [PATCH 08/39] Fix Subset button on Instance App --- css/m_apps/instance.css | 2 +- js/m_apps/Subset.js | 57 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/css/m_apps/instance.css b/css/m_apps/instance.css index c1cbda6a..42d27115 100644 --- a/css/m_apps/instance.css +++ b/css/m_apps/instance.css @@ -88,5 +88,5 @@ background: #b0b0b0; } .vp-ds-button { - width: 45px; + width: 50px; } \ No newline at end of file diff --git a/js/m_apps/Subset.js b/js/m_apps/Subset.js index 9d2f3e26..36fbd9bd 100644 --- a/js/m_apps/Subset.js +++ b/js/m_apps/Subset.js @@ -132,7 +132,7 @@ define([ // set button next to input tag var buttonTag = new com_String(); buttonTag.appendFormat('', - VP_DS_BTN, this.uuid, 'vp-button', 'Edit'); + VP_DS_BTN, this.uuid, 'vp-button', 'Subset'); if (this.pageThis) { $(this.targetSelector).parent().append(buttonTag.toString()); } @@ -448,12 +448,7 @@ define([ tag.appendLine('

'); tag.appendLine(this.templateForConditionColumnInput(colList)); - tag.appendFormatLine(''); + tag.appendLine(this.templateForConditionOperator('')); tag.appendLine(''); tag.appendLine('

'); @@ -491,6 +486,22 @@ define([ tag.appendLine(''); return tag.toString(); } + templateForConditionOperator(dtype='object') { + var tag = new com_String(); + tag.appendFormatLine(''); + return tag.toString(); + } templateForConditionCondInput(category, dtype='object') { var vpCondSuggest = new SuggestInput(); vpCondSuggest.addClass('vp-input m vp-condition'); @@ -1331,17 +1342,22 @@ define([ that.generateCode(); }); + // change column selection for condition page $(document).on('change', this.wrapSelector('.vp-ds-cond-tbl .vp-col-list'), function () { var thisTag = $(this); var varName = that.state.pandasObject; var colName = $(this).find('option:selected').attr('data-code'); var colDtype = $(this).find('option:selected').attr('data-dtype'); + var operTag = $(this).closest('td').find('.vp-oper-list'); var condTag = $(this).closest('td').find('.vp-condition'); if (colName == '.index') { // index $(thisTag).closest('td').find('.vp-cond-use-text').prop('checked', false); + $(operTag).replaceWith(function () { + return that.templateForConditionOperator(''); + }); $(condTag).replaceWith(function () { return that.templateForConditionCondInput([], ''); }); @@ -1358,12 +1374,18 @@ define([ } else { $(thisTag).closest('td').find('.vp-cond-use-text').prop('checked', false); } + $(operTag).replaceWith(function () { + return that.templateForConditionOperator(colDtype); + }); $(condTag).replaceWith(function () { return that.templateForConditionCondInput(category, colDtype); }); that.generateCode(); } catch { $(thisTag).closest('td').find('.vp-cond-use-text').prop('checked', false); + $(operTag).replaceWith(function () { + return that.templateForConditionOperator(colDtype); + }); $(condTag).replaceWith(function () { return that.templateForConditionCondInput([], colDtype); }); @@ -1373,6 +1395,23 @@ define([ } }); + // change operator selection + $(document).on('change', this.wrapSelector('.vp-ds-cond-tbl .vp-oper-list'), function () { + var oper = $(this).val(); + var condTag = $(this).closest('td').find('.vp-condition'); + var useTextTag = $(this).closest('td').find('.vp-cond-use-text'); + // var colDtype = $(this).closest('td').find('.vp-col-list option:selected').attr('data-dtype'); + + // if operator is isnull(), notnull(), disable condition input + if (oper == 'isnull()' || oper == 'notnull()') { + $(condTag).prop('disabled', true); + $(useTextTag).prop('disabled', true); + } else { + $(condTag).prop('disabled', false); + $(useTextTag).prop('disabled', false); + } + }); + // use text $(document).on('change', this.wrapSelector('.vp-ds-cond-tbl .vp-cond-use-text'), function () { that.generateCode(); @@ -1507,6 +1546,8 @@ define([ rowSelection.appendFormat('{0}.str.startswith({1})', colValue, condValue); } else if (oper == 'ends with') { rowSelection.appendFormat('{0}.str.endswith({1})', colValue, condValue); + } else if (oper == 'isnull()' || oper == 'notnull()') { + rowSelection.appendFormat('{0}.{1}', colValue, oper); } else { rowSelection.appendFormat('{0}{1}{2}', colValue, oper != ''?(' ' + oper):'', condValue != ''?(' ' + condValue):''); } @@ -1538,6 +1579,8 @@ define([ rowSelection.appendFormat('{0}.str.startswith({1})', colValue, condValue); } else if (oper == 'ends with') { rowSelection.appendFormat('{0}.str.endswith({1})', colValue, condValue); + } else if (oper == 'isnull()' || oper == 'notnull()') { + rowSelection.appendFormat('{0}.{1}', colValue, oper); } else { rowSelection.appendFormat('{0}{1}{2}', colValue, oper != ''?(' ' + oper):'', condValue != ''?(' ' + condValue):''); } From 092198a75586035171228e58d9f31fdf72303479 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Thu, 2 Jun 2022 14:03:45 +0900 Subject: [PATCH 09/39] Small changes --- html/m_visualize/seaborn.html | 2 +- js/com/com_generatorV2.js | 2 ++ js/m_apps/File.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/html/m_visualize/seaborn.html b/html/m_visualize/seaborn.html index 234844e4..c13e7b61 100644 --- a/html/m_visualize/seaborn.html +++ b/html/m_visualize/seaborn.html @@ -69,7 +69,7 @@ - Data + Data

Set X and Y individually diff --git a/js/com/com_generatorV2.js b/js/com/com_generatorV2.js index 6ab70e3c..ebf1b6b0 100644 --- a/js/com/com_generatorV2.js +++ b/js/com/com_generatorV2.js @@ -772,6 +772,8 @@ define([ return $(tag); }); } + }).catch(function(err) { + vpLog.display(VP_LOG_TYPE.ERROR, 'com_generator - bindColumnSource error ', err) }); diff --git a/js/m_apps/File.js b/js/m_apps/File.js index fa062ef9..2434d728 100644 --- a/js/m_apps/File.js +++ b/js/m_apps/File.js @@ -40,7 +40,7 @@ define([ 'csv': 'csv', 'excel': 'xlsx', 'json': 'json', - 'pickle': 'pickle' + 'pickle': 'pkl' } this.package = { From 656c60a9c63a3ecb350dee0f06baa096dea787d3 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Thu, 2 Jun 2022 14:04:12 +0900 Subject: [PATCH 10/39] Fix Groupby --- js/m_apps/Groupby.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/m_apps/Groupby.js b/js/m_apps/Groupby.js index 1f405310..03c185f8 100644 --- a/js/m_apps/Groupby.js +++ b/js/m_apps/Groupby.js @@ -403,6 +403,7 @@ define([ var defaultMethod = ''; page.appendFormatLine('', '', 'Select method type'); page.appendFormatLine('', 'typing', 'Typing'); + page.appendLine(''); this.methodList.forEach(method => { if (method.value == '') { return; From 15d06e4a3710090dbc73139f9030e50d209a638a Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Thu, 2 Jun 2022 14:47:18 +0900 Subject: [PATCH 11/39] Fix Frame - Add column --- js/com/com_util.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/js/com/com_util.js b/js/com/com_util.js index 55109b62..b20321ed 100644 --- a/js/com/com_util.js +++ b/js/com/com_util.js @@ -123,12 +123,22 @@ define([ * @param {*} code * @returns */ - var convertToStr = function(code) { - if (!$.isNumeric(code)) { - if (code.includes("'")) { - code = `"${code}"`; - } else { - code = `'${code}'`; + var convertToStr = function(code, isText=null, useRegex=false) { + let prefix = ''; + if (useRegex) { + prefix = 'r'; + } + if (isText != null) { + if (isText) { + code = `${prefix}'${code}'`; + } + } else { + if (!$.isNumeric(code)) { + if (code.includes("'")) { + code = `${prefix}"${code}"`; + } else { + code = `${prefix}'${code}'`; + } } } return code; From 8bcc28803cd8d7e35ab75b75d3ed2ec625bb9ffa Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Thu, 2 Jun 2022 17:04:20 +0900 Subject: [PATCH 12/39] Change variable selector to SuggestInput --- js/com/component/PopupComponent.js | 12 +++++++- js/m_apps/Bind.js | 39 ++++++++++++++++-------- js/m_apps/Frame.js | 24 ++++++++------- js/m_apps/Groupby.js | 38 +++++++++++++++-------- js/m_apps/Profiling.js | 48 ++++++++++++++++++++---------- js/m_apps/Reshape.js | 39 ++++++++++++++++-------- js/m_apps/Subset.js | 25 ++++++++++++---- 7 files changed, 152 insertions(+), 73 deletions(-) diff --git a/js/com/component/PopupComponent.js b/js/com/component/PopupComponent.js index 036cf448..d58fd096 100644 --- a/js/com/component/PopupComponent.js +++ b/js/com/component/PopupComponent.js @@ -502,6 +502,16 @@ define([ if (!packageButton) { $(this.wrapSelector('#popupPackage')).hide(); } + if (installButton || importButton || packageButton) { + // resize height + $(this.wrapSelector('.vp-popup-content')).css({ + 'height': 'calc(100% - 30px)' + }); + } else { + $(this.wrapSelector('.vp-popup-content')).css({ + 'height': '100%' + }); + } // codeview & dataview button hide/show if (!codeview) { @@ -520,7 +530,7 @@ define([ if(!footer) { $(this.wrapSelector('.vp-popup-footer')).hide(); // set body wider - $(this.wrapSelector('.vp-popup-content')).css({ + $(this.wrapSelector('.vp-popup-body')).css({ 'height': 'calc(100% - 30px)' }) } diff --git a/js/m_apps/Bind.js b/js/m_apps/Bind.js index ea6b11d7..a6bddc7a 100644 --- a/js/m_apps/Bind.js +++ b/js/m_apps/Bind.js @@ -18,8 +18,9 @@ define([ 'vp_base/js/com/com_util', 'vp_base/js/com/com_String', 'vp_base/js/com/component/PopupComponent', + 'vp_base/js/com/component/SuggestInput', 'vp_base/js/com/component/MultiSelector' -], function(bindHtml, bindCss, com_util, com_String, PopupComponent, MultiSelector) { +], function(bindHtml, bindCss, com_util, com_String, PopupComponent, SuggestInput, MultiSelector) { /** * Bind @@ -382,19 +383,31 @@ define([ * @param {string} defaultValue previous value */ renderVariableList(id, varList, defaultValue='') { - var tag = new com_String(); - tag.appendFormatLine(''); // VP_VS_VARIABLES + // var tag = new com_String(); + // tag.appendFormatLine(''); // VP_VS_VARIABLES + // $(this.wrapSelector('#' + id)).replaceWith(function() { + // return tag.toString(); + // }); + let mappedList = varList.map(obj => { return { label: obj.varName, value: obj.varName, dtype: obj.varType } }); + + var variableInput = new SuggestInput(); + variableInput.setComponentID(id); + variableInput.addClass('vp-state'); + variableInput.setPlaceholder('Select variable'); + variableInput.setSuggestList(function () { return mappedList; }); + variableInput.setNormalFilter(true); + variableInput.setValue(defaultValue); $(this.wrapSelector('#' + id)).replaceWith(function() { - return tag.toString(); + return variableInput.toTagString(); }); } diff --git a/js/m_apps/Frame.js b/js/m_apps/Frame.js index ade7401d..6275ed9c 100644 --- a/js/m_apps/Frame.js +++ b/js/m_apps/Frame.js @@ -499,19 +499,21 @@ define([ } renderVariableList(varList, defaultValue='') { - var tag = new com_String(); - tag.appendFormatLine(''); // VP_VS_VARIABLES + variableInput.setNormalFilter(true); + variableInput.setValue(defaultValue); $(this.wrapSelector('#vp_feVariable')).replaceWith(function() { - return tag.toString(); + return variableInput.toTagString(); }); } diff --git a/js/m_apps/Groupby.js b/js/m_apps/Groupby.js index 03c185f8..4e02cdc4 100644 --- a/js/m_apps/Groupby.js +++ b/js/m_apps/Groupby.js @@ -18,8 +18,9 @@ define([ 'vp_base/js/com/com_String', 'vp_base/js/com/com_util', 'vp_base/js/com/component/PopupComponent', + 'vp_base/js/com/component/SuggestInput', 'vp_base/js/com/component/MultiSelector' -], function(gbHtml, gbCss, com_String, com_util, PopupComponent, MultiSelector) { +], function(gbHtml, gbCss, com_String, com_util, PopupComponent, SuggestInput, MultiSelector) { /** * Groupby @@ -374,18 +375,29 @@ define([ * @param {string} defaultValue previous value */ templateForVariableList(varList, defaultValue='') { - var tag = new com_String(); - tag.appendFormatLine(''); // VP_VS_VARIABLES - return tag.toString(); + // var tag = new com_String(); + // tag.appendFormatLine(''); // VP_VS_VARIABLES + // return tag.toString(); + let mappedList = varList.map(obj => { return { label: obj.varName, value: obj.varName, dtype: obj.varType } }); + + var variableInput = new SuggestInput(); + variableInput.setComponentID('vp_gbVariable'); + variableInput.addClass('vp-state'); + variableInput.setPlaceholder('Select variable'); + variableInput.setSuggestList(function () { return mappedList; }); + variableInput.setNormalFilter(true); + variableInput.setValue(defaultValue); + + return variableInput.toTagString(); } /** diff --git a/js/m_apps/Profiling.js b/js/m_apps/Profiling.js index c57442d7..37f7135c 100644 --- a/js/m_apps/Profiling.js +++ b/js/m_apps/Profiling.js @@ -18,8 +18,9 @@ define([ 'vp_base/js/com/com_String', 'vp_base/js/com/com_interface', 'vp_base/js/com/component/PopupComponent', + 'vp_base/js/com/component/SuggestInput', 'vp_base/js/com/component/FileNavigation' -], function(proHTML, proCss, com_String, com_interface, PopupComponent, FileNavigation) { +], function(proHTML, proCss, com_String, com_interface, PopupComponent, SuggestInput, FileNavigation) { const PROFILE_TYPE = { NONE: -1, @@ -44,7 +45,7 @@ define([ this.config.codeview = false; this.config.dataview = false; this.config.runButton = false; - this.config.size = { width: 500, height: 430 }; + this.config.size = { width: 500, height: 500 }; this.selectedReport = ''; } @@ -167,7 +168,7 @@ define([ // render variable list // replace $(that.wrapSelector('#vp_pfVariable')).replaceWith(function() { - return that.renderVariableList(varList); + return that.templateForVariableList(varList); }); $(that.wrapSelector('#vp_pfVariable')).trigger('change'); } catch (ex) { @@ -176,20 +177,35 @@ define([ }); } - renderVariableList(varList) { - var tag = new com_String(); + templateForVariableList(varList) { var beforeValue = $(this.wrapSelector('#vp_pfVariable')).val(); - tag.appendFormatLine(''); // VP_VS_VARIABLES - return tag.toString(); + if (beforeValue == null) { + beforeValue = ''; + } + // var tag = new com_String(); + // tag.appendFormatLine(''); // VP_VS_VARIABLES + // return tag.toString(); + + let mappedList = varList.map(obj => { return { label: obj.varName, value: obj.varName, dtype: obj.varType } }); + + var variableInput = new SuggestInput(); + variableInput.setComponentID('vp_pfVariable'); + variableInput.addClass('vp-pf-select'); + variableInput.setPlaceholder('Select variable'); + variableInput.setSuggestList(function () { return mappedList; }); + variableInput.setNormalFilter(true); + variableInput.setValue(beforeValue); + + return variableInput.toTagString(); } /** diff --git a/js/m_apps/Reshape.js b/js/m_apps/Reshape.js index 2c782cdc..4a8889ed 100644 --- a/js/m_apps/Reshape.js +++ b/js/m_apps/Reshape.js @@ -18,8 +18,9 @@ define([ 'vp_base/js/com/com_String', 'vp_base/js/com/com_util', 'vp_base/js/com/component/PopupComponent', + 'vp_base/js/com/component/SuggestInput', 'vp_base/js/com/component/MultiSelector' -], function(reshapeHtml, reshapeCss, com_String, com_util, PopupComponent, MultiSelector) { +], function(reshapeHtml, reshapeCss, com_String, com_util, PopupComponent, SuggestInput, MultiSelector) { /** * Reshape @@ -310,19 +311,31 @@ define([ * @param {string} defaultValue previous value */ renderVariableList(id, varList, defaultValue='') { - var tag = new com_String(); - tag.appendFormatLine(''); // VP_VS_VARIABLES + // var tag = new com_String(); + // tag.appendFormatLine(''); // VP_VS_VARIABLES + // $(this.wrapSelector('#' + id)).replaceWith(function() { + // return tag.toString(); + // }); + let mappedList = varList.map(obj => { return { label: obj.varName, value: obj.varName, dtype: obj.varType } }); + + var variableInput = new SuggestInput(); + variableInput.setComponentID(id); + variableInput.addClass('vp-state'); + variableInput.setPlaceholder('Select variable'); + variableInput.setSuggestList(function () { return mappedList; }); + variableInput.setNormalFilter(true); + variableInput.setValue(defaultValue); $(this.wrapSelector('#' + id)).replaceWith(function() { - return tag.toString(); + return variableInput.toTagString(); }); } diff --git a/js/m_apps/Subset.js b/js/m_apps/Subset.js index 36fbd9bd..ac96ffe2 100644 --- a/js/m_apps/Subset.js +++ b/js/m_apps/Subset.js @@ -632,12 +632,25 @@ define([ // 1. Target Variable var prevValue = $(that.wrapSelector('.' + VP_DS_PANDAS_OBJECT)).val(); - $(that.wrapSelector('.' + VP_DS_PANDAS_OBJECT_BOX)).replaceWith(function () { - var pdVarSelect = new VarSelector(that.pdObjTypes, that.state.dataType, false, false); - pdVarSelect.addClass(VP_DS_PANDAS_OBJECT); - pdVarSelect.addBoxClass(VP_DS_PANDAS_OBJECT_BOX); - pdVarSelect.setValue(prevValue); - return pdVarSelect.render(); + // $(that.wrapSelector('.' + VP_DS_PANDAS_OBJECT_BOX)).replaceWith(function () { + // var pdVarSelect = new VarSelector(that.pdObjTypes, that.state.dataType, false, false); + // pdVarSelect.addClass(VP_DS_PANDAS_OBJECT); + // pdVarSelect.addBoxClass(VP_DS_PANDAS_OBJECT_BOX); + // pdVarSelect.setValue(prevValue); + // return pdVarSelect.render(); + // }); + var variableInput = new SuggestInput(); + variableInput.addClass(VP_DS_PANDAS_OBJECT); + variableInput.setPlaceholder('Select variable'); + variableInput.setSuggestList(function () { return varList; }); + variableInput.setSelectEvent(function (value) { + $(this.wrapSelector()).val(value); + $(this.wrapSelector()).trigger('change'); + }); + variableInput.setNormalFilter(true); + variableInput.setValue(prevValue); + $(that.wrapSelector('.' + VP_DS_PANDAS_OBJECT)).replaceWith(function() { + return variableInput.toTagString(); }); if (!that.stateLoaded) { that.reloadSubsetData(); From d5d56bf2a78cfeefde62cc5bd699555aa2e18339 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Fri, 3 Jun 2022 08:42:06 +0900 Subject: [PATCH 13/39] Add plot_feature_importances_ to ModelInfo --- js/com/com_generatorV2.js | 14 ++++- js/m_ml/ModelInfo.js | 107 +++++++++++++++++++++++++++++--------- 2 files changed, 95 insertions(+), 26 deletions(-) diff --git a/js/com/com_generatorV2.js b/js/com/com_generatorV2.js index ebf1b6b0..e81a8fa8 100644 --- a/js/com/com_generatorV2.js +++ b/js/com/com_generatorV2.js @@ -258,6 +258,14 @@ define([ content = renderTabBlock(pageThis, obj, state); break; case 'bool_checkbox': + content = $(``); + if (value != undefined) { + // set as saved value + $(content).attr({ + 'checked': value + }); + } + break; case 'bool_select': // True False select box var optSlct = $(``); @@ -553,13 +561,17 @@ define([ value = input; break; case 'option_checkbox': - var checked = $(pageThis.wrapSelector("input[name='"+obj.name+"']:checked")).val(); + let checked = $(pageThis.wrapSelector("input[name='"+obj.name+"']:checked")).val(); for (var i = 0; i < checked.length; i++) { value += "'" + $(checked[i]).val() + "',"; } value = value.substr(0, value.length-1); break; + case 'bool_checkbox': + let isChecked = $(pageThis.wrapSelector('#'+obj.name)).prop('checked'); + value = isChecked?'True':'False'; + break; case 'input_multi': case 'bool_select': case 'var_select': diff --git a/js/m_ml/ModelInfo.js b/js/m_ml/ModelInfo.js index 65053e6c..1f715372 100644 --- a/js/m_ml/ModelInfo.js +++ b/js/m_ml/ModelInfo.js @@ -313,9 +313,17 @@ define([ generateCode() { let { model } = this.state; + let codeList = []; let code = new com_String(); let replaceDict = {'${model}': model}; + // If functions are available + if (this.state.optionConfig.functions != undefined) { + this.state.optionConfig.functions.forEach(func => { + codeList.push(func); + }); + } + // If import code is available, generate its code in front of code if (this.state.optionConfig.import != undefined) { code.appendLine(this.state.optionConfig.import); @@ -342,8 +350,9 @@ define([ } } } + codeList.push(code.toString()); - return code.toString(); + return codeList; } getModelCategory(modelType) { @@ -399,22 +408,61 @@ define([ { name: 'importance_allocate', label: 'Allocate to', component: ['input'], placeholder: 'New variable', value: 'importances' } ] }, + 'feature_importances': { + name: 'feature_importances', + label: 'Feature importances', + functions: [ + "def create_feature_importances(model, X_train=None, sort=False):\ + \n if isinstance(X_train, pd.core.frame.DataFrame):\ + \n feature_names = X_train.columns\ + \n else:\n\ + \n feature_names = [ 'X{}'.format(i) for i in range(len(model.feature_importances_)) ]\ + \n\ + \n df_i = pd.DataFrame(model.feature_importances_, index=feature_names, columns=['Feature_importance'])\ + \n df_i['Percentage'] = 100 * (df_i['Feature_importance'] / df_i['Feature_importance'].max())\ + \n if sort: df_i.sort_values(by='Feature_importance', ascending=False, inplace=True)\ + \n df_i = df_i.round(2)\ + \n\ + \n return df_i" + ], + code: "${fi_allocate} = create_feature_importances(${model}, ${fi_featureData}${sort})", + description: 'Allocate feature_importances_', + options: [ + { name: 'fi_featureData', label: 'Feature Data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'ndarray', 'list', 'dict'], value: 'X_train' }, + { name: 'fi_allocate', label: 'Allocate to', component: ['input'], placeholder: 'New variable', value: 'df_i' }, + { name: 'sort', label: 'Sort data', component: ['bool_checkbox'], value: true, usePair: true } + ] + }, 'plot_feature_importances': { name: 'plot_feature_importances', label: 'Plot feature importances', - code: "def plot_feature_importances(model):\n\ - n_features = len(model.feature_importances_)\n\ - feature_names = [ 'X{}'.format(i) for i in range(n_features) ]\n\ - plt.barh(np.arange(n_features), model.feature_importances_, align='center')\n\ - plt.yticks(np.arange(n_features), feature_names)\n\ - plt.xlabel('Feature importance')\n\ - plt.ylabel('Features')\n\ - plt.ylim(-1, n_features)\n\ - plt.show()\n\n\ -plot_feature_importances(${model})", - description: '', + functions: [ + "def create_feature_importances(model, X_train=None, sort=False):\ + \n if isinstance(X_train, pd.core.frame.DataFrame):\ + \n feature_names = X_train.columns\ + \n else:\n\ + \n feature_names = [ 'X{}'.format(i) for i in range(len(model.feature_importances_)) ]\ + \n\ + \n df_i = pd.DataFrame(model.feature_importances_, index=feature_names, columns=['Feature_importance'])\ + \n df_i['Percentage'] = 100 * (df_i['Feature_importance'] / df_i['Feature_importance'].max())\ + \n if sort: df_i.sort_values(by='Feature_importance', ascending=False, inplace=True)\ + \n df_i = df_i.round(2)\ + \n\ + \n return df_i", + "def plot_feature_importances(model, X_train=None, sort=False):\ + \n df_i = create_feature_importances(model, X_train, sort)\ + \n\ + \n df_i['Percentage'].sort_values().plot(kind='barh')\ + \n plt.xlabel('Feature importance Percentage')\ + \n plt.ylabel('Features')\ + \n\ + \n plt.show()" + ], + code: "plot_feature_importances(${model}, ${fi_featureData}${sort})", + description: 'Draw feature_importances_', options: [ - + { name: 'fi_featureData', label: 'Feature Data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'ndarray', 'list', 'dict'], value: 'X_train' }, + { name: 'sort', label: 'Sort data', component: ['bool_checkbox'], value: true, usePair: true } ] } } @@ -522,6 +570,7 @@ plot_feature_importances(${model})", ] }, 'permutation_importance': defaultInfos['permutation_importance'], + 'feature_importances': defaultInfos['feature_importances'], 'plot_feature_importances': defaultInfos['plot_feature_importances'], 'Coefficient': { name: 'coef_', @@ -573,11 +622,11 @@ plot_feature_importances(${model})", name: 'roc_curve', label: 'ROC Curve', import: 'from sklearn import metrics', - code: "fpr, tpr, thresholds = metrics.roc_curve(${roc_targetData}, ${model}.predict_proba(${roc_featureData})[:, 1])\n\ -plt.plot(fpr, tpr, label='ROC Curve')\n\ -plt.xlabel('Sensitivity')\n\ -plt.ylabel('Specificity')\n\ -plt.show()", + code: "fpr, tpr, thresholds = metrics.roc_curve(${roc_targetData}, ${model}.predict_proba(${roc_featureData})[:, 1])\ + \nplt.plot(fpr, tpr, label='ROC Curve')\ + \nplt.xlabel('Sensitivity')\ + \nplt.ylabel('Specificity')\ + \nplt.show()", description: '', options: [ { name: 'roc_targetData', label: 'Target Data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'ndarray', 'list', 'dict'], value: 'y_test' }, @@ -595,8 +644,16 @@ plt.show()", { name: 'auc_featureData', label: 'Feature Data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'ndarray', 'list', 'dict'], value: 'X_test' } ] }, - 'permutation_importance': defaultInfos['permutation_importance'], - 'plot_feature_importances': defaultInfos['plot_feature_importances'] + 'permutation_importance': defaultInfos['permutation_importance'] + } + + // feature importances + if (modelType != 'LogisticRegression' && modelType != 'SVC') { + infos = { + ...infos, + 'feature_importances': defaultInfos['feature_importances'], + 'plot_feature_importances': defaultInfos['plot_feature_importances'] + } } // use decision_function on ROC, AUC @@ -608,11 +665,11 @@ plt.show()", ...infos, 'roc_curve': { ...infos['roc_curve'], - code: "fpr, tpr, thresholds = metrics.roc_curve(${roc_targetData}, ${model}.decision_function(${roc_featureData}))\n\ -plt.plot(fpr, tpr, label='ROC Curve')\n\ -plt.xlabel('Sensitivity')\n\ -plt.ylabel('Specificity')\n\ -plt.show()" + code: "fpr, tpr, thresholds = metrics.roc_curve(${roc_targetData}, ${model}.decision_function(${roc_featureData}))\ + \nplt.plot(fpr, tpr, label='ROC Curve')\ + \nplt.xlabel('Sensitivity')\ + \nplt.ylabel('Specificity')\ + \nplt.show()" }, 'auc': { ...infos['auc'], From 358540ec6cbef0ae34d2fff2f53eee3fee8f3970 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Fri, 3 Jun 2022 10:07:21 +0900 Subject: [PATCH 14/39] Add pivot_table to Reshape --- html/m_apps/reshape.html | 19 ++++++ js/com/component/MultiSelector.js | 9 ++- js/m_apps/Reshape.js | 107 +++++++++++++++++++++++++++--- 3 files changed, 122 insertions(+), 13 deletions(-) diff --git a/html/m_apps/reshape.html b/html/m_apps/reshape.html index cfcc3d1f..3c70366b 100644 --- a/html/m_apps/reshape.html +++ b/html/m_apps/reshape.html @@ -4,6 +4,7 @@ Reshape Type

@@ -28,6 +29,24 @@

+ Index + +

+ Columns + +

+ Values + +

+ Aggregate + +

Id diff --git a/js/com/component/MultiSelector.js b/js/com/component/MultiSelector.js index 950cee5e..c374e29e 100644 --- a/js/com/component/MultiSelector.js +++ b/js/com/component/MultiSelector.js @@ -61,14 +61,14 @@ define([ // configuration this.config = this.state; - var { mode, type, parent, selectedList=[], includeList=[], excludeList=[] } = this.config; - this.mode = mode; // variable / columns / index / ndarray0 / ndarray1 + var { mode, type, parent, dataList=[], selectedList=[], includeList=[], excludeList=[] } = this.config; + this.mode = mode; // variable / columns / index / ndarray0 / ndarray1 / methods / data(given data) this.parent = parent; this.selectedList = selectedList; this.includeList = includeList; this.excludeList = excludeList; - this.dataList = []; + this.dataList = dataList; // [ { value, code, type }, ... ] this.pointer = { start: -1, end: -1 }; var that = this; @@ -99,6 +99,9 @@ define([ that._executeCallback(dataList); }); break; + case 'data': + that._executeCallback(this.dataList); + break; } } diff --git a/js/m_apps/Reshape.js b/js/m_apps/Reshape.js index 4a8889ed..6108e6ed 100644 --- a/js/m_apps/Reshape.js +++ b/js/m_apps/Reshape.js @@ -38,7 +38,8 @@ define([ pivot: { index: [], columns: [], - values: [] + values: [], + aggfunc: [] }, melt: { idVars: [], @@ -98,7 +99,7 @@ define([ that._resetColumnSelector(that.wrapSelector('#vp_rsValueVars')); that.state.pivot = { - index: [], columns: [], values: [] + index: [], columns: [], values: [], aggfunc: [] }; that.state.melt = { idVars: [], valueVars: [] @@ -116,13 +117,8 @@ define([ var type = $(this).val(); that.state.type = type; // change visibility - if (type == 'pivot') { - $(that.wrapSelector('.vp-rs-type-box.melt')).hide(); - $(that.wrapSelector('.vp-rs-type-box.pivot')).show(); - } else { - $(that.wrapSelector('.vp-rs-type-box.pivot')).hide(); - $(that.wrapSelector('.vp-rs-type-box.melt')).show(); - } + $(that.wrapSelector('.vp-rs-type-box')).hide(); + $(that.wrapSelector('.vp-rs-type-box.' + type)).show(); // clear user option $(that.wrapSelector('#vp_rsUserOption')).val(''); @@ -168,6 +164,19 @@ define([ that.openColumnSelector(targetVariable, $(that.wrapSelector('#vp_rsValues')), 'Select columns', excludeList); }); + // aggfunc change event + $(document).on('change', this.wrapSelector('#vp_rsAggfunc'), function(event) { + var colList = event.dataList; + that.state.pivot.aggfunc = colList; + }); + + // aggfunc select button event + $(document).on('click', this.wrapSelector('#vp_rsAggfunc'), function() { + var targetVariable = [ that.state.variable ]; + var excludeList = that.state.pivot.aggfunc.map(obj => obj.code); + that.openMethodSelector(targetVariable, $(that.wrapSelector('#vp_rsAggfunc')), 'Select columns', excludeList); + }); + // id vars change event $(document).on('change', this.wrapSelector('#vp_rsIdVars'), function(event) { var colList = event.dataList; @@ -344,13 +353,39 @@ define([ * @param {Array} previousList previous selected columns * @param {Array} excludeList columns to exclude */ - renderColumnSelector(targetVariable, previousList, excludeList) { + renderColumnSelector(targetVariable, previousList, excludeList) { this.popup.ColSelector = new MultiSelector( this.wrapSelector('.vp-inner-popup-body'), { mode: 'columns', parent: targetVariable, selectedList: previousList, excludeList: excludeList } ); } + /** + * Render method selector using MultiSelector module + * @param {Array} previousList previous selected methods + * @param {Array} excludeList methods to exclude + */ + renderMethodSelector(targetVariable, previousList, excludeList) { + let methodList = [ + { value: 'count', code: "'count'" }, + { value: 'first', code: "'first'" }, + { value: 'last', code: "'last'" }, + { value: 'size', code: "'size'" }, + { value: 'std', code: "'std'" }, + { value: 'sum', code: "'sum'" }, + { value: 'max', code: "'max'" }, + { value: 'mean', code: "'mean'" }, + { value: 'median', code: "'median'" }, + { value: 'min', code: "'min'" }, + { value: 'quantile', code: "'quantile'" }, + ]; + + this.popup.ColSelector = new MultiSelector( + this.wrapSelector('.vp-inner-popup-body'), + { mode: 'data', parent: targetVariable, dataList: methodList, selectedList: previousList, excludeList: excludeList } + ); + } + /** * Load variable list (dataframe) */ @@ -422,6 +457,45 @@ define([ } } + } else if (type == 'pivot_table') { + //================================================================ + // pivot_table + //================================================================ + // index (optional) + if (pivot.index && pivot.index.length > 0) { + if (pivot.index.length == 1) { + options.push(com_util.formatString("index={0}", pivot.index[0].code)); + } else { + options.push(com_util.formatString("index=[{0}]", pivot.index.map(col => col.code).join(','))); + } + } + + // columns + if (pivot.columns && pivot.columns.length > 0) { + if (pivot.columns.length == 1) { + options.push(com_util.formatString("columns={0}", pivot.columns[0].code)); + } else { + options.push(com_util.formatString("columns=[{0}]", pivot.columns.map(col => col.code).join(','))); + } + } + + // values (optional) + if (pivot.values && pivot.values.length > 0) { + if (pivot.values.length == 1) { + options.push(com_util.formatString("values={0}", pivot.values[0].code)); + } else { + options.push(com_util.formatString("values=[{0}]", pivot.values.map(col => col.code).join(','))); + } + } + + // aggfunc + if (pivot.aggfunc && pivot.aggfunc.length > 0) { + if (pivot.aggfunc.length == 1) { + options.push(com_util.formatString("aggfunc={0}", pivot.aggfunc[0].code)); + } else { + options.push(com_util.formatString("aggfunc=[{0}]", pivot.aggfunc.map(col => col.code).join(','))); + } + } } else { //================================================================ // melt @@ -511,6 +585,19 @@ define([ this.openInnerPopup(title); } + openMethodSelector(targetVariable, targetSelector, title='Select methods', excludeList=[]) { + this.popup.targetVariable = targetVariable; + this.popup.targetSelector = targetSelector; + var previousList = this.popup.targetSelector.data('list'); + if (previousList) { + previousList = previousList.map(col => col.code) + } + this.renderMethodSelector(targetVariable, previousList, excludeList); + + // set title + this.openInnerPopup(title); + } + handleInnerOk() { // ok input popup var dataList = this.popup.ColSelector.getDataList(); From fc075b8e8db1c890104884923a48ec5ba3935735 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Fri, 3 Jun 2022 15:08:06 +0900 Subject: [PATCH 15/39] Add bins option to Seaborn - histplot --- data/m_visualize/seabornLibrary.js | 3 ++- html/m_visualize/seaborn.html | 16 ++++++++++++---- js/m_visualize/Seaborn.js | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/data/m_visualize/seabornLibrary.js b/data/m_visualize/seabornLibrary.js index 438ec88f..72a282a7 100644 --- a/data/m_visualize/seabornLibrary.js +++ b/data/m_visualize/seabornLibrary.js @@ -48,13 +48,14 @@ define([ /** Distribution plots */ 'histplot': { name: 'Histogram Plot', - code: '${allocateTo} = sns.histplot(${data}${x}${y}${hue}${etc})', + code: '${allocateTo} = sns.histplot(${data}${x}${y}${hue}${bins}${etc})', description: 'Plot univariate or bivariate histograms to show distributions of datasets.', options: [ { name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'], usePair: true }, { name: 'x', component: ['col_select'], usePair: true }, { name: 'y', component: ['col_select'], usePair: true }, { name: 'hue', component: ['col_select'], usePair: true }, + { name: 'bins', component: ['col_select'], usePair: true }, { name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true } ] }, diff --git a/html/m_visualize/seaborn.html b/html/m_visualize/seaborn.html index c13e7b61..46e00b05 100644 --- a/html/m_visualize/seaborn.html +++ b/html/m_visualize/seaborn.html @@ -88,10 +88,18 @@

- Hue - +

+ Hue + +

+ Bins + +

User Option

'); + content.appendLine(' '); + content.appendLine(''); + content.appendLine(' '); + content.appendLine('
Value	', 'vp-inner-popup-input3'); + content.appendFormatLine('{1}', 'vp-inner-popup-istext3','Text'); + content.appendLine('

diff --git a/js/m_visualize/Seaborn.js b/js/m_visualize/Seaborn.js index 32498693..cba8080c 100644 --- a/js/m_visualize/Seaborn.js +++ b/js/m_visualize/Seaborn.js @@ -157,6 +157,15 @@ define([ $(that.wrapSelector(com_util.formatString('.vp-tab-page-box.{0} > .vp-tab-page', level))).hide(); $(that.wrapSelector(com_util.formatString('.vp-tab-page[data-type="{0}"]', type))).show(); }); + + $(this.wrapSelector('#chartType')).on('change', function() { + // add bins to histplot + let chartType = $(this).val(); + $(that.wrapSelector('.sb-option')).hide(); + if (chartType == 'histplot') { + $(that.wrapSelector('.sb-option.bins')).show(); + } + }) // use data or not $(this.wrapSelector('#setXY')).on('change', function() { @@ -311,6 +320,12 @@ define([ }); $(page).find('#sampleCount').html(sampleCountTag.toString()); + // data options depend on chart type + $(page).find('.sb-option').hide(); + if (this.state.chartType == 'histplot') { + $(page).find('.sb-option.bins').show(); + } + //================================================================ // Load state //================================================================ From df3e5912001465dd5f2c02ad339ac77efc53fd00 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Fri, 3 Jun 2022 19:55:09 +0900 Subject: [PATCH 16/39] Add subset to Frame - Add column / Replace --- css/m_apps/frame.css | 31 ++++++ css/m_apps/subset.css | 13 ++- js/com/com_generator.js | 2 +- js/com/component/PopupComponent.js | 4 + js/m_apps/Frame.js | 145 +++++++++++++++++++++++++---- js/m_apps/Instance.js | 51 +++++----- js/m_apps/Subset.js | 132 +++++++++++++++++++------- 7 files changed, 300 insertions(+), 78 deletions(-) diff --git a/css/m_apps/frame.css b/css/m_apps/frame.css index 5f178f00..23c28f87 100644 --- a/css/m_apps/frame.css +++ b/css/m_apps/frame.css @@ -244,4 +244,35 @@ } .vp-inner-popup-apply-column { width: 153px; +} + +/* UDF Editor - CodeMirror */ +.vp-fr-subset-box .CodeMirror { + display: inline-block; + width: calc(100% - 55px); + height: 30px; + border: 1px solid var(--gray-color); + border-radius: 3px; + background-image: repeating-linear-gradient( to right, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 5px ), repeating-linear-gradient( to bottom, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 5px ); + overflow: hidden; +} +.vp-fr-subset-box .CodeMirror-empty { outline: none; } +.vp-fr-subset-box .CodeMirror-empty.CodeMirror-focused { outline: none; } +.vp-fr-subset-box .CodeMirror pre.CodeMirror-placeholder { color: #999; } + +/* Hide cursor in read only fields */ +.vp-fr-subset-box .CodeMirror-readonly .CodeMirror-cursor { + display: none !important +} +/* .CodeMirror-scroll { min-height: 80px; max-height: 80px;} */ +.vp-fr-subset-box .CodeMirror-code .cm-variable { + background-color: rgba(47, 133, 90, 0.2); +} +.vp-fr-subset-box .CodeMirror-code .cm-property { + background-color: rgba(246, 173, 85, 0.2); +} + +.vp-fr-subset-box .vp-ds-button { + width: 50px; + vertical-align: top; } \ No newline at end of file diff --git a/css/m_apps/subset.css b/css/m_apps/subset.css index d53454e4..b22c10a7 100644 --- a/css/m_apps/subset.css +++ b/css/m_apps/subset.css @@ -99,8 +99,8 @@ border: 0.25px solid #E4E4E4; padding: 15px; } -.vp-ds-tab-page-box.subset-row { - border-right: 0px; +.vp-ds-tab-page-box.subset-column { + border-left: 0px; } /* .vp-ds-tab-page-box.subset-condition { grid-column-start: 1; @@ -111,6 +111,9 @@ font-weight: bold; margin: 5px 0px 0px 5px; } +.vp-ds-rowtype-box.condition { + position: relative; +} .vp-ds-rowtype-box.condition .vp-vs-box { padding-bottom: 5px; } @@ -130,8 +133,10 @@ width: 85px; } .vp-ds-rowtype-box.condition .vp-condition-use-text { - float: right; - margin-right: 42px; + /* float: right; + margin-right: 42px; */ + position: absolute; + left: 245px; } .vp-ds-rowtype, .vp-ds-coltype { diff --git a/js/com/com_generator.js b/js/com/com_generator.js index aeac2588..5ceedfd6 100644 --- a/js/com/com_generator.js +++ b/js/com/com_generator.js @@ -81,7 +81,7 @@ define([ vp_bindColumnSource(selector, targetSelector, autoCols[target]); // on change event $(targetSelector).on('change', function() { - console.log('change event ', selector, targetSelector, autoCols[target]); + // console.log('change event ', selector, targetSelector, autoCols[target]); vp_bindColumnSource(selector, this, autoCols[target]); }); }); diff --git a/js/com/component/PopupComponent.js b/js/com/component/PopupComponent.js index d58fd096..5cce88eb 100644 --- a/js/com/component/PopupComponent.js +++ b/js/com/component/PopupComponent.js @@ -164,6 +164,10 @@ define([ /** * Initialize codemirror * @param {Object} cmObj { key, selector, type, ... } + * - key : key to save its value as state (this.state[key]) + * - selector : selector to distinguish codemirror tag (textarea) + * ex) this.wrapSelector('.cm-tag') + * - type : code / readonly / markdown */ initCodemirror(cmObj) { let {key, selector, type, events} = cmObj; diff --git a/js/m_apps/Frame.js b/js/m_apps/Frame.js index 6275ed9c..c035bbbf 100644 --- a/js/m_apps/Frame.js +++ b/js/m_apps/Frame.js @@ -19,8 +19,9 @@ define([ 'vp_base/js/com/com_util', 'vp_base/js/com/component/PopupComponent', 'vp_base/js/com/component/SuggestInput', - 'vp_base/js/com/component/VarSelector' -], function(frameHtml, frameCss, com_String, com_util, PopupComponent, SuggestInput, VarSelector) { + 'vp_base/js/com/component/VarSelector', + 'vp_base/js/m_apps/Subset' +], function(frameHtml, frameCss, com_String, com_util, PopupComponent, SuggestInput, VarSelector, Subset) { /** * Frame @@ -61,6 +62,10 @@ define([ 'bool', 'str' ]; + // Add/Replace - subset + this.subsetCm = null; + this.subsetEditor = null; + this.loading = false; this._addCodemirror('previewCode', this.wrapSelector('#vp_fePreviewCode'), 'readonly'); @@ -581,6 +586,9 @@ define([ // render variable list // get prevvalue var prevValue = that.state.originObj; + if (varList && varList.length > 0 && prevValue == '') { + prevValue = varList[0].varName; + } // replace that.renderVariableList(varList, prevValue); $(that.wrapSelector('#vp_feVariable')).trigger('change'); @@ -610,6 +618,9 @@ define([ content.appendFormatLine('', 'value', 'Value'); content.appendFormatLine('', 'calculation', 'Calculation'); content.appendFormatLine('', 'replace', 'Replace'); + if (type == 'column' || type == 'replace') { + content.appendFormatLine('', 'subset', 'Subset'); + } content.appendFormatLine('', 'apply', 'Apply'); content.appendLine(''); content.appendLine(''); @@ -656,8 +667,25 @@ define([ content.appendFormatLine(''); // end of vp-inner-popup-tab replace - - // tab 4. apply + + // tab 4. subset + if (type == 'column' || type == 'replace') { + content.appendFormatLine(''); // end of vp-inner-popup-tab subset + } + // tab 5. apply content.appendFormatLine(''); // end of vp-inner-popup-tab apply content.appendLine('

'); // end of vp-inner-popup-addpage + + // set content + $(this.wrapSelector('.vp-inner-popup-body')).html(content.toString()); return content.toString(); } @@ -695,10 +726,13 @@ define([ }); content.appendLine(''); content.appendLine('

- X Limit -

- - +

+ X Limit +

+ + +

- Y Limit -

- - +

+ Y Limit +

+ + +

+ X ticks +

+ Ticks +

+ + +

+ Rotation + +

+ Remove X ticks + Y ticks +

+ Ticks +

+ + +

+ Rotation +

+ Remove Y ticks

Title diff --git a/js/com/com_String.js b/js/com/com_String.js index f677d057..16fcc736 100644 --- a/js/com/com_String.js +++ b/js/com/com_String.js @@ -75,6 +75,11 @@ define ([ clear() { this.buffer = new Array(); } + + // get Length + get length() { + return this.buffer.length; + } } return com_String; diff --git a/js/m_visualize/Seaborn.js b/js/m_visualize/Seaborn.js index 2093548f..8dcfcd88 100644 --- a/js/m_visualize/Seaborn.js +++ b/js/m_visualize/Seaborn.js @@ -50,6 +50,14 @@ define([ x_limit_to: '', y_limit_from: '', y_limit_to: '', + xticks: '', + xticks_label: '', + xticks_rotate: '', + removeXticks: false, + yticks: '', + yticks_label: '', + yticks_rotate: '', + removeYticks: false, // info options title: '', x_label: '', @@ -621,6 +629,8 @@ define([ let { chartType, data, x, y, hue, setXY, userOption='', x_limit_from, x_limit_to, y_limit_from, y_limit_to, + xticks, xticks_label, xticks_rotate, removeXticks, + yticks, yticks_label, yticks_rotate, removeYticks, title, x_label, y_label, legendPos, useColor, color, useGrid, gridColor, markerStyle, userCode1, @@ -680,6 +690,56 @@ define([ let generatedCode = com_generator.vp_codeGenerator(this, config, state, etcOptionCode.join(', ')); + // Axes + if (x_limit_from != '' && x_limit_to != '') { + chartCode.appendFormatLine("plt.xlim(({0}, {1}))", x_limit_from, x_limit_to); + } + if (y_limit_from != '' && y_limit_to != '') { + chartCode.appendFormatLine("plt.ylim(({0}, {1}))", y_limit_from, y_limit_to); + } + if (legendPos != '') { + chartCode.appendFormatLine("plt.legend(loc='{0}')", legendPos); + } + if (removeXticks === true) { + // use empty list to disable xticks + chartCode.appendLine("plt.xticks([])"); + } else { + let xticksOptList = []; + if (xticks && xticks !== '') { + xticksOptList.push(xticks); + // Not able to use xticks_label without xticks + if (xticks_label && xticks_label != '') { + xticksOptList.push(xticks_label); + } + } + if (xticks_rotate && xticks_rotate !== '') { + xticksOptList.push('rotation=' + xticks_rotate) + } + // Add option to chart code if available + if (xticksOptList.length > 0) { + chartCode.appendFormatLine("plt.xticks({0})", xticksOptList.join(', ')); + } + } + if (removeYticks === true) { + // use empty list to disable yticks + chartCode.appendLine("plt.yticks([])"); + } else { + let yticksOptList = []; + if (yticks && yticks !== '') { + yticksOptList.push(yticks); + // Not able to use xticks_label without xticks + if (yticks_label && yticks_label != '') { + yticksOptList.push(yticks_label); + } + } + if (yticks_rotate && yticks_rotate !== '') { + yticksOptList.push('rotation=' + yticks_rotate) + } + // Add option to chart code if available + if (yticksOptList.length > 0) { + chartCode.appendFormatLine("plt.yticks({0})", yticksOptList.join(', ')); + } + } // Info if (title && title != '') { chartCode.appendFormatLine("plt.title('{0}')", title); @@ -690,15 +750,6 @@ define([ if (y_label && y_label != '') { chartCode.appendFormatLine("plt.ylabel('{0}')", y_label); } - if (x_limit_from != '' && x_limit_to != '') { - chartCode.appendFormatLine("plt.xlim(({0}, {1}))", x_limit_from, x_limit_to); - } - if (y_limit_from != '' && y_limit_to != '') { - chartCode.appendFormatLine("plt.ylim(({0}, {1}))", y_limit_from, y_limit_to); - } - if (legendPos != '') { - chartCode.appendFormatLine("plt.legend(loc='{0}')", legendPos); - } // Style - Grid // plt.grid(True, axis='x', color='red', alpha=0.5, linestyle='--') let gridCodeList = []; @@ -712,7 +763,6 @@ define([ chartCode.appendFormatLine("plt.grid({0})", gridCodeList.join(', ')); } - let convertedData = data; if (preview) { // Ignore warning code.appendLine('import warnings'); @@ -728,7 +778,9 @@ define([ code.appendLine(chartCode.toString()); } else { code.appendLine(generatedCode); - code.appendLine(chartCode.toString()); + if (chartCode.length > 0) { + code.append(chartCode.toString()); + } } if (userCode1 && userCode1 != '') { From 6b17531e9ac4afe30abce67d6bba4fe4041eb4c8 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Tue, 7 Jun 2022 17:05:23 +0900 Subject: [PATCH 29/39] Rollback deleted useFile checkbox to WordCloud --- html/m_visualize/wordCloud.html | 12 +++++++++--- js/m_visualize/WordCloud.js | 30 ++++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/html/m_visualize/wordCloud.html b/html/m_visualize/wordCloud.html index c36f2095..2cd8112e 100644 --- a/html/m_visualize/wordCloud.html +++ b/html/m_visualize/wordCloud.html @@ -13,9 +13,12 @@

Data -

- -

+ +

+ Use file

@@ -51,6 +54,9 @@

Preview + +

diff --git a/js/m_visualize/WordCloud.js b/js/m_visualize/WordCloud.js index 922fe14e..15dbe071 100644 --- a/js/m_visualize/WordCloud.js +++ b/js/m_visualize/WordCloud.js @@ -62,6 +62,8 @@ define([ that.state.useFile = true; $(that.wrapSelector('.vp-wc-file-option')).show(); + $(that.wrapSelector('#useFile')).prop('checked', true); + $(that.wrapSelector('#useFile')).trigger('change'); // set text $(that.wrapSelector('#data')).val(path); @@ -71,6 +73,16 @@ define([ fileNavi.open(); }); + // use file + $(this.wrapSelector('#useFile')).on('change', function() { + let checked = $(this).prop('checked'); + if (checked) { + $(that.wrapSelector('.vp-wc-file-option')).show(); + } else { + $(that.wrapSelector('.vp-wc-file-option')).hide(); + } + }); + // change tab $(this.wrapSelector('.vp-tab-item')).on('click', function() { let type = $(this).data('type'); // data / wordcloud / plot @@ -91,6 +103,11 @@ define([ } evt.stopPropagation(); }); + + // preview refresh + $(this.wrapSelector('#previewRefresh')).on('click', function() { + that.loadPreview(); + }); } @@ -157,12 +174,16 @@ define([ pageThis: this, id: 'data', select: function() { - that.state.useFile = false; - $(that.wrapSelector('.vp-wc-file-option')).hide(); + // that.state.useFile = false; + $(that.wrapSelector('#useFile')).prop('checked', false); + $(that.wrapSelector('#useFile')).trigger('change'); + // $(that.wrapSelector('.vp-wc-file-option')).hide(); }, finish: function() { - that.state.useFile = false; - $(that.wrapSelector('.vp-wc-file-option')).hide(); + // that.state.useFile = false; + $(that.wrapSelector('#useFile')).prop('checked', false); + $(that.wrapSelector('#useFile')).trigger('change'); + // $(that.wrapSelector('.vp-wc-file-option')).hide(); } }); $(this.wrapSelector('#data')).replaceWith(dataSelector.toTagString()); @@ -201,6 +222,7 @@ define([ suggestInput.addClass('vp-input vp-state'); suggestInput.setSuggestList(function() { return encodingList; }); suggestInput.setPlaceholder('encoding option'); + suggestInput.setValue(that.state.encoding); return suggestInput.toTagString(); }); From 85b6292c7e87e60e84c9084dc2bca895f1b858d5 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Tue, 7 Jun 2022 17:31:55 +0900 Subject: [PATCH 30/39] Fix WordCloud useFile bug\ --- js/com/component/DataSelector.js | 5 +++-- js/com/component/SuggestInput.js | 5 +++-- js/m_visualize/Seaborn.js | 1 + js/m_visualize/WordCloud.js | 12 +++++------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/js/com/component/DataSelector.js b/js/com/component/DataSelector.js index 495580fa..506627b2 100644 --- a/js/com/component/DataSelector.js +++ b/js/com/component/DataSelector.js @@ -186,14 +186,15 @@ define([ that.state.dataType = ui.item.dtype; that.state.returnDataType = ui.item.dtype; + that.prop.pageThis.state[that.prop.id] = ui.item.value; that.prop.pageThis.state[that.prop.id + '_state'] = that.state; - $(this).trigger('change'); - // select event if (that.prop.select && typeof that.prop.select == 'function') { result = that.prop.select(ui.item.value, ui.item.dtype); } + $(this).trigger('change'); + if (result != undefined) { return result; } diff --git a/js/com/component/SuggestInput.js b/js/com/component/SuggestInput.js index 34102225..d5ada182 100644 --- a/js/com/component/SuggestInput.js +++ b/js/com/component/SuggestInput.js @@ -143,10 +143,11 @@ define([ let result = true; // trigger change $(this).val(ui.item.value); - $(this).trigger('change'); - if (typeof that._selectEvent == "function") + if (typeof that._selectEvent == "function") { result = that._selectEvent(ui.item.value, ui.item); + } + $(this).trigger('change'); if (result != undefined) { return result; } diff --git a/js/m_visualize/Seaborn.js b/js/m_visualize/Seaborn.js index 8dcfcd88..4cfb407b 100644 --- a/js/m_visualize/Seaborn.js +++ b/js/m_visualize/Seaborn.js @@ -259,6 +259,7 @@ define([ pageThis: this, id: 'data', select: function(value, dtype) { + that.state.data = value; that.state.dtype = dtype; if (dtype == 'DataFrame') { diff --git a/js/m_visualize/WordCloud.js b/js/m_visualize/WordCloud.js index 15dbe071..bce06f24 100644 --- a/js/m_visualize/WordCloud.js +++ b/js/m_visualize/WordCloud.js @@ -76,7 +76,7 @@ define([ // use file $(this.wrapSelector('#useFile')).on('change', function() { let checked = $(this).prop('checked'); - if (checked) { + if (checked === true) { $(that.wrapSelector('.vp-wc-file-option')).show(); } else { $(that.wrapSelector('.vp-wc-file-option')).hide(); @@ -174,16 +174,14 @@ define([ pageThis: this, id: 'data', select: function() { - // that.state.useFile = false; + that.state.useFile = false; $(that.wrapSelector('#useFile')).prop('checked', false); - $(that.wrapSelector('#useFile')).trigger('change'); - // $(that.wrapSelector('.vp-wc-file-option')).hide(); + $(that.wrapSelector('.vp-wc-file-option')).hide(); }, finish: function() { - // that.state.useFile = false; + that.state.useFile = false; $(that.wrapSelector('#useFile')).prop('checked', false); - $(that.wrapSelector('#useFile')).trigger('change'); - // $(that.wrapSelector('.vp-wc-file-option')).hide(); + $(that.wrapSelector('.vp-wc-file-option')).hide(); } }); $(this.wrapSelector('#data')).replaceWith(dataSelector.toTagString()); From 8377148c2fed9be2b6f437b0779df21fbca36b72 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Tue, 7 Jun 2022 17:40:03 +0900 Subject: [PATCH 31/39] Fix Original SuggestInput's hover item styles --- css/component/dataSelector.css | 5 ----- css/root.css | 6 ++++++ js/com/com_generator.js | 2 +- js/com/com_generatorV2.js | 2 +- js/com/component/DataSelector.js | 2 +- js/com/component/SuggestInput.js | 11 ++++++++++- js/m_apps/Subset.js | 2 +- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/css/component/dataSelector.css b/css/component/dataSelector.css index ede2e5a3..c7d80b6d 100644 --- a/css/component/dataSelector.css +++ b/css/component/dataSelector.css @@ -19,11 +19,6 @@ .vp-ds-box input.vp-ds-target:disabled + .vp-ds-filter { cursor: not-allowed; } -.vp-ds-item:hover { - background: var(--light-gray-color); - color: var(--font-highlight); - cursor: pointer; -} /* DataSelector popup */ .vp-dataselector { display: none; diff --git a/css/root.css b/css/root.css index 32f8b140..7bdca2b2 100644 --- a/css/root.css +++ b/css/root.css @@ -513,4 +513,10 @@ hr.vp-extra-menu-line { background: #eeeeee; margin: 0px; padding: 7px; +} +/* suggest input hover items */ +.vp-sg-item:hover { + background: var(--light-gray-color); + color: var(--font-highlight); + cursor: pointer; } \ No newline at end of file diff --git a/js/com/com_generator.js b/js/com/com_generator.js index 5ceedfd6..939bff4d 100644 --- a/js/com/com_generator.js +++ b/js/com/com_generator.js @@ -290,7 +290,7 @@ define([ let { result, type, msg } = resultObj; var varList = JSON.parse(result); varList = varList.map(function(v) { - return { label: v.varName + ' (' + v.varType + ')', value: v.varName, dtype: v.varType }; + return { label: v.varName, value: v.varName, dtype: v.varType }; }); // 1. Target Variable var suggestInput = new SuggestInput(); diff --git a/js/com/com_generatorV2.js b/js/com/com_generatorV2.js index e81a8fa8..be86040b 100644 --- a/js/com/com_generatorV2.js +++ b/js/com/com_generatorV2.js @@ -460,7 +460,7 @@ define([ let { result, type, msg } = resultObj; var varList = JSON.parse(result); varList = varList.map(function(v) { - return { label: v.varName + ' (' + v.varType + ')', value: v.varName, dtype: v.varType }; + return { label: v.varName, value: v.varName, dtype: v.varType }; }); // 1. Target Variable var suggestInput = new SuggestInput(); diff --git a/js/com/component/DataSelector.js b/js/com/component/DataSelector.js index 506627b2..436d98f7 100644 --- a/js/com/component/DataSelector.js +++ b/js/com/component/DataSelector.js @@ -211,7 +211,7 @@ define([ $(this).autocomplete('search', $(this).val()); }).autocomplete('instance')._renderItem = function(ul, item) { return $('

').attr('data-value', item.value) - .append(`

${item.label} | ${item.dtype}

`) + .append(`

${item.label} | ${item.dtype}

`) .appendTo(ul); }; } diff --git a/js/com/component/SuggestInput.js b/js/com/component/SuggestInput.js index d5ada182..27a1dfc4 100644 --- a/js/com/component/SuggestInput.js +++ b/js/com/component/SuggestInput.js @@ -159,7 +159,16 @@ define([ }).click(function() { $(this).val(''); $(com_util.formatString(".{0}", that.uuid)).autocomplete('search', $(com_util.formatString(".{0}", that.uuid)).val()); - }); + }).autocomplete('instance')._renderItem = function(ul, item) { + if (item.dtype != undefined) { + return $('

').attr('data-value', item.value) + .append(`

${item.label} | ${item.dtype}

`) + .appendTo(ul); + } + return $('

').attr('data-value', item.value) + .append(`

${item.label}

`) + .appendTo(ul); + };; }); return sbTagString.toString(); diff --git a/js/m_apps/Subset.js b/js/m_apps/Subset.js index 4ca970be..4c66fbff 100644 --- a/js/m_apps/Subset.js +++ b/js/m_apps/Subset.js @@ -659,7 +659,7 @@ define([ let { result } = resultObj; var varList = JSON.parse(result); varList = varList.map(function (v) { - return { label: v.varName + ' (' + v.varType + ')', value: v.varName, dtype: v.varType }; + return { label: v.varName, value: v.varName, dtype: v.varType }; }); that.state.dataList = varList; From 4229cf66774d64d2f24a080f829fd87ad3ad540e Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Tue, 7 Jun 2022 17:55:45 +0900 Subject: [PATCH 32/39] Fix bug and styles on Subset, Instance apps --- css/component/popupComponent.css | 1 - css/m_apps/instance.css | 14 +++++--------- html/component/popupComponent.html | 2 +- js/m_apps/Subset.js | 4 +++- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/css/component/popupComponent.css b/css/component/popupComponent.css index 9c295521..962f0b82 100644 --- a/css/component/popupComponent.css +++ b/css/component/popupComponent.css @@ -205,7 +205,6 @@ .vp-popup-save-button { float: right; height: 30px; - width: 100px; margin-top: 9px; margin-right: 10px; } diff --git a/css/m_apps/instance.css b/css/m_apps/instance.css index 42d27115..a623943b 100644 --- a/css/m_apps/instance.css +++ b/css/m_apps/instance.css @@ -48,20 +48,16 @@ display: inline-block; width: calc(100% - 55px); height: 30px; - border: 1px solid var(--gray-color); + border: 0.25px solid var(--grid-line-color); border-radius: 3px; + background-image: repeating-linear-gradient( to right, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 5px ), repeating-linear-gradient( to bottom, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 5px ); + background-color: white; overflow: hidden; } -.vp-instance-box .CodeMirror.selected { - display: inline-block; - border: 1px solid silver; - overflow: hidden; +/* .vp-instance-box .CodeMirror.selected { width: 88%; height: 31px; - background-image: repeating-linear-gradient( to right, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 5px ), repeating-linear-gradient( to bottom, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 5px ); - background-color: white; - border: 0.25px solid #E4E4E4; -} +} */ .vp-instance-box .CodeMirror-empty { outline: none; } .vp-instance-box .CodeMirror-empty.CodeMirror-focused { outline: none; } .vp-instance-box .CodeMirror pre.CodeMirror-placeholder { color: #999; } diff --git a/html/component/popupComponent.html b/html/component/popupComponent.html index c606ebc1..a29fe11e 100644 --- a/html/component/popupComponent.html +++ b/html/component/popupComponent.html @@ -93,7 +93,7 @@

- +

diff --git a/js/m_apps/Subset.js b/js/m_apps/Subset.js index 4c66fbff..62bc86af 100644 --- a/js/m_apps/Subset.js +++ b/js/m_apps/Subset.js @@ -1037,7 +1037,9 @@ define([ // open popup $(document).on('click', com_util.formatString('.{0}.{1}', VP_DS_BTN, this.uuid), function (event) { if (!$(this).hasClass('disabled')) { - that.beforeOpen(that); + if (that.beforeOpen && typeof that.beforeOpen == 'function') { + that.beforeOpen(that); + } that.open(); $(that.wrapSelector()).css({ 'z-index': 205 }); // move forward } From 480a85f9bf6b85cffeb100a9f28aaefaa46cef99 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Wed, 8 Jun 2022 12:42:37 +0900 Subject: [PATCH 33/39] Add inplace operationo to Frame --- html/m_apps/frame.html | 1 + js/m_apps/Frame.js | 91 +++++++++++++++++++++++++++++++++++------- 2 files changed, 78 insertions(+), 14 deletions(-) diff --git a/html/m_apps/frame.html b/html/m_apps/frame.html index 31b789e5..d6c8ff08 100644 --- a/html/m_apps/frame.html +++ b/html/m_apps/frame.html @@ -38,6 +38,7 @@

Allocate to + Inplace

diff --git a/js/m_apps/Frame.js b/js/m_apps/Frame.js index 31042127..a23b91fa 100644 --- a/js/m_apps/Frame.js +++ b/js/m_apps/Frame.js @@ -36,6 +36,7 @@ define([ originObj: '', tempObj: '_vp', returnObj: '_vp', + inplace: false, columnList: [], indexList: [], selected: [], @@ -105,7 +106,13 @@ define([ // initialize state values that.state.originObj = origin; that.state.tempObj = '_vp'; + that.state.returnObj = that.state.tempObj; + that.state.inplace = false; that.initState(); + + // reset return obj + $(that.wrapSelector('#vp_feReturn')).val(that.state.tempObj); + $(that.wrapSelector('#inplace')).prop('checked', false); // reset table $(that.wrapSelector('.' + VP_FE_TABLE)).replaceWith(function() { @@ -133,10 +140,33 @@ define([ if (returnVariable == '') { returnVariable = that.state.tempObj; } + // check if it's same with origin obj + if (returnVariable === that.state.originObj) { + $(that.wrapSelector('#inplace')).prop('checked', true); + that.state.inplace = true; + } else { + $(that.wrapSelector('#inplace')).prop('checked', false); + that.state.inplace = false; + } + + // show preview with new return variable + that.state.returnObj = returnVariable; + that.setPreview(that.getCurrentCode()); + }); + + // check/uncheck inplace + $(this.wrapSelector('#inplace')).on('change', function() { + let checked = $(this).prop('checked'); + let returnVariable = '_vp'; + if (checked === true) { + returnVariable = that.state.originObj; + } + $(that.wrapSelector('#vp_feReturn')).val(returnVariable); + // show preview with new return variable - var newCode = that.state.steps[that.state.steps.length - 1]; - that.setPreview(newCode.replaceAll(that.state.tempObj, returnVariable)); + that.state.inplace = checked; that.state.returnObj = returnVariable; + that.setPreview(that.getCurrentCode()); }); // menu on column @@ -483,22 +513,24 @@ define([ render() { super.render(); - this.loadVariableList(); - var { - originObj, returnObj, + inplace, steps } = this.state; + + this.loadVariableList(); - $(this.wrapSelector('#vp_feVariable')).val(originObj); + $(this.wrapSelector('#vp_feVariable')).val(this.state.originObj); $(this.wrapSelector('#vp_feReturn')).val(returnObj); + + $(this.wrapSelector('#inplace')).prop('checked', inplace); // execute all steps if (steps && steps.length > 0) { var code = steps.join('\n'); - this.state.steps = []; + // this.state.steps = []; this.loadCode(code); } } @@ -537,13 +569,42 @@ define([ return tag.toString(); } + /** + * Get last code to set preview + * @returns + */ + getCurrentCode() { + let { inplace, steps, tempObj, returnObj } = this.state; + let codeList = steps; + if (inplace === true) { + codeList = steps.slice(1, steps.length); + } + + // get last code + let currentCode = codeList[codeList.length - 1]; + if (currentCode && currentCode != '') { + currentCode = currentCode.replaceAll(tempObj, returnObj); + } else { + currentCode = ''; + } + return currentCode; + } + generateCode() { - var code = this.state.steps.join('\n'); + var code = ''; + // if inplace is true, join steps without .copy() + if (this.state.inplace === true) { + code = this.state.steps.slice(1).join('\n'); + } else { + code = this.state.steps.join('\n'); + } var returnVariable = $(this.wrapSelector('#vp_feReturn')).val(); if (returnVariable != '') { code = code.replaceAll(this.state.tempObj, returnVariable); - code += '\n' + returnVariable; + if (code != '') { + code += '\n' + returnVariable; + } } else { code += '\n' + this.state.tempObj; } @@ -570,8 +631,11 @@ define([ setPreview(previewCodeStr) { // get only last line of code - var previewCodeLines = previewCodeStr.split('\n'); - var previewCode = previewCodeLines.pop(); + var previewCode = previewCodeStr; + if (previewCodeStr.includes('\n') === true) { + let previewCodeLines = previewCodeStr.split('\n'); + previewCode = previewCodeLines.pop(); + } this.setCmValue('previewCode', previewCode); } @@ -1273,12 +1337,11 @@ define([ } var that = this; - var tempObj = this.state.tempObj; - var lines = this.state.lines; + let { tempObj, lines, indexList } = this.state; var prevLines = 0; var scrollPos = -1; if (more) { - prevLines = that.state.indexList.length; + prevLines = indexList.length; scrollPos = $(this.wrapSelector('.vp-fe-table')).scrollTop(); } From 42d6284f6d89456789ba934e62fa2c28204962b0 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Wed, 8 Jun 2022 12:46:11 +0900 Subject: [PATCH 34/39] Add backtip to query code on Subset app --- js/m_apps/Subset.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js/m_apps/Subset.js b/js/m_apps/Subset.js index 62bc86af..41345d3d 100644 --- a/js/m_apps/Subset.js +++ b/js/m_apps/Subset.js @@ -1615,17 +1615,17 @@ define([ condValue = com_util.formatString("'{0}'", cond); } if (oper == 'contains') { - rowSelection.appendFormat('{0}.str.contains({1})', colValue, condValue); + rowSelection.appendFormat('`{0}`.str.contains({1})', colValue, condValue); } else if (oper == 'not contains') { - rowSelection.appendFormat('~{0}.str.contains({1})', colValue, condValue); + rowSelection.appendFormat('~`{0}`.str.contains({1})', colValue, condValue); } else if (oper == 'starts with') { - rowSelection.appendFormat('{0}.str.startswith({1})', colValue, condValue); + rowSelection.appendFormat('`{0}`.str.startswith({1})', colValue, condValue); } else if (oper == 'ends with') { - rowSelection.appendFormat('{0}.str.endswith({1})', colValue, condValue); + rowSelection.appendFormat('`{0}`.str.endswith({1})', colValue, condValue); } else if (oper == 'isnull()' || oper == 'notnull()') { - rowSelection.appendFormat('{0}.{1}', colValue, oper); + rowSelection.appendFormat('`{0}`.{1}', colValue, oper); } else { - rowSelection.appendFormat('{0}{1}{2}', colValue, oper != ''?(' ' + oper):'', condValue != ''?(' ' + condValue):''); + rowSelection.appendFormat('`{0}`{1}{2}', colValue, oper != ''?(' ' + oper):'', condValue != ''?(' ' + condValue):''); } if (condList.length > 1) { rowSelection.append(')'); From afe34ec39b8920e152e417be40dd56d52877da10 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Wed, 8 Jun 2022 12:47:33 +0900 Subject: [PATCH 35/39] Fix bug on Subset app --- js/m_apps/Subset.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/m_apps/Subset.js b/js/m_apps/Subset.js index 41345d3d..afae413a 100644 --- a/js/m_apps/Subset.js +++ b/js/m_apps/Subset.js @@ -1562,7 +1562,7 @@ define([ var rowList = []; for (var i = 0; i < rowTags.length; i++) { var rowValue = $(rowTags[i]).data('code'); - if (rowValue != undefined) { + if (rowValue !== undefined) { rowList.push(rowValue); } } From 0e7b602d178e8fea24db9bf926b0e5070a6c715a Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Wed, 8 Jun 2022 12:53:06 +0900 Subject: [PATCH 36/39] Focus on first input on opening inner popup --- js/com/component/PopupComponent.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/com/component/PopupComponent.js b/js/com/component/PopupComponent.js index 3711b94f..5f8d6a62 100644 --- a/js/com/component/PopupComponent.js +++ b/js/com/component/PopupComponent.js @@ -835,6 +835,9 @@ define([ openInnerPopup(title) { $(this.wrapSelector('.vp-inner-popup-title')).text(title); $(this.wrapSelector('.vp-inner-popup-box')).show(); + + // focus on first input + $(this.wrapSelector('.vp-inner-popup-box input[type=text]:not(:disabled):visible:first')).focus(); } /** From 369444dbdcf8ba7c0229b6621e59309abcffe94f Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Wed, 8 Jun 2022 13:00:02 +0900 Subject: [PATCH 37/39] Add Text checkbox on Reshape - melt page --- html/m_apps/reshape.html | 2 ++ js/m_apps/Reshape.js | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/html/m_apps/reshape.html b/html/m_apps/reshape.html index 3c70366b..53eb746c 100644 --- a/html/m_apps/reshape.html +++ b/html/m_apps/reshape.html @@ -59,10 +59,12 @@

Var name + Text

Value name + Text

diff --git a/js/m_apps/Reshape.js b/js/m_apps/Reshape.js index 6108e6ed..c78f819a 100644 --- a/js/m_apps/Reshape.js +++ b/js/m_apps/Reshape.js @@ -45,7 +45,9 @@ define([ idVars: [], ValueVars: [], varName: '', - valueName: '' + varNameText: true, + valueName: '', + valueNameText: true }, userOption: '', allocateTo: '', @@ -304,7 +306,9 @@ define([ this._loadColumnSelectorInput(this.wrapSelector('#vp_rsIdVars'), melt.idVars); this._loadColumnSelectorInput(this.wrapSelector('#vp_rsValueVars'), melt.valueVars); $(this.wrapSelector('#vp_rsVarName')).val(melt.varName); + $(this.wrapSelector('#varNameText')).prop('checked', melt.varNameText); $(this.wrapSelector('#vp_rsValueName')).val(melt.valueName); + $(this.wrapSelector('#valueNameText')).prop('checked', melt.valueNameText); // userOption $(this.wrapSelector('#vp_rsUserOption')).val(userOption); @@ -520,12 +524,12 @@ define([ // var name (optional) if (melt.varName) { - options.push(com_util.formatString("var_name='{0}'", melt.varName)); + options.push(com_util.formatString("var_name={0}", com_util.convertToStr(melt.varName, melt.varNameText))); } // value name (optional) - if (melt.varName) { - options.push(com_util.formatString("value_name='{0}'", melt.valueName)); + if (melt.valueName) { + options.push(com_util.formatString("value_name={0}", com_util.convertToStr(melt.valueName, melt.valueNameText))); } } From 25e48c8499ae7bc6cd7623e7e5a37b764d355bfd Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Wed, 8 Jun 2022 13:02:40 +0900 Subject: [PATCH 38/39] Fix bindColumnSource bug - 0 binds with default value --- js/com/com_generatorV2.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/com/com_generatorV2.js b/js/com/com_generatorV2.js index be86040b..dec6a7c7 100644 --- a/js/com/com_generatorV2.js +++ b/js/com/com_generatorV2.js @@ -683,7 +683,7 @@ define([ // reset with no source columnInputIdList && columnInputIdList.forEach(columnInputId => { let defaultValue = pageThis.state[columnInputId]; - if (defaultValue == null || defaultValue == undefined) { + if (defaultValue === null || defaultValue === undefined) { defaultValue = ''; } if (tagType == 'input') { @@ -745,7 +745,7 @@ define([ // columns using suggestInput columnInputIdList && columnInputIdList.forEach((columnInputId, idx) => { let defaultValue = pageThis.state[columnInputId]; - if (defaultValue == null || defaultValue == undefined) { + if (defaultValue === null || defaultValue === undefined) { defaultValue = ''; } // create tag @@ -774,7 +774,7 @@ define([ 'data-type':listVar.dtype }); // cell metadata test : defaultValue as selected - if (listVar.value == defaultValue) { + if (listVar.value === defaultValue) { $(option).prop('selected', true); } option.append(document.createTextNode(listVar.label)); From f9e34bffe9717cf3925ca2c5dda8c4a11da326fe Mon Sep 17 00:00:00 2001 From: visualpython Date: Wed, 8 Jun 2022 13:10:48 +0900 Subject: [PATCH 39/39] deploy visualpython 2.2.3 --- js/com/com_Config.js | 2 +- js/com/com_Const.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/com/com_Config.js b/js/com/com_Config.js index 9f94d0af..e06e5d76 100644 --- a/js/com/com_Config.js +++ b/js/com/com_Config.js @@ -470,7 +470,7 @@ define([ /** * Version */ - Config.version = "2.2.2"; + Config.version = "2.2.3"; /** * Type of mode diff --git a/js/com/com_Const.js b/js/com/com_Const.js index 0654d1f9..2bc361dc 100644 --- a/js/com/com_Const.js +++ b/js/com/com_Const.js @@ -19,7 +19,7 @@ define ([ class Constants { } Constants.TOOLBAR_BTN_INFO = { - HELP: "Visual Python 2.2.2" + HELP: "Visual Python 2.2.3" , ICON: "vp-main-icon" , ID: "vpBtnToggle" , NAME: "toggle-vp"