From abe1b1989be5d8576bbbefa34b3c4c21d0a1b8f5 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Mon, 1 Aug 2022 18:20:18 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-11422=20feat:=20=E7=BB=99=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E9=83=BD=E6=B7=BB=E5=8A=A0valueFormatter?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../multilayerselecttree.combo.js                |  4 +++-
 .../multilayerselecttree.trigger.js              | 16 ++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js
index b0371bd59..519b45f76 100644
--- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js
+++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js
@@ -36,6 +36,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
 
         var baseConfig = this._getBaseConfig();
 
+
         if (o.allowEdit) {
             return {
                 type: "bi.absolute",
@@ -65,6 +66,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                 value: o.value,
                 tipType: o.tipType,
                 warningTitle: o.warningTitle,
+                valueFormatter: o.valueFormatter,
             }
         }, { cls });
     },
@@ -287,4 +289,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);
\ No newline at end of file
+BI.shortcut("bi.multilayer_select_tree_combo", BI.MultiLayerSelectTreeCombo);
diff --git a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js
index 3d9614544..f59ab6251 100644
--- a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js
+++ b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js
@@ -19,7 +19,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
         if (o.itemsCreator === BI.emptyFn) {
             this._initData();
         }
-        
+
         return {
             type: "bi.horizontal_fill",
             items: [
@@ -103,7 +103,7 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
                     },
                     width: "fill",
                     rgap: 24
-                        },
+                },
             ]
         };
     },
@@ -181,15 +181,11 @@ BI.MultiLayerSelectTreeTrigger = 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;
-        }
+        var result = BI.find(o.items, function (i, item) {
+            return item.value === v;
+        });
 
-        return v;
+        return BI.isNotNull(result) ? result.text : (o.text ?? v);
     },
 
     _getShowText: function () {