Pull request #3019: REPORT-77978 fix: 下拉树水印表现异常问题

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '8791b6d4073271e29945cc5409c30966426499a6':
  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,
@@ -289,4 +288,4 @@ BI.MultiLayerSelectTreeCombo.EVENT_CHANGE = "EVENT_CHANGE";
 BI.MultiLayerSelectTreeCombo.EVENT_STOP = "EVENT_STOP";
 BI.MultiLayerSelectTreeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
 BI.MultiLayerSelectTreeCombo.EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM";
-BI.shortcut("bi.multilayer_select_tree_combo", BI.MultiLayerSelectTreeCombo);
+BI.shortcut("bi.multilayer_select_tree_combo", BI.MultiLayerSelectTreeCombo);

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,
@@ -263,4 +262,4 @@ BI.MultiLayerSingleTreeCombo.EVENT_FOCUS = "EVENT_FOCUS";
 BI.MultiLayerSingleTreeCombo.EVENT_CHANGE = "EVENT_CHANGE";
 BI.MultiLayerSingleTreeCombo.EVENT_STOP = "EVENT_STOP";
 BI.MultiLayerSingleTreeCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
-BI.shortcut("bi.multilayer_single_tree_combo", BI.MultiLayerSingleTreeCombo);
+BI.shortcut("bi.multilayer_single_tree_combo", BI.MultiLayerSingleTreeCombo);

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: "",