visualpython · minjk-bl · Sep 9, 2021 · Sep 6, 2021 · Sep 6, 2021 · Sep 6, 2021
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/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 change
@@ Expand Up / @@ -76,7 +76,6 @@ define([ @@
                     ]
                 }
                 , { library: 'seaborn', alias:'sns'}
-                , { library: 'plotly.express', alias: 'px'}
             ];
             this.package = {
@@ Expand Down @@