visualpython
diff --git a/‎js/com/com_generatorV2.js
Lines changed: 15 additions & 2 deletions b/‎js/com/com_generatorV2.js
Lines changed: 15 additions & 2 deletions
diff --git a/‎js/com/component/DataSelector.js
Lines changed: 6 additions & 1 deletion b/‎js/com/component/DataSelector.js
Lines changed: 6 additions & 1 deletion
@@ -12,8 +12,9 @@ define([
     'vp_base/js/com/com_util',
     'vp_base/js/com/com_makeDom',
     'vp_base/js/com/component/SuggestInput',
-    'vp_base/js/com/component/VarSelector2'
-], function (com_util, com_makeDom, SuggestInput, VarSelector2) {
+    'vp_base/js/com/component/VarSelector2',
+    'vp_base/js/com/component/DataSelector'
+], function (com_util, com_makeDom, SuggestInput, VarSelector2, DataSelector) {
     /**
      * show result after code executed
      */
@@ -33,6 +34,7 @@ define([
         'bool_select': 'Select Boolean',
         'option_select': 'Select option',
         'option_suggest': 'Input option',
+        'data_select': 'Select data',
         'var_select': 'Select Variable',
         'var_multi': 'Select N-Variables',
         'col_select': 'Select Column',
@@ -346,6 +348,16 @@ define([
                 });
                 content = $(suggestInput.toTagString());
                 break;
+            case 'data_select':
+                let dataSelector = new DataSelector({
+                    pageThis: pageThis, 
+                    id: obj.name,
+                    allowDataType: obj.var_type, 
+                    placeholder: obj.placeholder || 'Select data',
+                    value: value
+                });
+                content = $(dataSelector.toTagString());
+                break;
             case 'var_select':
                 // suggest input tag
                 var tag = $('<input/>').attr({
@@ -583,6 +595,7 @@ define([
                 break;
             case 'input_multi':
             case 'bool_select':
+            case 'data_select':
             case 'var_select':
             case 'var_multi':
             case 'col_select':
 
@@ -49,6 +49,7 @@ define([
                 type: 'data',   // selector type : data / column
                 pageThis: null, // target's page object
                 id: '',         // target id
+                value: null,    // pre-defined value
                 finish: null,   // callback after selection
                 select: null,   // callback after selection from suggestInput
                 allowDataType: ['DataFrame', 'Series', 'ndarray', 'list', 'dict'], // default allow data types
@@ -331,9 +332,13 @@ define([
         }
 
         templateForTarget() {
+            let value = this.prop.value;
+            if (value == undefined) {
+                value = this.prop.pageThis.state[this.prop.id] || '';
+            }
             return `
                 <div class="vp-ds-box vp-ds-box-${this.uuid} vp-ds-uninit">
-                    <input type="text" class="vp-ds-target vp-input vp-state ${this.prop.classes}" id="${this.prop.id}" value="${this.prop.pageThis.state[this.prop.id]}" placeholder="${this.prop.placeholder}"/>
+                    <input type="text" class="vp-ds-target vp-input vp-state ${this.prop.classes}" id="${this.prop.id}" value="${value}" placeholder="${this.prop.placeholder}"/>
                     <span class="vp-ds-filter"><img src="/nbextensions/visualpython/img/filter.svg"/></span>
                 </div>
             `;