visualpython · minjk-bl · Aug 30, 2021 · Aug 24, 2021 · Aug 24, 2021 · Aug 26, 2021
diff --git a/bin/visualpy b/bin/visualpy
diff --git a/bin/visualpy.bat b/bin/visualpy.bat
diff --git a/css/common/frameEditor.css b/css/common/frameEditor.css
@@ -74,13 +74,16 @@
 .vp-fe-preview .CodeMirror-code .cm-string {
     background-color: rgba(246, 173, 85, 0.2);
 }
+
+
 .vp-fe-df-box {
     display: grid;
     grid-template-rows: 30px;
     grid-row-gap: 5px;
 }
 .vp-fe-df-box label {
     width: 80px;
+    font-weight: bold;
 }
 .vp-fe #vp_feVariable { 
     width: 153px;
@@ -355,16 +358,19 @@
 .vp-popup-addpage .vp-popup-tab.replace {
     height: calc(100% - 50px);
 }
-.vp-popup-addtype{
+.vp-popup-addtype {
     width: 153px;
     margin-top: 5px;
 }
-.vp-popup-delete{
+.vp-popup-delete {
     padding-bottom: 20px;
 }
-.vp-popup-replace-add{
+.vp-popup-replace-add {
     margin-top: 30px
 }
-.vp_popup-apply{
-    margin-left: 30px;
+.vp-popup-apply-column {
+    width: 153px;
+}
+.vp-popup-apply-lambda{
+    margin-top: 5px;
 }
diff --git a/css/common/subsetEditor.css b/css/common/subsetEditor.css
@@ -75,7 +75,6 @@
     background-color: rgba(246, 173, 85, 0.2);
 }
 .vp-ds-label {
-    color: #F37704;
     font-weight: bold;
     margin-left: 20px;
 }
@@ -319,7 +318,7 @@
 }
 .vp-ds-btn-apply {
     position: absolute;
-    top: 4px;
+    top: 9px;
     right: 15px;
 }
 .vp-ds-btn-run {

diff --git a/src/api/functions/pandasCommand.py b/src/api/functions/pandasCommand.py
@@ -33,7 +33,7 @@ def _vp_get_columns_list(df):
         # value
         if type(c).__name__ == 'str':
             cInfo['value'] = "'{}'".format(c)
-        elif type(r).__name__ == 'Timestamp':
+        elif type(c).__name__ == 'Timestamp':
             cInfo['value'] = str(c)
         # category - iopub data rate limit issue...
         if str(df[c].dtype) == 'object':

diff --git a/src/api_block/blockContainer.js b/src/api_block/blockContainer.js
@@ -621,11 +621,11 @@ define([
      */
     BlockContainer.prototype.setFocusedPageType = function(focusedPageType) {
         // 추가: FOCUSED_PAGE_TYPE = NULL일 경우 주피터 단축키 활성화 / 아닐 경우 비활성화
-        if (focusedPageType == FOCUSED_PAGE_TYPE.NULL) {
-            // Jupyter.notebook.keyboard_manager.enable();
-        } else {
-            // Jupyter.notebook.keyboard_manager.disable();
-        }
+        // if (focusedPageType == FOCUSED_PAGE_TYPE.NULL) {
+        //     Jupyter.notebook.keyboard_manager.enable();
+        // } else {
+        //     Jupyter.notebook.keyboard_manager.disable();
+        // }
         this.focusedPageType = focusedPageType;
     }
     BlockContainer.prototype.getFocusedPageType = function() {
@@ -664,7 +664,7 @@ define([
 
             this.resetOptionPage();
 
-            this.setFocusedPageType(FOCUSED_PAGE_TYPE.EDITOR);
+            this.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);
             this.reNewContainerDom();
             this.reRenderAllBlock_asc();
         }
@@ -1124,7 +1124,7 @@ define([
         if (prevSelectedBlock && prevSelectedBlock.isModified) {
             // Ask to save
             var apiBlockPackage = this.getImportPackageThis();
-            apiBlockPackage.openMultiBtnModal_new('Unsaved Changes', 'Save changes before leave?',['Don&rsquo;t save', 'Save'], [() => {
+            apiBlockPackage.openMultiBtnModal_new('Unsaved Changes', 'Save changes before leave?',['Don&rsquo;t save', 'Save'], 2, [() => {
                 // cancel
                 // $(VP_ID_PREFIX + VP_APIBLOCK_BOARD_OPTION_CANCEL_BUTTON).trigger(STR_CLICK);
                 blockContainerThis.cancelBlock();
@@ -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.1.7');
+        this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.1.8');
         this.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);
         $('.vp-apiblock-option-tab-none').css(STR_DISPLAY, STR_BLOCK);
     }

diff --git a/src/api_block/component/boardMenuBar.js b/src/api_block/component/boardMenuBar.js
@@ -111,7 +111,7 @@ define([
 
             var saveFilePath = vpCommon.formatString("./{0}.{1}", saveFileName, vpConst.VP_NOTE_EXTENSION);
             var apiBlockPackage = blockContainer.getImportPackageThis();
-            apiBlockPackage.openMultiBtnModal_new('Save As', `Save changes to '${saveFileName}.vp'`,['Yes', 'No', 'Cancel'], [() => {
+            apiBlockPackage.openMultiBtnModal_new('Save As', `Save changes to '${saveFileName}.vp'`,['Yes', 'No', 'Cancel'], 3, [() => {
                 saveNotePageAction_newVersion(vpCommon.formatString("{0}.{1}", saveFileName, vpConst.VP_NOTE_EXTENSION), saveFilePath);
 
                 blockContainer.deleteAllBlock();
@@ -161,7 +161,7 @@ define([
 
             var saveFilePath = $(vpCommon.wrapSelector(vpCommon.formatString("#{0}", vpConst.VP_NOTE_REAL_FILE_PATH))).val();
             var apiBlockPackage = blockContainer.getImportPackageThis();
-            apiBlockPackage.openMultiBtnModal_new('Save As', `Save changes to '${saveFileName}.vp'`,['Yes', 'No', 'Cancel'], [() => {
+            apiBlockPackage.openMultiBtnModal_new('Save As', `Save changes to '${saveFileName}.vp'`,['Yes', 'No', 'Cancel'], 3, [() => {
                 if (saveFilePath == '') {
                     saveAsNotePage();
                 } else {

diff --git a/src/api_block/index.html b/src/api_block/index.html
@@ -175,7 +175,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.1.7</span>
+                                <span class="vp-orange-text">Visual Python 1.1.8</span>
                             </div>
                             <div class="vp-apiblock-option-new-to-save" title="something modified...">
 

diff --git a/src/api_block/init.js b/src/api_block/init.js
@@ -519,6 +519,8 @@ define([
             // blockContainer.resetOptionPage();
             blockContainer.setFocusedPageType(FOCUSED_PAGE_TYPE.NULL);
         });
+
+        $(vpCommon.wrapSelector(''))
 
         /** Create block buttons page를 클릭했을 때 */
         $(vpCommon.wrapSelector(VP_CLASS_PREFIX + VP_CLASS_APIBLOCK_BUTTONS)).click(function(event) {
@@ -574,7 +576,8 @@ define([
                 ctrlKey = 17,
                 cmdKey = 91,
                 vKey = 86,
-                cKey = 67;
+                cKey = 67,
+                escKey = 27;
 
             $(document).keydown(function(e) {
                 if (e.keyCode == ctrlKey || e.keyCode == cmdKey) {
@@ -583,12 +586,43 @@ define([
             }).keyup(function(e) {
                 if (e.keyCode == ctrlKey || e.keyCode == cmdKey) {
                     ctrlDown = false;
+                    console.log(blockContainer.getFocusedPageType());
+                }
+                if (e.keyCode == escKey) {
+                    // close popup on esc
+                    if (blockContainer.getFocusedPageType() != FOCUSED_PAGE_TYPE.NULL) {
+                        blockContainer.appsMenu.close();
+                    }
                 }
             }).click(function(e) {
+                // click event on jupyter side
+                if ($('#notebook').has(e.target).length > 0) {
+                    blockContainer.setFocusedPageType(FOCUSED_PAGE_TYPE.NULL);
+                }
+                // click event on visual python menu tab & button box
+                if ($(vpCommon.wrapSelector('.vp-apiblock-tab-header')).has(e.target).length > 0
+                    || $(vpCommon.wrapSelector('.vp-apiblock-board-button-container')).has(e.target).length > 0) {
+                    blockContainer.setFocusedPageType(FOCUSED_PAGE_TYPE.BUTTONS);
+                }
+                // click event on popup menu
+                if ($(vpCommon.wrapSelector('.vp-ds')).has(e.target).length > 0
+                || $(vpCommon.wrapSelector('.vp-fe')).has(e.target).length > 0
+                || $(vpCommon.wrapSelector('.vp-pp')).has(e.target).length > 0
+                || $(vpCommon.wrapSelector('.vp-ds-btn-box')).has(e.target).length > 0
+                || $(vpCommon.wrapSelector('.vp-fe-btn-box')).has(e.target).length > 0
+                || $(vpCommon.wrapSelector('.vp-pp-btn-box')).has(e.target).length > 0) {
+                    blockContainer.setFocusedPageType(FOCUSED_PAGE_TYPE.OPTION);
+                }
+
                 // check modified
                 blockContainer.checkModified();
             });
 
+            // focus event on codemirror of jupyter side
+            $(document).on('focus', '#notebook .CodeMirror', function(e){
+                blockContainer.setFocusedPageType(FOCUSED_PAGE_TYPE.NULL);
+            });
+
             $(document).change($(vpCommon.wrapSelector('.vp-apiblock-option input')), function() {
                 // check modified
                 blockContainer.checkModified();
@@ -778,7 +812,7 @@ define([
              /** File navigation을 open하지 않고 alert창 띄움*/    
             } else {
                 var saveFilePath = vpCommon.formatString("./{0}.{1}", saveFileName, vpConst.VP_NOTE_EXTENSION);
-                apiBlockPackage.openMultiBtnModal_new('Save As', `Save changes to '${saveFileName}.vp'`,['Yes','No', 'Cancel'], [() => {
+                apiBlockPackage.openMultiBtnModal_new('Save As', `Save changes to '${saveFileName}.vp'`,['Yes', 'No', 'Cancel'], 3, [() => {
                     saveNotePageAction_newVersion(saveFileName, saveFilePath);
                     openNotePage();
 

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.1.7"
+        HELP: "Visual Python 1.1.8"
         // , ICON: "fa-angellist"
         , ICON: "vp-main-icon"
         , ID: "vpBtnToggle"
@@ -199,7 +199,7 @@ define ([
     /**
      * faq page link
      */
-    const VPNOTE_PAGE_LINK = 'https://visualpython.ai/vpnote';
+    const VPNOTE_PAGE_LINK = 'https://visualpython.ai/vpnotes';
 
     /**
      * header extra menu faq caption