From 2e2fc09951f7fce29a9dddfe581d290c8e337dd5 Mon Sep 17 00:00:00 2001
From: Treecat <treecat@fanruan.com>
Date: Wed, 26 Apr 2023 09:44:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-15104=20chore:=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../combo/textvaluecombo/combo.textvaluesmall.js |  1 +
 .../case/combo/textvaluecombo/popup.textvalue.js | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/fineui/src/case/combo/textvaluecombo/combo.textvaluesmall.js b/packages/fineui/src/case/combo/textvaluecombo/combo.textvaluesmall.js
index c6bfe6180..7e4f416ba 100644
--- a/packages/fineui/src/case/combo/textvaluecombo/combo.textvaluesmall.js
+++ b/packages/fineui/src/case/combo/textvaluecombo/combo.textvaluesmall.js
@@ -33,6 +33,7 @@ export class SmallTextValueCombo extends Widget {
                 type: SmallSelectTextTrigger.xtype,
                 ...o.el,
             },
+            items: o.items,
             text: o.text,
             value: o.value,
             defaultText: o.defaultText,
diff --git a/packages/fineui/src/case/combo/textvaluecombo/popup.textvalue.js b/packages/fineui/src/case/combo/textvaluecombo/popup.textvalue.js
index b0b22a048..6ac60cfc8 100644
--- a/packages/fineui/src/case/combo/textvaluecombo/popup.textvalue.js
+++ b/packages/fineui/src/case/combo/textvaluecombo/popup.textvalue.js
@@ -39,17 +39,21 @@ export class TextValueComboPopup extends Pane {
                 vgap: 5,
                 items: [
                     {
-                        type: ButtonGroup.xtype,
+                        type: ListPane.xtype,
                         ref: _ref => {
                             this.popup = _ref;
                         },
                         items: this._formatItems(o.items),
                         chooseType: o.chooseType,
-                        layouts: [
-                            {
-                                type: VerticalLayout.xtype,
-                            }
-                        ],
+                        el: {
+                            type: ButtonGroup.xtype,
+                            chooseType: o.chooseType,
+                            layouts: [
+                                {
+                                    type: VerticalLayout.xtype,
+                                }
+                            ],
+                        },
                         value: o.value,
                         listeners: [
                             {

From 33cfd6aea8c015d74898d5e4f025c62a6afe5340 Mon Sep 17 00:00:00 2001
From: Treecat <treecat@fanruan.com>
Date: Wed, 26 Apr 2023 10:01:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-94935=20fix:isArray=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=A2=AB=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/fineui/src/core/func/alias.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fineui/src/core/func/alias.js b/packages/fineui/src/core/func/alias.js
index 8c7e802ff..9a8d6dc37 100644
--- a/packages/fineui/src/core/func/alias.js
+++ b/packages/fineui/src/core/func/alias.js
@@ -1,4 +1,4 @@
-import { each, isFunction, isNull, isObject, isPlainObject, keys, leftPad, parseDateTime, values } from "../2.base";
+import { each, isFunction, isNull, isObject, isPlainObject, keys, leftPad, parseDateTime, values, isArray } from "../2.base";
 import { replaceAll } from "./string";
 import { getFullDayName, getMonthName, getTimezone } from "./date";
 import { _global } from "../0.foundation";