Merge branch 'master' of ssh://code.fineres.com:7999/~xavier.meng/fineui

demo/js/case/combo/demo.text_value_combo.js

@@ -8,7 +8,8 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
     render: function () {
         var combo1, combo2;
 
-        var items = [{
+        var items = [
+            {
                 text: "MVC-1",
                 iconCls: "date-font",
                 value: 1
@@ -20,7 +21,8 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
                 text: "MVC-3",
                 iconCls: "pull-right-font",
                 value: 3
-        }];
+            }
+        ];
 
         // 创建下拉框各种场景用例
         return {
@@ -195,6 +197,31 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
                             allowClear: true,
                             defaultText: "请选择",
                             chooseType: BI.Selection.Multi,
+                            value: [1],
+                            // allowSelectAll: false,
+                            listeners: [
+                                {
+                                    eventName: BI.TextValueCombo.EVENT_CHANGE,
+                                    action: function () {
+                                        console.log(this.getValue());
+                                    }
+                                }
+                            ]
+                        }
+                    ]
+                }),
+                this.createCombo("支持复选,不要全选功能", {
+                    type: "bi.vertical",
+                    items: [
+                        {
+                            type: "bi.text_value_combo",
+                            width: 300,
+                            items: items,
+                            allowClear: true,
+                            defaultText: "请选择",
+                            chooseType: BI.Selection.Multi,
+                            value: [1],
+                            allowSelectAll: false,
                             listeners: [
                                 {
                                     eventName: BI.TextValueCombo.EVENT_CHANGE,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221123105406",
+  "version": "2.0.20221202164316",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

src/case/combo/textvaluecombo/combo.textvalue.js

@@ -16,7 +16,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
             el: {},
             allowClear: false,
             status: "success", //  success | warning | error,
-            title: null
+            title: null,
+            allowSelectAll: true,
         });
     },
 
@@ -78,6 +79,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
             ref: ref => this.popup = ref,
             chooseType: o.chooseType,
             items: o.items,
+            allowSelectAll: o.allowSelectAll,
             listeners: [
                 {
                     eventName: BI.TextValueComboPopup.EVENT_CHANGE,

src/case/combo/textvaluecombo/popup.textvalue.js

@@ -2,7 +2,8 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
     _defaultConfig: function () {
         return BI.extend(BI.TextValueComboPopup.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-text-icon-popup",
-            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
+            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
+            allowSelectAll: true,
         });
     },
 
@@ -12,18 +13,22 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
             return {
                 type: "bi.vertical",
                 vgap: 5,
-                items: [{
+                items: [
+                    {
                         type: "bi.button_group",
                         ref: (_ref) => {
                             this.popup = _ref;
                         },
                         items: this._formatItems(o.items),
                         chooseType: o.chooseType,
-                    layouts: [{
+                        layouts: [
+                            {
                                 type: "bi.vertical"
-                    }],
+                            }
+                        ],
                         value: o.value,
-                    listeners: [{
+                        listeners: [
+                            {
                                 eventName: BI.Controller.EVENT_CHANGE,
                                 action: function (type, val, obj) {
                                     self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@@ -31,15 +36,17 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
                                         self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
                                     }
                                 }
-                    }]
-                }]
+                            }
+                        ]
+                    }
+                ]
             };
         }
         return {
             type: "bi.vertical",
             verticalAlign: BI.VerticalAlign.Stretch,
-            rowSize: ["fill", ""],
-            items: [{
+            items: o.allowSelectAll ? [
+                {
                     type: "bi.select_list",
                     logic: {
                         dynamic: true,
@@ -52,7 +59,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
                     },
                     el: {
                         el: {
-                        chooseType: o.chooseType
+                            chooseType: o.chooseType,
                         }
                     },
                     items: this._formatItems(o.items),
@@ -60,17 +67,21 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
                         type: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
                         value: o.value
                     },
-                listeners: [{
+                    height: "fill",
+                    listeners: [
+                        {
                             eventName: BI.SelectList.EVENT_CHANGE,
                             action: function (val) {
                                 self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val);
                             }
-                }]
+                        }
+                    ]
                 }, {
                     type: "bi.center",
                     cls: "list-view-toolbar bi-high-light bi-split-top",
                     height: 24,
-                items: BI.createItems([{
+                    items: BI.createItems([
+                        {
                             type: "bi.text_button",
                             text: BI.i18nText("BI-Basic_Clears"),
                             handler: function () {
@@ -82,12 +93,41 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
                             handler: function () {
                                 self.fireEvent(BI.TextValueComboPopup.EVENT_CONFIRM);
                             }
-                }], {
+                        }
+                    ], {
                         once: false,
                         shadow: true,
                         isShadowShowingOnSelected: true
                     })
-            }]
+                }
+            ] : [
+                {
+                    type: "bi.list_pane",
+                    logic: {
+                        dynamic: true,
+                        innerVgap: 5,
+                        rowSize: ["", "fill"],
+                        verticalAlign: BI.VerticalAlign.Stretch
+                    },
+                    ref: (_ref) => {
+                        this.popup = _ref;
+                    },
+                    el: {
+                        chooseType: o.chooseType,
+                    },
+                    items: this._formatItems(o.items),
+                    value: o.value,
+                    height: "fill",
+                    listeners: [
+                        {
+                            eventName: BI.ListPane.EVENT_CHANGE,
+                            action: function (val) {
+                                self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val);
+                            }
+                        }
+                    ]
+                }
+            ],
         };
     },
 
@@ -117,6 +157,9 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
             return this.popup.getValue();
         }
         var val = this.popup.getValue();
+        if (!this.options.allowSelectAll) {
+            return val;
+        }
         if (val.type === BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
             return val.value;
         } else {
@@ -128,6 +171,10 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
         if (this.options.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
             return this.popup.setValue(v);
         }
+        if (!this.options.allowSelectAll) {
+            this.popup.setValue(v);
+            return;
+        }
         this.popup.setValue({
             type: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
             value: v

src/core/platform/web/function.js

@@ -137,5 +137,14 @@ BI._.extend(BI, {
             return version[1] * 1;
         }
         return 0;
+    },
+
+    getMinimumFontSize: function () {
+        const el = document.createElement('div');
+        el.style.fontSize = "0px";
+        document.body.appendChild(el);
+        const size = getComputedStyle(el).fontSize;
+        el.remove();
+        return parseInt(size);
     }
 });

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -260,11 +260,11 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
     },
 
     focus: function () {
-        this.trigger.focus();
+        this.trigger ? this.trigger.focus() : this.textTrigger.focus();
     },
 
     blur: function () {
-        this.trigger.blur();
+        this.trigger ? this.trigger.blur() : this.textTrigger.blur();
     },
 
     showView: function () {
@@ -272,7 +272,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
     },
 
     setWaterMark: function (v) {
-        this.trigger.setWaterMark(v);
+        this.trigger ? this.trigger.setWaterMark(v) : this.textTrigger.setWaterMark(v);
     }
 });
 

src/widget/multiselect/multiselect.combo.nobar.js

@@ -160,6 +160,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
                 itemsCreator: o.itemsCreator,
                 itemHeight: o.itemHeight,
                 valueFormatter: o.valueFormatter,
+                itemFormatter: o.itemFormatter,
                 onLoaded: function () {
                     BI.nextTick(function () {
                         self.combo.adjustWidth();

src/widget/singleselect/singleselectlist.insert.js

@@ -55,8 +55,10 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
             },
             itemsCreator: function (op, callback) {
                 op.keywords = [self.trigger.getKeyword()];
+                if (BI.isNotEmptyString(op.keywords[0])) {
                     this.setKeyword(op.keywords[0]);
                     o.itemsCreator(op, callback);
+                }
             },
         });
         this.searcherPane.setVisible(false);