Fix suggestInput default operation, filter option

minjk-bl · minjk-bl · commit 07d346208949 · 2022-04-08T12:21:09.000+09:00
diff --git a/js/com/com_generator.js b/js/com/com_generator.js
@@ -249,6 +249,9 @@ define([
             suggestInput.setSuggestList(function() { return varList; });
             suggestInput.setNormalFilter(false);
             suggestInput.setValue($(divTag + ' #' + obj.name).val());
+            if (obj.placeholder != undefined) {
+                suggestInput.setPlaceholder(obj.placeholder);
+            }
             suggestInput.setSelectEvent(function(selectedValue) {
                 // trigger change
                 $(divTag + ' #' + obj.name).val(selectedValue);
diff --git a/js/com/com_generatorV2.js b/js/com/com_generatorV2.js
@@ -322,8 +322,11 @@ define([
                 suggestInput.setComponentID(obj.name);
                 suggestInput.addClass('vp-input vp-state');
                 suggestInput.setSuggestList(function() { return obj.options; });
-                suggestInput.setNormalFilter(true);
+                suggestInput.setNormalFilter(obj.useFilter == undefined?false:obj.useFilter);
                 suggestInput.setValue(value);
+                if (obj.placeholder != undefined) {
+                    suggestInput.setPlaceholder(obj.placeholder);
+                }
                 suggestInput.setSelectEvent(function(selectedValue) {
                     // trigger change
                     $(pageThis.wrapSelector('#' + obj.name)).val(selectedValue);
@@ -454,6 +457,9 @@ define([
             suggestInput.setSuggestList(function() { return varList; });
             suggestInput.setNormalFilter(false);
             suggestInput.setValue(defaultValue);
+            if (obj.placeholder != undefined) {
+                suggestInput.setPlaceholder(obj.placeholder);
+            }
             suggestInput.setSelectEvent(function(selectedValue) {
                 // trigger change
                 $(divTag + ' #' + obj.name).val(selectedValue);
@@ -529,7 +535,13 @@ define([
      */
     var vp_getTagValue = function(pageThis, obj) {
         var value = '';
-        switch (obj.component) {
+        let componentType = 'input';
+        if (obj.component && obj.component.length == 1) {
+            componentType = obj.component[0];
+        } else {
+            componentType = $(pageThis.wrapSelector('#' + obj.name + '_type')).val();
+        }
+        switch (componentType) {
             case 'option_radio':
                 var input = $(pageThis.wrapSelector("input[name='"+obj.name+"']:checked")).val();
                 // same as default
@@ -545,7 +557,6 @@ define([
                 value = value.substr(0, value.length-1);
                 break;
             case 'input_multi':
-            case 'option_suggest':
             case 'bool_select':
             case 'var_select':
             case 'var_multi':
@@ -556,6 +567,7 @@ define([
             case 'table':
             case 'file':
             case 'option_select':
+            case 'option_suggest':
             case 'input_number':
             default:
                 var input = $(pageThis.wrapSelector('#'+obj.name)).val();
@@ -582,6 +594,9 @@ define([
                 if (val == undefined || val == '') {
                     val = vp_getTagValue(pageThis, v);
                 }
+                if (val == v.default) {
+                    val = '';
+                }
                 var id = '${' + v.name + '}';
                 if (val == undefined || val.trim() == '') {
                     if (v.required == true) {
diff --git a/js/com/component/PopupComponent.js b/js/com/component/PopupComponent.js
@@ -485,12 +485,15 @@ define([
             super.render(inplace);
 
             let { 
-                importButton, packageButton, 
+                installButton, importButton, packageButton, 
                 codeview, dataview, runButton, footer, 
                 sizeLevel, position
             } = this.config;
 
             // import & package manager button hide/show
+            if (!installButton) { // FIXME: Deprecated after creating package manager
+                $(this.wrapSelector('#popupInstall')).hide();
+            }
             if (!importButton) {
                 $(this.wrapSelector('#popupImport')).hide();
             }
