Fix Subset - Condition select form

minjk-bl · minjk-bl · commit de366a94553f · 2022-04-07T14:53:37.000+09:00
diff --git a/html/m_apps/subset.html b/html/m_apps/subset.html
@@ -7,7 +7,7 @@
                     <td colspan="2">
                         <!-- Preview code board -->
                         <div class="vp-ds-preview">
-                            <textarea id="vp_previewCode" name="code"># Code preview</textarea>
+                            <textarea id="vp_ssPreviewCode" name="code"># Code preview</textarea>
                         </div>
                     </td>
                 </tr>
diff --git a/js/com/com_Kernel.js b/js/com/com_Kernel.js
@@ -141,6 +141,19 @@ define([
                 })
             });
         }
+
+        getColumnCategory(dataframe, columnName) {
+            var that = this;
+            return new Promise(function(resolve, reject) {
+                that.execute(com_util.formatString('_vp_print(_vp_get_column_category({0}, {1}))', dataframe, columnName))
+                .then(function(resultObj) {
+                    resolve(resultObj);
+                }).catch(function(err) {
+                    // reject
+                    reject(err);
+                })
+            });
+        }
     
         getRowList(dataframe) {
             var that = this;
diff --git a/js/m_apps/Subset.js b/js/m_apps/Subset.js
@@ -75,7 +75,7 @@ define([
                 ...this.state
             };
 
-            this._addCodemirror('previewCode', this.wrapSelector('#vp_previewCode'), 'readonly');
+            this._addCodemirror('previewCode', this.wrapSelector('#vp_ssPreviewCode'), 'readonly');
         }
 
         render() {
@@ -1331,14 +1331,13 @@ define([
 
             $(document).on('change', this.wrapSelector('.vp-ds-cond-tbl .vp-col-list'), function () {
                 var thisTag = $(this);
-                var varName = $(this).closest('td').find('.vp-cond-var').val();
+                var varName = that.state.pandasObject;
                 var colName = $(this).find('option:selected').attr('data-code');
 
                 var condTag = $(this).closest('td').find('.vp-condition');
 
-                var code = com_util.formatString('_vp_print(_vp_get_column_category({0}, {1}))', varName, colName);
                 // get result and load column list
-                vpKernel.execute(code).then(function (resultObj) {
+                vpKernel.getColumnCategory(varName, colName).then(function (resultObj) {
                     let { result } = resultObj;
                     var category = JSON.parse(result);
                     if (category && category.length > 0) {
