Add description for Subset types

minjk-bl · minjk-bl · commit 34bc1d62e2dd · 2022-06-07T15:30:51.000+09:00
diff --git a/html/m_apps/subset.html b/html/m_apps/subset.html
@@ -29,8 +29,8 @@
                         <!-- Subset type -->
                         <select class="vp-ds-subset-type vp-select">
                             <option value="subset">subset</option>
-                            <option value="loc">loc</option>
-                            <option value="iloc">iloc</option>
+                            <option value="loc">loc (location)</option>
+                            <option value="iloc">iloc (integer location)</option>
                             <option value="query">query</option>
                         </select>
                         <!-- to frame -->
diff --git a/js/m_apps/Frame.js b/js/m_apps/Frame.js
@@ -588,6 +588,7 @@ define([
                     var prevValue = that.state.originObj;
                     if (varList && varList.length > 0 && prevValue == '') {
                         prevValue = varList[0].varName;
+                        that.state.originObj = prevValue;
                     }
                     // replace
                     that.renderVariableList(varList, prevValue);
diff --git a/js/m_apps/Subset.js b/js/m_apps/Subset.js
@@ -49,6 +49,12 @@ define([
             // specify pandas object types
             this.pdObjTypes = ['DataFrame', 'Series'];
             this.allowSubsetTypes = ['subset', 'iloc', 'loc', 'query'];
+            this.subsetLabels = {
+                'subset': 'subset', 
+                'iloc'  : 'iloc (integer location)', 
+                'loc'   : 'loc (location)', 
+                'query' : 'query'
+            };
             if (this.prop.allowSubsetTypes) {
                 this.allowSubsetTypes = this.prop.allowSubsetTypes;
             }
@@ -160,12 +166,14 @@ define([
         }
         renderSubsetType(dataType) {
             var subsetType = this.state.subsetType;
+            let that = this;
 
             var tag = new com_String();
             tag.appendFormatLine('<select class="{0} {1}">', VP_DS_SUBSET_TYPE, 'vp-select');
             this.allowSubsetTypes.forEach(thisType => {
                 if (thisType != 'query' || dataType == 'DataFrame') {
-                    tag.appendFormatLine('<option value="{0}" {1}>{2}</option>', thisType, subsetType == thisType?'selected':'', thisType);
+                    let label = that.subsetLabels[thisType];
+                    tag.appendFormatLine('<option value="{0}" {1}>{2}</option>', thisType, subsetType == thisType?'selected':'', label);
                 }
             });
             // tag.appendFormatLine('<option value="{0}" {1}>{2}</option>', 'subset', subsetType == 'subset'?'selected':'', 'subset');
@@ -619,7 +627,7 @@ define([
          * - render on VP_DS_PANDAS_OBJECT
          */
         loadVariables() {
-            var that = this;
+            let that = this;
             var types = that.pdObjTypes;
             var prevValue = this.state.pandasObject;
 
@@ -688,7 +696,7 @@ define([
             }
         }
         loadSubsetType(dataType) {
-            var that = this;
+            let that = this;
             $(this.wrapSelector('.' + VP_DS_SUBSET_TYPE)).replaceWith(function () {
                 return that.renderSubsetType(dataType);
             });

Original file line number	Diff line number	Diff line change
`@@ -588,6 +588,7 @@ define([`
`588`	`588`	`var prevValue = that.state.originObj;`
`589`	`589`	`if (varList && varList.length > 0 && prevValue == '') {`
`590`	`590`	`prevValue = varList[0].varName;`
	`591`	`+ that.state.originObj = prevValue;`
`591`	`592`	`}`
`592`	`593`	`// replace`
`593`	`594`	`that.renderVariableList(varList, prevValue);`