KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一

src/case/editor/editor.state.js

@@ -21,8 +21,8 @@ BI.StateEditor = BI.inherit(BI.Widget, {
             watermark: "",
             errorText: "",
             height: 24,
-            defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色
-            text: BI.i18nText("BI-Basic_Unrestricted"), // 显示值
+            defaultText: BI.i18nText("BI-Basic_Unrestricted"), // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色
+            text: "", // 显示值
             el: {}
         });
     },

src/case/editor/editor.state.simple.js

@@ -22,7 +22,8 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
             watermark: "",
             errorText: "",
             height: 24,
-            text: BI.i18nText("BI-Basic_Unrestricted")
+            text: "",
+            defaultText: BI.i18nText("BI-Basic_Unrestricted"),
         });
     },
 

src/case/trigger/trigger.text.select.js

@@ -64,7 +64,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
         if (result.length > 0) {
             return {
                 textCls: "",
-                text: o.valueFormatter(val) || result.join(","),
+                text: o.valueFormatter(val) ?? result.join(","),
             };
         } else {
             var text = BI.isFunction(o.text) ? o.text() : o.text;

src/widget/multiselect/multiselect.insert.combo.js

@@ -43,6 +43,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             height: o.height - (o.simple ? 1 : 2),
             text: o.text,
             watermark: o.watermark,
+            defaultText: o.defaultText,
             // adapter: this.popup,
             masker: {
                 offset: {
@@ -55,7 +56,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             valueFormatter: o.valueFormatter,
             itemsCreator: BI.bind(this._itemsCreator4Trigger, this),
             itemHeight: o.itemHeight,
-            value: o.value
+            value: this.storeValue,
         });
 
         this.trigger.on(BI.MultiSelectInsertTrigger.EVENT_FOCUS, function () {

src/widget/multiselect/multiselect.insert.trigger.js

@@ -37,6 +37,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
             type: "bi.multi_select_insert_searcher",
             height: o.height,
             text: o.text,
+            defaultText: o.defaultText,
             itemsCreator: o.itemsCreator,
             valueFormatter: o.valueFormatter,
             itemHeight: o.itemHeight,
@@ -109,7 +110,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
     /**
      * 重新调整numberCounter的空白占位符
      */
-    refreshPlaceHolderWidth: function(width) {
+    refreshPlaceHolderWidth: function (width) {
         this.wrapper.attr("items")[1].width = width;
         this.wrapper.resize();
     },
@@ -150,4 +151,4 @@ BI.MultiSelectInsertTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW = "EVENT_BEFORE_COUNT
 BI.MultiSelectInsertTrigger.EVENT_FOCUS = "EVENT_FOCUS";
 BI.MultiSelectInsertTrigger.EVENT_BLUR = "EVENT_BLUR";
 
-BI.shortcut("bi.multi_select_insert_trigger", BI.MultiSelectInsertTrigger);
+BI.shortcut("bi.multi_select_insert_trigger", BI.MultiSelectInsertTrigger);

src/widget/multiselect/trigger/searcher.multiselect.insert.js

@@ -16,7 +16,6 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, {
             valueFormatter: BI.emptyFn,
             adapter: null,
             masker: {},
-            text: BI.i18nText("BI-Basic_Please_Select"),
             watermark: BI.i18nText("BI-Basic_Search_And_Patch_Paste"),
         });
     },
@@ -29,6 +28,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, {
             watermark: o.watermark,
             height: o.height,
             text: o.text,
+            defaultText: o.defaultText,
             listeners: [{
                 eventName: BI.MultiSelectEditor.EVENT_FOCUS,
                 action: function () {

src/widget/multitree/multi.tree.list.combo.js

@@ -15,7 +15,6 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
             allowInsertValue: true,
             isNeedAdjustWidth: true,
             text: "",
-            defaultText: "",
         });
     },
 
@@ -76,8 +75,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
                     itemsCreator: o.itemsCreator
                 }
             },
-            value: { value: o.value || {} }
-
+            value: this.storeValue
         });
 
         this.combo = BI.createWidget({
@@ -141,7 +139,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
                 maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
             },
             isNeedAdjustWidth: o.isNeedAdjustWidth,
-            value: { value: o.value || {} },
+            value: this.storeValue,
             hideChecker: function (e) {
                 return triggerBtn.element.find(e.target).length === 0 &&
                     self.numberCounter.element.find(e.target).length === 0;

src/widget/multitree/trigger/searcher.list.multi.tree.js

@@ -8,7 +8,7 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, {
 
     _defaultConfig: function () {
         return BI.extend(BI.MultiListTreeSearcher.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-tree-searcher",
+            baseCls: "bi-multi-list-tree-searcher",
             itemsCreator: BI.emptyFn,
             valueFormatter: function (v) {
                 return v;