Edit Frame, Subset app to support DataSelector on allocating variable

minjk-bl · minjk-bl · commit b136d12e6eb0 · 2023-02-16T20:09:05.000+09:00
diff --git a/visualpython/js/m_apps/Frame.js b/visualpython/js/m_apps/Frame.js
@@ -20,9 +20,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',
+    'vp_base/js/com/component/DataSelector',
     'vp_base/js/m_apps/Subset'
-], function(frameHtml, frameCss, com_Const, com_String, com_util, PopupComponent, SuggestInput, VarSelector, Subset) {
+], function(frameHtml, frameCss, com_Const, com_String, com_util, PopupComponent, SuggestInput, DataSelector, Subset) {
 
     /**
      * Frame
@@ -516,7 +516,14 @@ define([
         }
 
         templateForBody() {
-            return frameHtml;
+            let page = $(frameHtml);
+
+            let allocateSelector = new DataSelector({
+                pageThis: this, id: 'vp_feReturn', placeholder: 'Variable name', required: true, value: '_vp'
+            });
+            $(page).find('#vp_feReturn').replaceWith(allocateSelector.toTagString());
+
+            return page;
         }
 
         render() {
diff --git a/visualpython/js/m_apps/Subset.js b/visualpython/js/m_apps/Subset.js
@@ -21,8 +21,8 @@ define([
     'vp_base/js/com/component/PopupComponent',
     'vp_base/js/com/component/SuggestInput',
     'vp_base/js/com/component/VarSelector',
-    'vp_base/js/com/component/MultiSelector'
-], function(subsetHtml, subsetCss, com_Const, com_String, com_util, PopupComponent, SuggestInput, VarSelector, MultiSelector) {
+    'vp_base/js/com/component/DataSelector'
+], function(subsetHtml, subsetCss, com_Const, com_String, com_util, PopupComponent, SuggestInput, VarSelector, DataSelector) {
 
     /**
      * Subset
@@ -142,7 +142,18 @@ define([
         }
 
         templateForBody() {
-            return subsetHtml;
+            let page = $(subsetHtml);
+
+            let that = this;
+            let allocateSelector = new DataSelector({
+                pageThis: this, id: 'allocateTo', classes: VP_DS_ALLOCATE_TO, placeholder: 'New variable name', required: true,
+                finish: function() {
+                    that.generateCode();
+                }
+            });
+            $(page).find('.' + VP_DS_ALLOCATE_TO).replaceWith(allocateSelector.toTagString());
+
+            return page;
         }
         templateForDataView() {
             let tag = new com_String();
