From d5565fef01515062b0c656ad3c595399293f6f08 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Fri, 12 Aug 2022 17:34:19 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-77978=20fix:=20=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A0=91=E6=B0=B4=E5=8D=B0=E8=A1=A8=E7=8E=B0=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/editor/editor.defaulttext.js           |  7 +++++--
 .../multilayersingletree.combo.js               |  1 +
 .../multilayersingletree.trigger.js             | 17 ++++++-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/case/editor/editor.defaulttext.js b/src/case/editor/editor.defaulttext.js
index 5c01c7a01..4cfaf59a5 100644
--- a/src/case/editor/editor.defaulttext.js
+++ b/src/case/editor/editor.defaulttext.js
@@ -46,12 +46,15 @@ BI.DefaultTextEditor = BI.inherit(BI.Widget, {
             errorText: o.errorText,
             invisible: true,
         });
+
+        var showText = BI.isFunction(o.text) ? o.text() : o.text;
+
         this.text = BI.createWidget({
             type: "bi.text_button",
-            cls: BI.isKey(o.text) ? "tip-text-style" : "bi-water-mark tip-text-style",
+            cls: BI.isKey(showText) ? "tip-text-style" : "bi-water-mark tip-text-style",
             textAlign: "left",
             height: o.height,
-            text: BI.isKey(o.text) ? o.text : o.defaultText,
+            text: showText || o.defaultText,
             hgap: o.hgap + 2,
             handler: function () {
                 self._showInput();
diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js
index c33e3d216..ba67f0c3a 100644
--- a/src/widget/multilayersingletree/multilayersingletree.combo.js
+++ b/src/widget/multilayersingletree/multilayersingletree.combo.js
@@ -105,6 +105,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                 valueFormatter: o.valueFormatter,
                 height: o.height,
                 text: o.text,
+                defaultText: o.defaultText,
                 value: o.value,
                 tipType: o.tipType,
                 warningTitle: o.warningTitle,
diff --git a/src/widget/multilayersingletree/multilayersingletree.trigger.js b/src/widget/multilayersingletree/multilayersingletree.trigger.js
index e00394a38..1ede397e2 100644
--- a/src/widget/multilayersingletree/multilayersingletree.trigger.js
+++ b/src/widget/multilayersingletree/multilayersingletree.trigger.js
@@ -37,11 +37,11 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
                         },
                         isAutoSearch: false,
                         el: {
-                            type: "bi.state_editor",
+                            type: "bi.default_text_editor",
                             ref: function () {
                                 self.editor = this;
                             },
-                            defaultText: o.text,
+                            defaultText: o.defaultText,
                             text: this._digest(o.value),
                             value: o.value,
                             height: o.height,
@@ -192,16 +192,11 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
             return o.valueFormatter(v);
         }
 
-        if (o.itemsCreator === BI.emptyFn) {
-            var result = BI.find(o.items, function (i, item) {
-                return item.value === v;
-            });
-
-            return BI.isNotNull(result) ? result.text : o.text;
-        }
-
-        return v;
+        var result = BI.find(o.items, function (i, item) {
+            return item.value === v;
+        });
 
+        return BI.isNotNull(result) ? result.text : (o.text ?? v);
     },
 
     _getShowText: function () {