#46 - Update File apps menu

minjk-bl · minjk-bl · commit a0ba80d389b2 · 2021-06-18T17:15:59.000+09:00
diff --git a/css/file_io/fileio.css b/css/file_io/fileio.css
@@ -9,4 +9,8 @@
 #vp_fileioPage .vp-fileio-body {
     padding: 5px;
     margin-top: 10px;
+}
+
+.vp-option-table {
+    
 }
diff --git a/src/file_io/fileio.js b/src/file_io/fileio.js
@@ -172,6 +172,7 @@ define([
      */
     PandasPackage.prototype.initHtml = function() {
         this.showFunctionTitle();
+        this.loadCss(Jupyter.notebook.base_url + vpConst.BASE_PATH + vpConst.STYLE_PATH + "pandas/commonPandas.css");
         this.loadCss(Jupyter.notebook.base_url + vpConst.BASE_PATH + vpConst.STYLE_PATH + "file_io/fileio.css");
 
         this.bindOptions();
@@ -217,6 +218,20 @@ define([
         var selectedType = this.fileState[pageType]['selectedType'];
         var package = { ...libPandas._PANDAS_FUNCTION[fileTypeObj[selectedType]] };
         this.fileState[pageType].package = package;
+        this.state.fileExtension = that.fileExtensions[selectedType];
+        this.fileResultState = {
+            ...this.fileState[pageType].fileResultState
+        };
+
+        if (pageType == 'Write') {
+            if (selectedType == 'json') {
+                this.fileResultState.pathInputId = this.wrapSelector(prefix + '#path_or_buf');
+            }
+            if (selectedType == 'pickle') {
+                this.fileResultState.pathInputId = this.wrapSelector(prefix + '#path');
+            }
+        }
+
         // render interface
         pdGen.vp_showInterfaceOnPage(this, this.wrapSelector('#vp_file' + pageType), package);
 
@@ -238,38 +253,34 @@ define([
         $(this.wrapSelector(prefix + '#fileType')).change(function() {
             var value = $(this).val();
             that.fileState[pageType].selectedType = value;
-            that.state.fileExtension = that.fileExtensions[value];
-            that.fileResultState = {
-                ...that.fileState[pageType].fileResultState
-            };
-
-            if (pageType == 'Write') {
-                if (value == 'json') {
-                    that.fileResultState.pathInputId = that.wrapSelector(prefix + '#path_or_buf');
-                }
-                if (value == 'pickle') {
-                    that.fileResultState.pathInputId = that.wrapSelector(prefix + '#path');
-                }
-            }
 
             // reload
             that.renderPage(pageType);
         });
 
         // 파일 네비게이션 버튼 추가
-        if (pageType == 'Write' && selectedType == 'json') {
-            $(this.fileState[pageType]['fileResultState']['pathInputId']).parent().html(
-                vpCommon.formatString('<input type="text" class="vp-input input-single" id="path_or_buf" index="0" placeholder="" value="" title=""><div id="vp_openFileNavigationBtn" class="{0}"></div>'
-                , vpConst.FILE_BROWSER_INPUT_BUTTON)
-            );
-        } else if (pageType == 'Write' && selectedType == 'pickle') {
-            $(this.fileState[pageType]['fileResultState']['pathInputId']).parent().html(
-                vpCommon.formatString('<input type="text" class="vp-input input-single" id="path" index="0" placeholder="" value="" title=""><div id="vp_openFileNavigationBtn" class="{0}"></div>'
-                , vpConst.FILE_BROWSER_INPUT_BUTTON)
-            );
+        if (pageType == 'Write') {
+            if (selectedType == 'json') {
+                $(prefix + '#path_or_buf').parent().html(
+                    vpCommon.formatString('<input type="text" class="vp-input input-single" id="path_or_buf" index="0" placeholder="" value="" title=""><div id="vp_openFileNavigationBtn" class="{0}"></div>'
+                    , vpConst.FILE_BROWSER_INPUT_BUTTON)
+                );
+            } else if (selectedType == 'pickle') {
+                $(prefix + '#path').parent().html(
+                    vpCommon.formatString('<input type="text" class="vp-input input-single" id="path" index="0" placeholder="" value="" title=""><div id="vp_openFileNavigationBtn" class="{0}"></div>'
+                    , vpConst.FILE_BROWSER_INPUT_BUTTON)
+                );
+            } else {
+                $(this.fileState[pageType]['fileResultState']['pathInputId']).parent().html(
+                    vpCommon.formatString('<input type="text" class="vp-input input-single" id="{0}" index="0" placeholder="" value="" title=""><div id="vp_openFileNavigationBtn" class="{1}"></div>'
+                        , 'i1'
+                        , vpConst.FILE_BROWSER_INPUT_BUTTON)
+                );
+            }
         } else {
             $(this.fileState[pageType]['fileResultState']['pathInputId']).parent().html(
-                vpCommon.formatString('<input type="text" class="vp-input input-single" id="i0" index="0" placeholder="" value="" title=""><div id="vp_openFileNavigationBtn" class="{0}"></div>'
+                vpCommon.formatString('<input type="text" class="vp-input input-single" id="{0}" index="0" placeholder="" value="" title=""><div id="vp_openFileNavigationBtn" class="{1}"></div>'
+                    , 'i0'
                     , vpConst.FILE_BROWSER_INPUT_BUTTON)
             );
         }

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,8 @@`
`9`	`9`	`#vp_fileioPage .vp-fileio-body {`
`10`	`10`	`padding: 5px;`
`11`	`11`	`margin-top: 10px;`
	`12`	`+}`
	`13`	`+`
	`14`	`+.vp-option-table {`
	`15`	`+`
`12`	`16`	`}`