Merge pull request #89 from visualpython/release

minjk-bl · web-flow · commit a714ba6557d6 · 2021-09-09T13:29:22.000+09:00
Release v1.1.10
diff --git a/.gitignore b/.gitignore
diff --git a/bin/visualpy b/bin/visualpy
@@ -75,7 +75,7 @@ f_main() {
 #=============================================================================
 f_install() {
     RES=`f_check_extension`
-    # 1 = Jupyterr Extension is not actived
+    # 1 = Jupyter Extension is not actived
     # 2 = visualpython does not exist
     # 3 = visualpython exists
 
@@ -104,7 +104,7 @@ f_install() {
 #=============================================================================
 f_uninstall() {
     RES=`f_check_extension`
-    # 1 = Jupyterr Extension is not actived
+    # 1 = Jupyter Extension is not actived
     # 2 = visualpython does not exist
     # 3 = visualpython exists
 
@@ -234,7 +234,7 @@ f_remove_files() {
 
 #=============================================================================
 # Check Visual Python files
-#   1 = Jupyterr Extension is not actived
+#   1 = Jupyter Extension is not actived
 #   2 = visualpython does not exist
 #   3 = visualpython exists
 #=============================================================================
@@ -266,7 +266,7 @@ f_get_string_pipshow() {
 f_get_extension_path() {
     RESULT="EMPTY"
     if which conda-env > /dev/null 2>&1; then
-        RESULT=`conda-env list | grep "*" | awk -F'*' '{print $2}'|tr -d ' '`/share/jupyter/nbextension
+        RESULT=`conda-env list | grep "*" | awk -F'*' '{print $2}'|tr -d ' '`/share/jupyter/nbextensions
     else
         RESULT=`jupyter --data-dir`/nbextensions
     fi
diff --git a/bin/visualpy.bat b/bin/visualpy.bat
@@ -82,7 +82,7 @@ rem # Install Visual Python
 rem #=========================================================================
 :f_install
     call :f_check_extension RES
-    rem # 1 = Jupyterr Extension is not actived
+    rem # 1 = Jupyter Extension is not actived
     rem # 2 = visualpython does not exist
     rem # 3 = visualpython exists
 
@@ -110,7 +110,7 @@ rem # Uninstall Visual Python
 rem #=========================================================================
 :f_uninstall
     call :f_check_extension RES
-    rem # 1 = Jupyterr Extension is not actived
+    rem # 1 = Jupyter Extension is not actived
     rem # 2 = visualpython does not exist
     rem # 3 = visualpython exists
 
@@ -241,7 +241,7 @@ rem #=========================================================================
 
 rem #=========================================================================
 rem # Check Visual Python files
-rem #   1 = Jupyterr Extension is not actived
+rem #   1 = Jupyter Extension is not actived
 rem #   2 = visualpython does not exist
 rem #   3 = visualpython exists
 rem #=========================================================================
diff --git a/css/file_io/udf.css b/css/file_io/udf.css
@@ -205,7 +205,7 @@
     background-image: url(../../resource/chevron_big_down.svg) !important;
 }
 #vp_udfPage .vp-sn-item-header input.vp-sn-item-title {
-    width: calc(100% - 100px);
+    width: calc(100% - 110px);
     outline: none;
     background: transparent;
     border: 0.5px solid transparent;
diff --git a/src/api_block/block.js b/src/api_block/block.js
@@ -1801,7 +1801,8 @@ define([
                 };
 
                 blockContainerThis.createAppsPage(menu, file, config);
-                break;
+                return;
+                // break;
             }
         }
         
@@ -2029,7 +2030,7 @@ define([
                 $(blockLineNumberInfoDom).find('.vp-apiblock-circle-play').css(STR_OPACITY, 1);
             }
 
-            
+            blockContainerThis.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);
             blockContainerThis.resetBlockListAndRenderThisBlock(thisBlock);
   
             event.stopPropagation();
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.1.9');
+        this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.1.10');
         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
@@ -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.9</span>
+                                <span class="vp-orange-text">Visual Python 1.1.10</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.1.9"
+        HELP: "Visual Python 1.1.10"
         // , ICON: "fa-angellist"
         , ICON: "vp-main-icon"
         , ID: "vpBtnToggle"
diff --git a/src/common/vpFrameEditor.js b/src/common/vpFrameEditor.js
@@ -1755,7 +1755,11 @@ define([
         var code = this.state.steps.join('\n');
         var returnVariable = $(this.wrapSelector('#vp_feReturn')).val();
         if (returnVariable != '') {
-            code = code.replaceAll('_vp', returnVariable);
+            code = code.replaceAll(this.state.tempObj, returnVariable);
+
+            code += '\n' + returnVariable;
+        } else {
+            code += '\n' + this.state.tempObj;
         }
         return code;
     }
diff --git a/src/common/vpSubsetEditor.js b/src/common/vpSubsetEditor.js
@@ -2278,6 +2278,15 @@ define([
             this.setPreview(code.toString());
         }
 
+        // display
+        if (this.useCell) {
+            code.appendLine();
+            if (allocation && this.state.allocateTo != '') {
+                code.append(this.state.allocateTo);
+            } else {
+                code.append(this.state.pandasObject);
+            }
+        }
         return code.toString();
     }
 
diff --git a/src/file_io/fileio.html b/src/file_io/fileio.html
@@ -49,7 +49,7 @@
                         </table>
                     </div>
                 </div>
-                <div class="vp-accordion-container vp-accordion-gray-color">
+                <div class="vp-accordion-container vp-accordion-open vp-accordion-gray-color">
                     <div class="vp-accordion-header"><span class="vp-accordion-indicator"></span><span class="vp-accordion-caption" data-caption-id="TODO:Variable">Additional Options</span></div>
                     <div id="vp_optionBox" class="vp-accordion-content">
                         <table class="vp-option-table">
@@ -72,7 +72,7 @@
                         </table>
                     </div>
                 </div>
-                <div class="vp-accordion-container vp-accordion-gray-color">
+                <div class="vp-accordion-container vp-accordion-open vp-accordion-gray-color">
                     <div class="vp-accordion-header"><span class="vp-accordion-indicator"></span><span class="vp-accordion-caption" data-caption-id="TODO:Variable">Additional Options</span></div>
                     <div id="vp_optionBox" class="vp-accordion-content">
                         <table class="vp-option-table">
diff --git a/src/file_io/fileio.js b/src/file_io/fileio.js
@@ -67,7 +67,7 @@ define([
         
         this.fileExtensions = {
             'csv': 'csv',
-            'excel': 'xls',
+            'excel': 'xlsx',
             'json': 'json',
             'pickle': 'pickle'
         }
diff --git a/src/file_io/import.js b/src/file_io/import.js
@@ -76,7 +76,6 @@ define([
                 ]
             }
             , { library: 'seaborn', alias:'sns'}
-            , { library: 'plotly.express', alias: 'px'}
         ];
         
         this.package = {
diff --git a/src/file_io/udf.js b/src/file_io/udf.js
@@ -211,6 +211,17 @@ define([
                         'import seaborn as sns',
                         'import plotly.express as px'
                     ],
+                    'matplotlib customizing': [
+                        'import matplotlib.pyplot as plt',
+                        '%matplotlib inline',
+                        '',
+                        "plt.rc('figure', figsize=(12, 8))",
+                        '',
+                        'from matplotlib import rcParams',
+                        "rcParams['font.family'] = 'New Gulim'",
+                        "rcParams['font.size'] = 10",
+                        "rcParams['axes.unicode_minus'] = False"
+                    ],
                     'as_float': [
                         'def as_float(x):',
                         '    """',
@@ -328,6 +339,11 @@ define([
 
         // item header click (toggle & select item) &  double click (edit title)
         $(document).on('click', this.wrapSelector('.vp-sn-item-header'), function(evt) {
+            // stop propagation on checkbox
+            if ($(evt.target).hasClass('vp-sn-item-check')) {
+                return;
+            }
+
             var thisHeader = this;
             that.clicked++;
             if (that.clicked == 1) {
@@ -609,7 +625,7 @@ define([
 
                     that.loadUdfList();
 
-                    vpCommon.renderSuccessMessage(fileName + ' imported ');
+                    vpCommon.renderSuccessMessage(evt.file + ' imported ');
                 });
             });
         });
diff --git a/src/matplotlib/plot.html b/src/matplotlib/plot.html
@@ -259,7 +259,7 @@
                 </table>
             </div>
         </div>
-        <div class="vp-accordion-container vp-accordion-gray-color">
+        <div class="vp-accordion-container vp-accordion-open vp-accordion-gray-color">
             <div class="vp-accordion-header"><span class="vp-accordion-indicator"></span><span class="vp-accordion-caption" data-caption-id="TODO:Variable">Additional Options</span></div>
             <div id="vp_plotOptional" class="vp-accordion-content">
                 <table class="vp-option-table">
diff --git a/src/matplotlib/plot.js b/src/matplotlib/plot.js
@@ -272,6 +272,7 @@ define([
         // Box 2. Additional Options
         var tblAdditional = this.createVERSimpleLayout("15%");
         var accBoxAdditional = this.createOptionContainer('Additional Options');
+        accBoxAdditional.setOpenBox(true);
         sbTagString.clear();
         sbTagString.appendFormatLine('<input type="text" class="vp-input" id="{0}"/>', 'title');
         tblAdditional.addRow('Title', sbTagString.toString());
diff --git a/src/pandas/common/commonPandas.html b/src/pandas/common/commonPandas.html
@@ -9,7 +9,7 @@
                 </table>
             </div>
         </div>
-        <div class="vp-accordion-container vp-accordion-gray-color">
+        <div class="vp-accordion-container vp-accordion-open vp-accordion-gray-color">
             <div class="vp-accordion-header"><span class="vp-accordion-indicator"></span><span class="vp-accordion-caption" data-caption-id="TODO:Variable">Additional Options</span></div>
             <div id="vp_optionBox" class="vp-accordion-content">
                 <table class="vp-option-table">
diff --git a/src/pandas/plot.html b/src/pandas/plot.html
@@ -93,7 +93,7 @@
                 </table>
             </div>
         </div> -->
-        <div class="vp-accordion-container vp-accordion-gray-color">
+        <div class="vp-accordion-container vp-accordion-open vp-accordion-gray-color">
             <div class="vp-accordion-header"><span class="vp-accordion-indicator"></span><span class="vp-accordion-caption" data-caption-id="TODO:Variable">Chart Graphics Option</span></div>
             <div id="vp_graphicsOptionBox" class="vp-accordion-content">
                 <table class="vp-option-table">
diff --git a/src/pandas/readFile.js b/src/pandas/readFile.js
@@ -68,7 +68,7 @@ define([
         }
         this.fileExtensions = {
             'csv': 'csv',
-            'excel': 'xls',
+            'excel': 'xlsx',
             'json': 'json',
             'pickle': 'pickle'
         }
diff --git a/src/pandas/toFile.js b/src/pandas/toFile.js
@@ -68,7 +68,7 @@ define([
         }
         this.fileExtensions = {
             'csv': 'csv',
-            'excel': 'xls',
+            'excel': 'xlsx',
             'json': 'json',
             'pickle': 'pickle'
         }

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@`
`205`	`205`	`background-image: url(../../resource/chevron_big_down.svg) !important;`
`206`	`206`	`}`
`207`	`207`	`#vp_udfPage .vp-sn-item-header input.vp-sn-item-title {`
`208`		`- width: calc(100% - 100px);`
	`208`	`+ width: calc(100% - 110px);`
`209`	`209`	`outline: none;`
`210`	`210`	`background: transparent;`
`211`	`211`	`border: 0.5px solid transparent;`
Original file line number	Diff line number	Diff line change
`@@ -1801,7 +1801,8 @@ define([`
`1801`	`1801`	`};`
`1802`	`1802`
`1803`	`1803`	`blockContainerThis.createAppsPage(menu, file, config);`
`1804`		`- break;`
	`1804`	`+ return;`
	`1805`	`+ // break;`
`1805`	`1806`	`}`
`1806`	`1807`	`}`
`1807`	`1808`
`@@ -2029,7 +2030,7 @@ define([`
`2029`	`2030`	`$(blockLineNumberInfoDom).find('.vp-apiblock-circle-play').css(STR_OPACITY, 1);`
`2030`	`2031`	`}`
`2031`	`2032`
`2032`		`-`
	`2033`	`+ blockContainerThis.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);`
`2033`	`2034`	`blockContainerThis.resetBlockListAndRenderThisBlock(thisBlock);`
`2034`	`2035`
`2035`	`2036`	`event.stopPropagation();`
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.1.9');`
	`2652`	`+ this.setNavigator(BLOCK_CODELINE_TYPE.NONE, 'Visual Python 1.1.10');`
`2653`	`2653`	`this.setFocusedPageType(FOCUSED_PAGE_TYPE.BOARD);`
`2654`	`2654`	`$('.vp-apiblock-option-tab-none').css(STR_DISPLAY, STR_BLOCK);`
`2655`	`2655`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1755,7 +1755,11 @@ define([`
`1755`	`1755`	`var code = this.state.steps.join('\n');`
`1756`	`1756`	`var returnVariable = $(this.wrapSelector('#vp_feReturn')).val();`
`1757`	`1757`	`if (returnVariable != '') {`
`1758`		`- code = code.replaceAll('_vp', returnVariable);`
	`1758`	`+ code = code.replaceAll(this.state.tempObj, returnVariable);`
	`1759`	`+`
	`1760`	`+ code += '\n' + returnVariable;`
	`1761`	`+ } else {`
	`1762`	`+ code += '\n' + this.state.tempObj;`
`1759`	`1763`	`}`
`1760`	`1764`	`return code;`
`1761`	`1765`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2278,6 +2278,15 @@ define([`
`2278`	`2278`	`this.setPreview(code.toString());`
`2279`	`2279`	`}`
`2280`	`2280`
	`2281`	`+ // display`
	`2282`	`+ if (this.useCell) {`
	`2283`	`+ code.appendLine();`
	`2284`	`+ if (allocation && this.state.allocateTo != '') {`
	`2285`	`+ code.append(this.state.allocateTo);`
	`2286`	`+ } else {`
	`2287`	`+ code.append(this.state.pandasObject);`
	`2288`	`+ }`
	`2289`	`+ }`
`2281`	`2290`	`return code.toString();`
`2282`	`2291`	`}`
`2283`	`2292`