Fix File > json options

minjk-bl · minjk-bl · commit 87f2c66ce4e3 · 2022-05-23T15:47:59.000+09:00
diff --git a/data/m_library/pandasLibrary.js b/data/m_library/pandasLibrary.js
@@ -156,7 +156,9 @@ define([
                 {
                     name: 'header',
                     type: 'int',
-                    label: 'Header'
+                    label: 'Header',
+                    component: 'option_suggest',
+                    options: ['None', '0']
                 },
                 {
                     name: 'sep',
@@ -2897,6 +2899,7 @@ define([
                     name: 'orient',
                     type: 'text',
                     label: 'JSON Orient',
+                    component: 'option_select',
                     options: ['split', 'records', 'index', 'columns', 'values', 'table'],
                     default: 'columns' // if typ==series, index is default
                 },
@@ -2955,6 +2958,7 @@ define([
                     name: 'orient',
                     type: 'text',
                     label: 'Orient',
+                    component: 'option_select',
                     // options: series 0~3 / dataframe *
                     options: ['split', 'records', 'index', 'table', 'columns', 'values']
                 }
diff --git a/js/com/com_generator.js b/js/com/com_generator.js
@@ -150,7 +150,7 @@ define([
                 });
                 // if required, no default option
                 if (required != true) {
-                    $(optSlct).append($('<option value="">Default</option>'));
+                    $(optSlct).append($('<option value="">Select option...</option>'));
                 }
                 obj.options.forEach((opt, idx, arr) => {
                     var label = (obj.options_label != undefined? obj.options_label[idx]:opt);
@@ -175,6 +175,27 @@ define([
                 });
                 tblInput.appendChild(optSlct);
                 break;
+            case 'option_suggest':
+                    // suggest input tag
+                    // 1. Target Variable
+                    var suggestInput = new SuggestInput();
+                    suggestInput.setComponentID(obj.name);
+                    suggestInput.addClass('vp-input vp-state');
+                    suggestInput.setSuggestList(function() { return obj.options; });
+                    suggestInput.setNormalFilter(obj.useFilter == undefined?false:obj.useFilter);
+                    suggestInput.setValue(obj.value);
+                    if (obj.placeholder != undefined) {
+                        suggestInput.setPlaceholder(obj.placeholder);
+                    } else {
+                        suggestInput.setPlaceholder('Type or Select value');
+                    }
+                    suggestInput.setSelectEvent(function(selectedValue) {
+                        // trigger change
+                        $(pageThis.wrapSelector('#' + obj.name)).val(selectedValue);
+                        $(pageThis.wrapSelector('#' + obj.name)).trigger('change');
+                    });
+                    tblInput.appendChild($(suggestInput.toTagString())[0]);
+                    break;
             case 'var_select':
                 // suggest input tag
                 var tag = document.createElement('input');
@@ -386,7 +407,7 @@ define([
             case 'option_select':
                 var input = $(vp_wrapSelector(pageId, '#'+obj.name)).val();
                 // same as default
-                if (input == obj.default) break;
+                // if (input == obj.default) break;
                 value = input;
                 break;
             case 'var_select':
@@ -400,6 +421,7 @@ define([
                 break;
             case 'table':
             case 'file':
+            case 'option_suggest':
             default:
                 var input = $(vp_wrapSelector(pageId, '#'+obj.name)).val();
                 // same as default
