Merge pull request #137952 in DEC/fineui from master to feature/x

* commit '65a57db488c5b8842aa2fd74bc4619ff7dcb1ae1':
  REPORT-77978 fix: 下拉树水印表现异常问题

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

@@ -232,6 +232,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
     setState: function (v) {
         var o = this.options;
         BI.SimpleStateEditor.superclass.setValue.apply(this, arguments);
+        var defaultText = BI.isFunction(o.defaultText) ? o.defaultText() : o.defaultText;
         if (BI.isNumber(v)) {
             if (v === BI.Selection.All) {
                 this._setText(BI.i18nText("BI-Already_Selected"));
@@ -240,7 +241,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
                 this._setText(BI.i18nText("BI-Already_Selected"));
                 this.text.element.removeClass("bi-water-mark");
             } else {
-                this._setText(o.text);
+                this._setText(BI.isKey(defaultText) ? defaultText : o.text);
                 this.text.element.addClass("bi-water-mark");
             }
             return;

src/component/treevaluechooser/combo.listtreevaluechooser.js

@@ -30,6 +30,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
             isNeedAdjustWidth: o.isNeedAdjustWidth,
             element: this,
             text: o.text,
+            defaultText: o.defaultText,
             value: o.value,
             watermark: o.watermark,
             allowInsertValue: o.allowInsertValue,

src/component/treevaluechooser/combo.treevaluechooser.insert.js

@@ -30,6 +30,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
             isNeedAdjustWidth: o.isNeedAdjustWidth,
             allowEdit: o.allowEdit,
             text: o.text,
+            defaultText: o.defaultText,
             value: o.value,
             watermark: o.watermark,
             element: this,

src/widget/multiselect/multiselect.trigger.js

@@ -37,6 +37,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
             type: "bi.multi_select_searcher",
             height: o.height,
             text: o.text,
+            defaultText: o.defaultText,
             itemsCreator: o.itemsCreator,
             itemHeight: o.itemHeight,
             valueFormatter: o.valueFormatter,

src/widget/multiselect/trigger/editor.multiselect.js

@@ -24,7 +24,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, {
             watermark: o.watermark,
             allowBlank: true,
             value: o.value,
-            defaultText: o.text,
+            defaultText: o.defaultText,
             text: o.text,
             tipType: o.tipType,
             warningTitle: o.warningTitle,

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

@@ -27,6 +27,7 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, {
             type: "bi.multi_select_editor",
             height: o.height,
             text: o.text,
+            defaultText: o.defaultText,
             watermark: o.watermark,
             listeners: [{
                 eventName: BI.MultiSelectEditor.EVENT_FOCUS,

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

@@ -30,6 +30,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             height: o.height - (o.simple ? 1 : 2),
             valueFormatter: o.valueFormatter,
             text: o.text,
+            defaultText: o.defaultText,
             watermark: o.watermark,
             // adapter: this.popup,
             masker: {

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

@@ -14,6 +14,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
             allowEdit: true,
             allowInsertValue: true,
             isNeedAdjustWidth: true,
+            text: "",
+            defaultText: "",
         });
     },
 
@@ -29,6 +31,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
             type: "bi.multi_select_trigger",
             allowEdit: o.allowEdit,
             text: o.text,
+            defaultText: o.defaultText,
             watermark: o.watermark,
             height: o.height - (o.simple ? 1 : 2),
             valueFormatter: o.valueFormatter,

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

@@ -27,6 +27,7 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, {
             type: "bi.multi_select_editor",
             height: o.height,
             text: o.text,
+            defaultText: o.defaultText,
             watermark: o.watermark,
             el: {
                 type: "bi.simple_state_editor",

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

@@ -30,6 +30,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
             el: {
                 type: "bi.simple_state_editor",
                 text: o.text,
+                defaultText: o.defaultText,
                 height: o.height
             },
             listeners: [{