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

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

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -13,7 +13,6 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
             defaultText: "",
             itemsCreator: BI.emptyFn,
             items: [],
-            value: "",
             allowEdit: false,
             allowSearchValue: false,
             allowInsertValue: false,

src/widget/multilayerselecttree/multilayerselecttree.trigger.js

@@ -42,7 +42,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
                                 self.editor = this;
                             },
                             defaultText: o.defaultText,
-                            text: this._digest(o.value),
+                            text: BI.isKey(o.value) ? this._digest(o.value) : o.text,
                             value: o.value,
                             height: o.height,
                             tipText: "",

src/widget/multilayersingletree/multilayersingletree.combo.js

@@ -16,7 +16,6 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
             defaultText: "",
             itemsCreator: BI.emptyFn,
             items: [],
-            value: "",
             allowEdit: false,
             allowSearchValue: false,
             allowInsertValue: false,

src/widget/multilayersingletree/multilayersingletree.trigger.js

@@ -42,7 +42,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
                                 self.editor = this;
                             },
                             defaultText: o.defaultText,
-                            text: this._digest(o.value),
+                            text: BI.isKey(o.value) ? this._digest(o.value) : o.text,
                             value: o.value,
                             height: o.height,
                             tipText: "",