Add default allocate variables

minjk-bl · minjk-bl · commit 8d771abb0f83 · 2023-07-05T18:00:43.000+09:00
diff --git a/visualpython/data/m_library/pandasLibrary.js b/visualpython/data/m_library/pandasLibrary.js
@@ -179,7 +179,8 @@ define([
             "output": true,
             "component": [
               "data_select"
-            ]
+            ],
+            "value": "vp_df"
           },
           {
             "name": "encoding",
@@ -3526,7 +3527,8 @@ define([
             "output": true,
             "component": [
               "data_select"
-            ]
+            ],
+            "value": "vp_df"
           },
           {
             "name": "typ",
@@ -3683,7 +3685,8 @@ define([
             "output": true,
             "component": [
               "data_select"
-            ]
+            ],
+            "value": "vp_df"
           }
         ]
       },
@@ -6536,7 +6539,8 @@ define([
             "output": true,
             "component": [
               "data_select"
-            ]
+            ],
+            "value": "vp_df"
           },
           {
             "name": "sheet_name",
@@ -6722,7 +6726,8 @@ define([
             "output": true,
             "component": [
               "data_select"
-            ]
+            ],
+            "value": "vp_df"
           },
           {
             "name": "format",
@@ -6767,7 +6772,8 @@ define([
             "output": true,
             "component": [
               "data_select"
-            ]
+            ],
+            "value": "vp_df"
           },
           {
             "name": "usecols",
diff --git a/visualpython/html/m_apps/file.html b/visualpython/html/m_apps/file.html
@@ -75,7 +75,7 @@
                         </tr>
                         <tr>
                             <td><label for="vp_sampleReturn">Allocate to</label></td>
-                            <td><input type="text" class="vp-input input-single" id="vp_sampleReturn" placeholder="" value="" title=""></td>
+                            <td><input type="text" class="vp-input input-single" id="vp_sampleReturn" placeholder="" value="vp_df" title=""></td>
                         </tr>
                     </tbody>
                 </table>
diff --git a/visualpython/html/m_apps/sweetviz.html b/visualpython/html/m_apps/sweetviz.html
@@ -21,7 +21,7 @@
                     </div>
                 </div>
                 <label for="vp_pfReturn" class="vp-orange-text">Allocate to</label>
-                <input type="text" id="vp_pfReturn" class="vp-input vp-sv-input" placeholder="New variable name" required="true">
+                <input type="text" id="vp_pfReturn" class="vp-input vp-sv-input" placeholder="New variable name" required="true" value="report">
                 <label for="vp_pfPath">File path</label>
                 <div>
                     <input type="text" id="vp_pfPath" class="vp-input vp-sv-input" placeholder="SWEETVIZ_REPORT.html">
diff --git a/visualpython/js/m_apps/File.js b/visualpython/js/m_apps/File.js
@@ -177,7 +177,8 @@ define([
                           "data_select"
                         ],
                         "output": true,
-                        "required": true
+                        "required": true,
+                        "value": 'vp_df'
                       }
                     ]
                   }
@@ -235,9 +236,14 @@ define([
                     type = 'open';
                 }
 
+                let extensionList = [];
+                if (that.state.fileExtension !== '') {
+                    extensionList = [ that.state.fileExtension ];
+                }
+
                 let fileNavi = new FileNavigation({
                     type: type,
-                    extensions: [ that.state.fileExtension ],
+                    extensions: extensionList,
                     finish: function(filesPath, status, error) {
                         let {file, path} = filesPath[0];
                         that.state.selectedFile = file;
@@ -310,7 +316,7 @@ define([
             let page = $(fileHtml);
 
             let allocateSelector = new DataSelector({
-                pageThis: this, id: 'vp_sampleReturn', placeholder: 'Variable name'
+                pageThis: this, id: 'vp_sampleReturn', placeholder: 'Variable name', value: 'vp_df'
             });
             $(page).find('#vp_sampleReturn').replaceWith(allocateSelector.toTagString());
 
diff --git a/visualpython/js/m_apps/Frame.js b/visualpython/js/m_apps/Frame.js
@@ -37,7 +37,7 @@ define([
             this.state = {
                 originObj: '',
                 tempObj: '_vp',
-                returnObj: '_vp',
+                returnObj: 'vp_df',
                 inplace: false,
                 menu: '',
                 menuItem: '',
@@ -176,7 +176,7 @@ define([
                     // initialize state values
                     that.state.originObj = origin;
                     that.state.tempObj = '_vp';
-                    that.state.returnObj = that.state.tempObj;
+                    that.state.returnObj = 'vp_df';
                     if (that.state.inplace === true) {
                         that.state.returnObj = origin;
                     }
@@ -228,7 +228,7 @@ define([
             // check/uncheck inplace
             $(this.wrapSelector('#inplace')).on('change', function() {
                 let checked = $(this).prop('checked');
-                let returnVariable = '_vp';
+                let returnVariable = 'vp_df';
                 if (checked === true) {
                     returnVariable = that.state.originObj;
                 }
@@ -1122,7 +1122,7 @@ define([
             let page = $(frameHtml);
 
             let allocateSelector = new DataSelector({
-                pageThis: this, id: 'vp_feReturn', placeholder: 'Variable name', required: true, value: '_vp'
+                pageThis: this, id: 'vp_feReturn', placeholder: 'Variable name', required: true, value: 'vp_df'
             });
             $(page).find('#vp_feReturn').replaceWith(allocateSelector.toTagString());
 
