Merge pull request #204433 in DEC/fineui from master to feature/x

* commit '42f63d618b9a583e1f22064a1824aa939cfc4d21':
  auto upgrade version to 2.0.20221102150501
  KERNEL-13158: context跳过popup
  KERNEL-13158: context跳过popup
  KERNEL-13158: context跳过popup

dist/fix/fix.compact.js

@@ -109,13 +109,13 @@
             pushTarget(this.store);
             return true;
         }
-        if (this._store) {
+        if (this._store || this.options._store) {
             var store = BI.Widget.findStore(this.options.context || this._parent || this.options.element || this._context);
             if (store) {
                 pushTarget(store);
                 needPop = true;
             }
-            this.store = this._store();
+            this.store = (this._store || this.options._store)();
             this.store && (this.store._widget = this);
             needPop && popTarget();
             needPop = false;

examples/useContext.html

@@ -22,10 +22,10 @@
         state: function () {
             return {
                 expand: false,
-                cssScale: 2.0
+                cssScale: true
             };
         },
-        childContext: ["text"],
+        childContext: ["text", "cssScale"],
 
         computed: {
             text: function () {
@@ -41,10 +41,20 @@
     });
     BI.model("demo.model", Model);
 
+    var TempModel = BI.inherit(BI.Model, {
+        state: function () {
+            return {
+                cssScale: false
+            };
+        },
+        childContext: ["cssScale"],
+    });
+    BI.model("demo.temp_model", TempModel);
+
     var oldFormat = BI.pixFormat;
     BI.pixFormat = function (pix, border) {
         var context = BI.useContext("cssScale");
-        if (!context) {
+        if (!context || context.model.cssScale === false) {
             return oldFormat.apply(this, arguments);
         }
         if (!BI.isNumber(pix)) {
@@ -59,8 +69,8 @@
     var oldPix = BI.toPix;
     BI.toPix = function (pix, border) {
         var context = BI.useContext("cssScale");
-        if (!context) {
+        if (!context || context.model.cssScale === false) {
-            return oldPix.apply(this, arguments);
+            return oldFormat.apply(this, arguments);
         }
         if (!BI.isNumber(pix)) {
             return pix;
@@ -109,7 +119,7 @@
             var child;
             var store = BI.useStore();
             return function () {
-                this.element[0].style.setProperty('--css-scale', store.model.cssScale);
+                this.element[0].style.setProperty('--css-scale', 2);
                 return {
                     type: "bi.vertical",
                     vgap: 20,
@@ -130,6 +140,42 @@
                                 day: 15
                             }
                         }
+                    }, {
+                        type: "bi.down_list_combo",
+                        cls: "bi-border",
+                        width: 24,
+                        height: 24,
+                        popup: {
+                            _store: function () {
+                                return BI.Models.getModel("demo.temp_model");
+                            }
+                        },
+                        value: [{value: 2}, {value: 3, childValue: 4}],
+                        items: [[{
+                            text: "属于",
+                            value: 1,
+                            cls: "dot-e-font"
+                        }, {
+                            text: "不属于",
+                            value: 2,
+                            cls: "dot-e-font"
+                        }], [{
+                            el: {
+                                text: "大于",
+                                value: 3,
+                                iconCls1: "dot-e-font"
+                            },
+                            value: 3,
+                            children: [{
+                                text: "固定值",
+                                value: 4,
+                                cls: "dot-e-font"
+                            }, {
+                                text: "平均值",
+                                value: 5,
+                                cls: "dot-e-font"
+                            }]
+                        }]]
                     }]
                 };
             };

package.json

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

src/widget/downlist/combo.downlist.js

@@ -17,7 +17,7 @@
                         text: item.text,
                         icon: item.icon,
                         cls: item.cls,
-                        iconCls1: item.iconCls1,    
+                        iconCls1: item.iconCls1,
                         value: item.value
                     };
                 }
@@ -25,7 +25,7 @@
         });
         return result;
     }
-    
+
     /**
      * Created by roy on 15/8/14.
      */
@@ -41,16 +41,17 @@
                 container: null,
                 stopPropagation: false,
                 el: {},
+                popup: {},
                 minWidth: 140,
                 maxHeight: 1000,
                 destroyWhenHide: false
             });
         },
-    
+
         _init: function () {
             BI.DownListCombo.superclass._init.apply(this, arguments);
             var self = this, o = this.options;
-    
+
             this.downlistcombo = BI.createWidget({
                 element: this,
                 type: "bi.combo",
@@ -63,12 +64,13 @@
                 belowMouse: o.belowMouse,
                 stopPropagation: o.stopPropagation,
                 destroyWhenHide: o.destroyWhenHide,
-                el: BI.createWidget(o.el, {
+                el: {
                     type: "bi.icon_trigger",
                     extraCls: o.iconCls,
                     width: o.width,
-                    height: o.height
+                    height: o.height,
-                }),
+                    ...o.el
+                },
                 popup: {
                     el: {
                         type: "bi.down_list_popup",
@@ -94,39 +96,40 @@
                     },
                     stopPropagation: o.stopPropagation,
                     maxHeight: o.maxHeight,
-                    minWidth: o.minWidth
+                    minWidth: o.minWidth,
+                    ...o.popup
                 }
             });
-    
+
             this.downlistcombo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
                 self.fireEvent(BI.DownListCombo.EVENT_BEFORE_POPUPVIEW);
             });
         },
-    
+
         hideView: function () {
             this.downlistcombo.hideView();
         },
-    
+
         showView: function (e) {
             this.downlistcombo.showView(e);
         },
-    
+
         populate: function (items) {
             this.popupView.populate(items);
         },
-    
+
         setValue: function (v) {
             this.popupView.setValue(v);
         },
-    
+
         getValue: function () {
             return this.popupView.getValue();
         },
-    
+
         adjustWidth: function () {
             this.downlistcombo.adjustWidth();
         },
-    
+
         adjustHeight: function () {
             this.downlistcombo.adjustHeight();
         }
@@ -134,6 +137,6 @@
     BI.DownListCombo.EVENT_CHANGE = "EVENT_CHANGE";
     BI.DownListCombo.EVENT_SON_VALUE_CHANGE = "EVENT_SON_VALUE_CHANGE";
     BI.DownListCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
-    
+
     BI.shortcut("bi.down_list_combo", BI.DownListCombo);
 }());