Fix WordCloud useFile bug\

minjk-bl · minjk-bl · commit 85b6292c7e87 · 2022-06-07T17:31:55.000+09:00
diff --git a/js/com/component/DataSelector.js b/js/com/component/DataSelector.js
@@ -186,14 +186,15 @@ define([
                     that.state.dataType = ui.item.dtype;
                     that.state.returnDataType = ui.item.dtype;
 
+                    that.prop.pageThis.state[that.prop.id] = ui.item.value;
                     that.prop.pageThis.state[that.prop.id + '_state'] = that.state;
 
-                    $(this).trigger('change');
-
                     // select event
                     if (that.prop.select && typeof that.prop.select == 'function') {
                         result = that.prop.select(ui.item.value, ui.item.dtype);
                     }
+                    $(this).trigger('change');
+
                     if (result != undefined) {
                         return result;
                     }
diff --git a/js/com/component/SuggestInput.js b/js/com/component/SuggestInput.js
@@ -143,10 +143,11 @@ define([
                         let result = true;
                         // trigger change
                         $(this).val(ui.item.value);
-                        $(this).trigger('change');
                         
-                        if (typeof that._selectEvent == "function")
+                        if (typeof that._selectEvent == "function") {
                             result = that._selectEvent(ui.item.value, ui.item);
+                        }
+                        $(this).trigger('change');
                         if (result != undefined) {
                             return result;
                         }
diff --git a/js/m_visualize/Seaborn.js b/js/m_visualize/Seaborn.js
@@ -259,6 +259,7 @@ define([
                 pageThis: this,
                 id: 'data',
                 select: function(value, dtype) {
+                    that.state.data = value;
                     that.state.dtype = dtype;
 
                     if (dtype == 'DataFrame') {
diff --git a/js/m_visualize/WordCloud.js b/js/m_visualize/WordCloud.js
@@ -76,7 +76,7 @@ define([
             // use file
             $(this.wrapSelector('#useFile')).on('change', function() {
                 let checked = $(this).prop('checked');
-                if (checked) {
+                if (checked === true) {
                     $(that.wrapSelector('.vp-wc-file-option')).show();
                 } else {
                     $(that.wrapSelector('.vp-wc-file-option')).hide();
@@ -174,16 +174,14 @@ define([
                 pageThis: this,
                 id: 'data',
                 select: function() {
-                    // that.state.useFile = false;
+                    that.state.useFile = false;
                     $(that.wrapSelector('#useFile')).prop('checked', false);
-                    $(that.wrapSelector('#useFile')).trigger('change');
-                    // $(that.wrapSelector('.vp-wc-file-option')).hide();
+                    $(that.wrapSelector('.vp-wc-file-option')).hide();
                 },
                 finish: function() {
-                    // that.state.useFile = false;
+                    that.state.useFile = false;
                     $(that.wrapSelector('#useFile')).prop('checked', false);
-                    $(that.wrapSelector('#useFile')).trigger('change');
-                    // $(that.wrapSelector('.vp-wc-file-option')).hide();
+                    $(that.wrapSelector('.vp-wc-file-option')).hide();
                 }
             });
             $(this.wrapSelector('#data')).replaceWith(dataSelector.toTagString());
