Merge pull request #109 from visualpython/release

minjk-bl · web-flow · commit 1fe56f7a7fd9 · 2021-11-19T17:02:25.000+09:00
Release v1.2.2 (Hotfix)
diff --git a/src/api_block/blockContainer.js b/src/api_block/blockContainer.js
@@ -2649,7 +2649,7 @@ define([
         this.hideOptionPreviewBox();
         $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_PREVIEW_BUTTON).removeClass('enabled');
 
-        this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.2.1');
+        this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.2.2');
         this.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);
         $('.vp-apiblock-option-tab-none').css(STR_DISPLAY, STR_BLOCK);
     }
diff --git a/src/api_block/index.html b/src/api_block/index.html
@@ -120,7 +120,7 @@
                          id='vp_apiblock_option_page'>
                         <div class="vp-apiblock-option-navigator">
                             <div class="vp-apiblock-option-navigator-label">
-                                <span class="vp-orange-text">Visual Python 1.2.1</span>
+                                <span class="vp-orange-text">Visual Python 1.2.2</span>
                             </div>
                             <div class="vp-apiblock-option-new-to-save" title="something modified...">
 
diff --git a/src/common/constant.js b/src/common/constant.js
@@ -48,7 +48,7 @@ define ([
      * toolbar btn properties
      */
     const TOOLBAR_BTN_INFO = {
-        HELP: "Visual Python 1.2.1"
+        HELP: "Visual Python 1.2.2"
         // , ICON: "fa-angellist"
         , ICON: "vp-main-icon"
         , ID: "vpBtnToggle"
diff --git a/src/common/vpGroupby.js b/src/common/vpGroupby.js
@@ -437,6 +437,9 @@ define([
             page.appendFormatLine('<option value="{0}">{1}</option>', '', 'Select method type');
             page.appendFormatLine('<option value="{0}">{1}</option>', 'typing', 'Typing');
             this.methodList.forEach(method => {
+                if (method.value == '') {
+                    return;
+                }
                 page.appendFormatLine('<option value="{0}">{1}</option>', method.value, method.label);
             });
             page.appendLine('</select>');
@@ -1196,7 +1199,7 @@ define([
                 }
             }
 
-            if (method != '') {
+            if (method != '' || advanced) {
                 // when using as_index option with Grouper, use .reset_index()
                 if (useGrouper && resetIndex) {
                     methodStr.append('.reset_index()');

Original file line number	Diff line number	Diff line change
`@@ -2649,7 +2649,7 @@ define([`
`2649`	`2649`	`this.hideOptionPreviewBox();`
`2650`	`2650`	`$(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_PREVIEW_BUTTON).removeClass('enabled');`
`2651`	`2651`
`2652`		`- this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.2.1');`
	`2652`	`+ this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.2.2');`
`2653`	`2653`	`this.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);`
`2654`	`2654`	`$('.vp-apiblock-option-tab-none').css(STR_DISPLAY, STR_BLOCK);`
`2655`	`2655`	`}`