Edit label, input type on Pandas Plot and Subset app

minjk-bl · minjk-bl · commit 4e5ba7155281 · 2022-06-21T14:32:34.000+09:00
diff --git a/data/m_library/pandasLibrary.js b/data/m_library/pandasLibrary.js
@@ -5017,22 +5017,16 @@ define([
             name: 'Plot',
             library: 'pandas',
             description: 'create chart',
-            code: '${o0} = ${i0}.plot(${v}${etc})\nplt.show()',
+            code: '${i0}.plot(${v}${etc})\nplt.show()',
             input: [
                 {
                     name: 'i0',
-                    type:'var',
-                    label: 'Pandas Object',
-                    component: 'var_select',
+                    type: 'var',
+                    label: 'DataFrame',
                     var_type: ['DataFrame', 'Series']
                 }
             ],
             output: [
-                {
-                    name:'o0',
-                    type:'var',
-                    label:'Allocate to'
-                }
             ],
             variable: [
                 {
@@ -5046,7 +5040,7 @@ define([
                 },
                 {
                     name: 'title',
-                    type: ['text', 'list'],
+                    type: 'text',
                     label: 'Chart Title'
                 },
                 {
@@ -5058,6 +5052,7 @@ define([
                 {
                     name: 'fontsize',
                     type: 'int',
+                    component: 'input_number',
                     label: 'Font Size'
                 },
                 {
@@ -5089,16 +5084,17 @@ define([
                 {
                     name: 'rot',
                     type: 'int',
+                    component: 'input_number',
                     label: 'X Label Rotation'
                 },
                 {
                     name: 'xlabel',
-                    type: 'list',
+                    type: 'text',
                     label: 'X Label'
                 },
                 {
                     name: 'ylabel',
-                    type: 'list',
+                    type: 'text',
                     label: 'Y Label'
                 },
                 {
diff --git a/html/m_apps/subset.html b/html/m_apps/subset.html
@@ -13,7 +13,7 @@
                 </tr>
                 <tr>
                     <!-- Variable : Pandas Object-->
-                    <td><label class="vp-ds-label vp-orange-text">Variable</label></td>
+                    <td><label class="vp-ds-label vp-orange-text">DataFrame</label></td>
                     <td>
                         <div class="vp-ds-pandas-object-box" style="display:inline-block;">
                             <!-- Var Selector -->
diff --git a/js/com/com_generator.js b/js/com/com_generator.js
@@ -237,11 +237,29 @@ define([
                 }
                 $(tblInput).append(textarea);
                 break;
+            case 'input_number':
+                var input = com_makeDom.renderInput({
+                    'type': 'number',
+                    'class': 'vp-input vp-state',
+                    'id': obj.name,
+                    'placeholder': (obj.placeholder==undefined?'':obj.placeholder),
+                    'value': (obj.default==undefined?'':obj.default),
+                    'title': (obj.help==undefined?'':obj.help)
+                });
+                // cell metadata test
+                if (getValue && obj.value != undefined) {
+                    // set as saved value
+                    input.attr({
+                        'value': obj.value
+                    });
+                }
+                $(tblInput).append(input);
+                break;
             case 'table':
                 // break;
             case 'file':
                 // break;
-            // default : input_single
+                // default : input_single
             default:
                 // FIXME: use makedom
                 var input = com_makeDom.renderInput({
@@ -422,6 +440,7 @@ define([
             case 'table':
             case 'file':
             case 'option_suggest':
+            case 'input_number':
             default:
                 var input = $(vp_wrapSelector(pageId, '#'+obj.name)).val();
                 // same as default
