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

dist/fix/fix.compact.js

@@ -105,6 +105,10 @@
         if (workerMode && this._worker) {
             return;
         }
+        if (this.store) {
+            pushTarget(this.store);
+            return true;
+        }
         if (this._store) {
             var store = findStore(this.options.context || this._parent || this.options.element || this._context);
             if (store) {

package.json

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

src/base/single/button/buttons/button.icon.js

@@ -8,6 +8,12 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
         var conf = BI.IconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             _baseCls: (conf._baseCls || "") + " bi-icon-button horizon-center",
+            hgap: 0,
+            vgap: 0,
+            tgap: 0,
+            bgap: 0,
+            lgap: 0,
+            rgap: 0,
             iconWidth: null,
             iconHeight: null
         });
@@ -28,6 +34,12 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
             BI.createWidget({
                 type: "bi.default",
                 element: this,
+                hgap: o.hgap,
+                vgap: o.vgap,
+                lgap: o.lgap,
+                rgap: o.rgap,
+                tgap: o.tgap,
+                bgap: o.bgap,
                 items: [this.icon]
             });
         } else {
@@ -35,6 +47,12 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
             BI.createWidget({
                 element: this,
                 type: "bi.center_adapt",
+                hgap: o.hgap,
+                vgap: o.vgap,
+                lgap: o.lgap,
+                rgap: o.rgap,
+                tgap: o.tgap,
+                bgap: o.bgap,
                 items: [this.icon]
             });
         }

src/base/single/button/listitem/blankiconicontextitem.js

@@ -50,6 +50,7 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, {
                 iconWidth: o.iconWidth,
                 iconHeight: o.iconHeight
             }, {
+                el: {
                     type: "bi.label",
                     ref: function (_ref) {
                         self.text = _ref;
@@ -63,6 +64,7 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height
+                }
             }]
         };
     },

src/base/single/button/listitem/blankicontexticonitem.js

@@ -44,6 +44,7 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
                 iconWidth: o.iconWidth,
                 iconHeight: o.iconHeight
             }, {
+                el: {
                     type: "bi.label",
                     ref: function (_ref) {
                         self.text = _ref;
@@ -57,6 +58,7 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height
+                }
             }, {
                 type: "bi.icon_label",
                 cls: o.iconCls2,

src/base/single/button/listitem/blankicontextitem.js

@@ -42,6 +42,7 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
                 iconWidth: o.iconWidth,
                 iconHeight: o.iconHeight
             }, {
+                el: {
                     type: "bi.label",
                     ref: function (_ref) {
                         self.text = _ref;
@@ -56,6 +57,7 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height
+                }
             }]
         };
     },

src/base/single/button/listitem/icontexticonitem.js

@@ -40,6 +40,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
                 iconWidth: o.iconWidth,
                 iconHeight: o.iconHeight
             }, {
+                el: {
                     type: "bi.label",
                     ref: function (_ref) {
                         self.text = _ref;
@@ -53,6 +54,7 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height
+                }
             }, {
                 type: "bi.icon_label",
                 cls: o.iconCls2,

src/base/single/button/listitem/icontextitem.js

@@ -40,6 +40,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
                 iconWidth: o.iconWidth,
                 iconHeight: o.iconHeight
             }, {
+                el: {
                     type: "bi.label",
                     ref: function (_ref) {
                         self.text = _ref;
@@ -54,6 +55,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height
+                }
             }]
         };
     },

src/base/single/button/listitem/texticonitem.js

@@ -33,6 +33,7 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
             type: "bi.vertical_adapt",
             columnSize: ["fill", o.iconWrapperWidth || o.height],
             items: [{
+                el: {
                     type: "bi.label",
                     ref: function (_ref) {
                         self.text = _ref;
@@ -47,6 +48,7 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height
+                }
             }, {
                 type: "bi.icon_label",
                 cls: o.iconCls,

src/base/single/button/node/icontexticonnode.js

@@ -38,6 +38,7 @@ BI.IconTextIconNode = BI.inherit(BI.NodeButton, {
                 iconWidth: o.iconWidth,
                 iconHeight: o.iconHeight
             }, {
+                el: {
                     type: "bi.label",
                     ref: function (_ref) {
                         self.text = _ref;
@@ -51,6 +52,7 @@ BI.IconTextIconNode = BI.inherit(BI.NodeButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height
+                }
             }, {
                 type: "bi.icon_label",
                 cls: o.iconCls2,

src/base/single/button/node/icontextnode.js

@@ -37,6 +37,7 @@ BI.IconTextNode = BI.inherit(BI.NodeButton, {
                 iconWidth: o.iconWidth,
                 iconHeight: o.iconHeight
             }, {
+                el: {
                     type: "bi.label",
                     ref: function (_ref) {
                         self.text = _ref;
@@ -51,6 +52,7 @@ BI.IconTextNode = BI.inherit(BI.NodeButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height
+                }
             }]
         };
     },

src/base/single/button/node/texticonnode.js

@@ -29,6 +29,7 @@ BI.TextIconNode = BI.inherit(BI.NodeButton, {
             type: "bi.vertical_adapt",
             columnSize: ["fill", o.iconWrapperWidth || o.height],
             items: [{
+                el: {
                     type: "bi.label",
                     ref: function (_ref) {
                         self.text = _ref;
@@ -43,6 +44,7 @@ BI.TextIconNode = BI.inherit(BI.NodeButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height
+                }
             }, {
                 type: "bi.icon_label",
                 cls: o.iconCls,

src/base/single/label/icon.label.js

@@ -7,6 +7,12 @@ BI.IconLabel = BI.inherit(BI.Single, {
 
     props: {
         baseCls: "bi-icon-label horizon-center",
+        hgap: 0,
+        vgap: 0,
+        tgap: 0,
+        bgap: 0,
+        lgap: 0,
+        rgap: 0,
         iconWidth: null,
         iconHeight: null,
         lineHeight: null,
@@ -27,6 +33,12 @@ BI.IconLabel = BI.inherit(BI.Single, {
             BI.createWidget({
                 type: "bi.default",
                 element: this,
+                hgap: o.hgap,
+                vgap: o.vgap,
+                lgap: o.lgap,
+                rgap: o.rgap,
+                tgap: o.tgap,
+                bgap: o.bgap,
                 items: [this.icon]
             });
         } else {
@@ -34,6 +46,12 @@ BI.IconLabel = BI.inherit(BI.Single, {
             BI.createWidget({
                 element: this,
                 type: "bi.center_adapt",
+                hgap: o.hgap,
+                vgap: o.vgap,
+                lgap: o.lgap,
+                rgap: o.rgap,
+                tgap: o.tgap,
+                bgap: o.bgap,
                 items: [this.icon]
             });
         }

src/case/button/item.multiselect.js

@@ -17,7 +17,8 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
             iconWrapperWidth: 26,
             textHgap: 0,
             textLgap: 0,
-            textRgap: 0
+            textRgap: 0,
+            textVgap: 0,
         });
     },
 
@@ -48,9 +49,10 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
                     whiteSpace: "nowrap",
                     textHeight: o.height,
                     height: o.height,
-                    hgap: o.hgap,
-                    rgap: o.rgap,
+                    hgap: o.textHgap,
+                    rgap: o.textRgap,
                     lgap: o.textLgap,
+                    vgap: o.textVgap,
                     text: o.text,
                     keyword: o.keyword,
                     value: o.value,

src/case/button/item.singleselect.icontext.js

@@ -28,6 +28,10 @@ BI.SingleSelectIconTextItem = BI.inherit(BI.Single, {
             height: o.height,
             iconHeight: o.iconHeight,
             iconWidth: o.iconWidth,
+            textHgap: o.textHgap,
+            textVgap: o.textVgap,
+            textLgap: o.textLgap,
+            textRgap: o.textRgap,
             text: o.text,
             keyword: o.keyword,
             value: o.value,

src/case/button/item.singleselect.js

@@ -5,7 +5,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             attributes: {
                 tabIndex: 1
             },
-            hgap: 10,
+            textHgap: 10,
             height: 24,
             textAlign: "left"
         });
@@ -20,7 +20,10 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             whiteSpace: "nowrap",
             textHeight: o.height,
             height: o.height,
-            hgap: o.hgap,
+            hgap: o.hgap || o.textHgap,
+            vgap: o.textVgap,
+            lgap: o.textLgap,
+            rgap: o.textRgap,
             text: o.text,
             keyword: o.keyword,
             value: o.value,

src/case/button/item.singleselect.radio.js

@@ -15,8 +15,8 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
             },
             height: 24,
             iconWrapperWidth: 16,
-            hgap: 10,
-            textHgap: 0,
+            textHgap: 10,
+            textVgap: 0,
             textLgap: 0,
             textRgap: 0
         });
@@ -46,9 +46,10 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
                     whiteSpace: "nowrap",
                     textHeight: o.height,
                     height: o.height,
-                    hgap: o.hgap,
-                    rgap: o.textRgap,
+                    hgap: o.hgap || o.textHgap,
+                    vgap: o.textVgap,
                     lgap: o.textLgap,
+                    rgap: o.textRgap,
                     text: o.text,
                     keyword: o.keyword,
                     value: o.value,

src/case/button/node/node.arrow.js

@@ -41,7 +41,10 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
                     whiteSpace: "nowrap",
                     textHeight: o.height,
                     height: o.height,
-                    hgap: o.hgap,
+                    hgap: o.hgap || o.textHgap,
+                    vgap: o.textVgap,
+                    lgap: o.textLgap,
+                    rgap: o.textRgap,
                     text: o.text,
                     value: o.value,
                     py: o.py,

src/case/button/node/node.plus.js

@@ -46,7 +46,10 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, {
                     whiteSpace: "nowrap",
                     textHeight: o.height,
                     height: o.height,
-                    hgap: o.hgap,
+                    hgap: o.hgap || o.textHgap,
+                    vgap: o.textVgap,
+                    lgap: o.textLgap,
+                    rgap: o.textRgap,
                     text: o.text,
                     value: o.value,
                     keyword: o.keyword,

src/case/combo/iconcombo/combo.icon.js

@@ -25,8 +25,14 @@ BI.IconCombo = BI.inherit(BI.Widget, {
     },
 
     _init: function () {
-        BI.IconCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
+        BI.IconCombo.superclass._init.apply(this, arguments);
         this.trigger = BI.createWidget(o.el, {
             type: "bi.icon_combo_trigger",
             iconCls: o.iconCls,

src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@@ -15,8 +15,14 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        o.height -= 2;
         BI.isNumeric(o.width) && (o.width -= 2);
+        BI.isNumeric(o.height) && (o.height -= 2);
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
         BI.IconTextValueCombo.superclass._init.apply(this, arguments);
         this.trigger = BI.createWidget({
             type: "bi.select_icon_text_trigger",

src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@@ -15,6 +15,12 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
 
     render: function () {
         var self = this, o = this.options;
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
         return {
             type: "bi.absolute",
             items: [{

src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js

@@ -16,8 +16,14 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        o.height -= 2;
         BI.isNumeric(o.width) && (o.width -= 2);
+        BI.isNumeric(o.height) && (o.height -= 2);
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
         BI.TextValueCheckCombo.superclass._init.apply(this, arguments);
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",

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

@@ -17,8 +17,14 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        o.height -= 2;
         BI.isNumeric(o.width) && (o.width -= 2);
+        BI.isNumeric(o.height) && (o.height -= 2);
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
         BI.TextValueCombo.superclass._init.apply(this, arguments);
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",

src/case/combo/textvaluecombo/combo.textvaluesmall.js

@@ -16,8 +16,14 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
     },
 
     _init: function () {
-        BI.SmallTextValueCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
+        o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) {
+            self.populate(newValue);
+        }) : o.items;
+        BI.SmallTextValueCombo.superclass._init.apply(this, arguments);
         this.trigger = BI.createWidget(o.el, {
             type: "bi.small_select_text_trigger",
             items: o.items,

src/case/trigger/trigger.text.js

@@ -44,10 +44,11 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
 
         BI.createWidget({
             element: this,
-            type: "bi.htape",
+            type: "bi.horizontal_fill",
             items: [
                 {
-                    el: this.text
+                    el: this.text,
+                    width: "fill"
                 }, {
                     el: this.trigerButton,
                     width: o.triggerWidth || o.height

src/core/3.ob.js

@@ -51,9 +51,11 @@
             if (BI.isFunction(this.props)) {
                 props = this.props(config);
             }
-            var defaultProps = this._defaultConfig(config);
-            var modifiedDefaultProps = (config && config.type && BI.OB.configFunctions[config.type + ".props"]) ? BI.OB.configFunctions[config.type + ".props"](config, defaultProps) : null;
-            this.options = extend(defaultProps, props, modifiedDefaultProps, config);
+            var defaultProps = extend(this._defaultConfig(config), props);
+            var modifiedDefaultProps = (config && config.type && BI.OB.configFunctions[config.type + ".props"]) ? BI.reduce(BI.OB.configFunctions[config.type + ".props"], function (value, conf, index) {
+                return extend(conf, value.fn(defaultProps, config, value.opt));
+            }, {}) : null;
+            this.options = extend(defaultProps, modifiedDefaultProps, config);
         },
 
         _init: function () {

src/core/4.widget.js

@@ -147,7 +147,10 @@
                     self.__async = true;
                     var beforeRenderResult = (self.options.beforeRender || self.beforeRender).call(self, render);
                     if (beforeRenderResult instanceof Promise) {
-                        beforeRenderResult.then(render);
+                        beforeRenderResult.then(render).catch(function (e) {
+                            _global.console && console.error(e);
+                            render();
+                        });
                     }
                 } else {
                     self._render();
@@ -159,7 +162,10 @@
                 this.__asking = true;
                 var beforeInitResult = (this.options.beforeInit || this.beforeInit).call(this, init);
                 if (beforeInitResult instanceof Promise) {
-                    beforeInitResult.then(init);
+                    beforeInitResult.then(init).catch(function (e) {
+                        _global.console && console.error(e);
+                        init();
+                    });
                 }
             } else {
                 init();
@@ -291,23 +297,38 @@
         },
 
         _initVisual: function () {
-            var o = this.options;
+            var self = this, o = this.options;
             if (o.invisible) {
+                var invisible = BI.isFunction(o.invisible) ? this.__watch(o.invisible, function (context, newValue) {
+                    self.setVisible(!newValue);
+                }) : o.invisible;
+                if (invisible) {
                     // 用display属性做显示和隐藏，否则jquery会在显示时将display设为block会覆盖掉display:flex属性
                     this.element.css("display", "none");
                 }
+            }
         },
 
         _initEffects: function () {
             var self = this, o = this.options;
             if (o.disabled || o.invalid) {
                 if (this.options.disabled) {
+                    var disabled = BI.isFunction(o.disabled) ? this.__watch(o.disabled, function (context, newValue) {
+                        self.setEnable(!newValue);
+                    }) : o.disabled;
+                    if (disabled) {
                         this.setEnable(false);
                     }
+                }
                 if (this.options.invalid) {
+                    var invalid = BI.isFunction(o.invalid) ? this.__watch(o.invalid, function (context, newValue) {
+                        self.setEnable(!newValue);
+                    }) : o.invalid;
+                    if (invalid) {
                         this.setValid(false);
                     }
                 }
+            }
             if (o.effect) {
                 if (BI.isArray(o.effect)) {
                     if (BI.isArray(o.effect[0])) {
@@ -750,12 +771,20 @@
             // }
             // this._isMounted = false;
             // this.purgeListeners();
+
+            // 去掉组件绑定的watcher
+            BI.each(this._watchers, function (i, unwatches) {
+                unwatches = BI.isArray(unwatches) ? unwatches : [unwatches];
+                BI.each(unwatches, function (j, unwatch) {
+                    unwatch();
+                });
+            });
+            this._watchers && (this._watchers = []);
             this.__d();
             this.element.empty();
             this.element.unbind();
             this._initCurrent();
             this._init();
-            this._mount();
             // this._initRef();
         },
 

src/less/lib/font.less

@@ -1,57 +1,57 @@
 //字体库
 
-@font-cross: "e6d0";
+@font-cross: "e1ab";
 
-@font-circle-close: "e6d5";
+@font-circle-close: "e1a9";
 
-@font-search: "e6dc";
+@font-search: "e1c3";
 
-@font-date: "e733";
-@font-time: "e6b1";
-@font-change: "e72f";
+@font-date: "e1d3";
+@font-time: "e1ae";
+@font-change: "e1cd";
 
-@font-dot: "e762";
+@font-dot: "e1aa";
 
-@font-plus: "e75b";
-@font-minus: "e75a";
+@font-plus: "e1a0";
+@font-minus: "e19e";
 
-@font-right-triangle: "e70c";
+@font-right-triangle: "e1bd";
 
-@font-copy: "e6bd";
-@font-check-mark: "e6cf";
+@font-copy: "e1ad";
+@font-check-mark: "e1b0";
 
-@font-arrow-left: "e70d";
-@font-arrow-right: "e70c";
+@font-arrow-left: "e1bc";
+@font-arrow-right: "e1bd";
 
-@font-up-triangle: "e70a";
-@font-down-triangle: "e70b";
+@font-up-triangle: "e1c6";
+@font-down-triangle: "e1c9";
 
-@font-solid-left: "e6d9";
-@font-solid-right: "e6d8";
-@font-solid-top: "e6d6";
-@font-solid-bottom: "e6d7";
+@font-solid-left: "e1c4";
+@font-solid-right: "e1a5";
+@font-solid-top: "e1ac";
+@font-solid-bottom: "e1c0";
 
-@font-trigger-triangle: "e64e";
+@font-trigger-triangle: "e1d5";
 
 
-@font-less: "e75e";
-@font-less-equal: "e761";
+@font-less: "e1d1";
+@font-less-equal: "e1d2";
 
-@font-bold: "e697";
-@font-italic: "e69d";
-@font-underline: "e69c";
-@font-color: "e698";
-@font-background: "e699";
-@font-color-underline: "e69a";
-@font-align-left: "e6ca";
-@font-align-center: "e6bf";
-@font-align-right: "e6c8";
+@font-bold: "e19b";
+@font-italic: "e199";
+@font-underline: "e1d6";
+@font-color: "e198";
+@font-background: "e19a";
+@font-color-underline: "e19c";
+@font-align-left: "e1a7";
+@font-align-center: "e1a2";
+@font-align-right: "e1af";
 
-@font-tip-error: "e757";
-@font-tip-success: "e756";
-@font-tip-warning: "e755";
-@font-tip-message: "e74b";
+@font-tip-error: "e1da";
+@font-tip-success: "e1db";
+@font-tip-warning: "e1d7";
+@font-tip-message: "e1d9";
 
-@font-key: "e740";
+@font-key: "e1d0";
 
-@font-add: "e6dd";
+@font-add: "e1c7";