KERNEL-15104 chore:代码同步

2 years ago · 2e2fc09951
2 changed files with 11 additions and 6 deletions
--- 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,
--- 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: [
                            {