Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~kira/fineui

.eslintrc

@@ -27,7 +27,10 @@
   "plugins": ["@typescript-eslint/eslint-plugin"],
   "overrides": [{
     "files": ["src/*.js","src/**/*.js", "demo/*.js", "demo/**/*.js", "i18n/**/*.js", "i18n/*.js", "test/**/*.js", "test/*.js"],
-    "extends": "plugin:@fui/es5"
+    "extends": "plugin:@fui/es5",
+    "rules": {
+      "comma-dangle": ["error", "never"] // 多行对象字面量中要求拖尾逗号
+    }
   }, {
     "files": ["webpack/*.js", "types/*.ts", "typescript/*.ts","typescript/**/*.ts", "./*.js", "lib/**/*.js", "lib/*.js"],
     "extends": "plugin:@fui/typescript"

changelog.md

@@ -1,4 +1,6 @@
 # 更新日志
+2.0(2021-10)
+- combo增加window.blur事件触发隐藏
 2.0(2021-09)
 - 支持自动watch
 - 支持h函数传递left、right，优化left_right_vertical_adapt布局的jsx写法

package.json

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

src/base/combination/combo.js

@@ -296,18 +296,21 @@
                 this.popupView && this.popupView.destroy();
                 this.popupView = null;
                 this._rendered = false;
+            } else {
+                this.popupView && this.popupView.invisible();
+            }
 
             if (!e || !this.combo.element.__isMouseInBounds__(e)) {
                 this.element.removeClass(this.options.hoverClass);
-                }
-            } else {
-                this.popupView && this.popupView.invisible();
+                // 应对bi-focus-shadow在收起时不失焦
+                this.element.blur();
             }
 
             this.element.removeClass(this.options.comboClass);
             delete needHideWhenAnotherComboOpen[this.getName()];
 
             BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
+            BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName());
             this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW);
         },
 
@@ -331,7 +334,10 @@
 
             this.element.addClass(this.options.comboClass);
             BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
+            BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName());
+
             BI.Widget._renderEngine.createElement(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
+            BI.Widget._renderEngine.createElement(window).bind("blur." + this.getName(), BI.bind(this._hideIf, this));
             this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
         },
 
@@ -553,7 +559,8 @@
                 .unbind("mousewheel." + this.getName())
                 .unbind("mouseenter." + this.getName())
                 .unbind("mousemove." + this.getName())
-                .unbind("mouseleave." + this.getName())
+                .unbind("mouseleave." + this.getName());
+            BI.Widget._renderEngine.createElement(window)
                 .unbind("blur." + this.getName());
             BI.Resizers.remove(this.getName());
             this.popupView && this.popupView._destroy();

src/base/single/a/a.js

@@ -20,6 +20,7 @@ BI.A = BI.inherit(BI.Text, {
 
     render: function () {
         var o = this.options;
+        BI.A.superclass.render.apply(this, arguments);
         this.element.attr({href: o.href, target: o.target});
         if (o.el) {
             BI.createWidget(o.el, {

src/base/single/input/checkbox/checkbox.js

@@ -9,10 +9,10 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
         baseCls: "bi-checkbox",
         selected: false,
         handler: BI.emptyFn,
-        width: 16,
-        height: 16,
-        iconWidth: 16,
-        iconHeight: 16
+        width: 14,
+        height: 14,
+        iconWidth: 14,
+        iconHeight: 14
     },
 
     render: function () {
@@ -25,8 +25,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                     self.checkbox = _ref;
                 },
                 cls: "checkbox-content",
-                width: o.iconWidth - 2,
-                height: o.iconHeight - 2
+                width: o.iconWidth,
+                height: o.iconHeight
             }]
         };
     },

src/base/single/input/radio/radio.js

@@ -9,8 +9,8 @@ BI.Radio = BI.inherit(BI.BasicButton, {
         baseCls: "bi-radio",
         selected: false,
         handler: BI.emptyFn,
-        width: 16,
-        height: 16,
+        width: 14,
+        height: 14,
         iconWidth: 14,
         iconHeight: 14
     },

src/case/layer/pane.list.js

@@ -130,6 +130,7 @@ BI.ListPane = BI.inherit(BI.Pane, {
         } else {
             BI.ListPane.superclass.populate.apply(this, arguments);
             this.button_group.populate.apply(this.button_group, arguments);
+            BI.isEmptyArray(BI.get(arguments, [0], [])) && this.setTipText(o.tipText);
         }
     },
 

src/case/toolbar/toolbar.multiselect.js

@@ -19,8 +19,8 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
             },
             halfSelected: false,
             iconWrapperWidth: 26,
-            iconWidth: 16,
-            iconHeight: 16,
+            iconWidth: 14,
+            iconHeight: 14,
         });
     },
     _init: function () {

src/less/base/single/button/button.half.less

@@ -2,10 +2,11 @@
 
 .bi-half-button {
   .border-radius(2px);
+  box-sizing: border-box;
   &:after {
     position: absolute;
-    left: 3px;
-    top: 3px;
+    left: 2px;
+    top: 2px;
     width: 8px;
     height: 8px;
     background-color: @color-bi-background-highlight;

src/less/base/single/input/checkbox.less

@@ -4,6 +4,7 @@
   & .checkbox-content, &.checkbox-content {
     .border-radius(2px);
     border: 1px solid @color-bi-border-dark-line;
+    box-sizing: border-box;
     &:after {
       position: absolute;
       display: table;
@@ -12,8 +13,9 @@
       border: 2px solid transparent;
       border-top: 0;
       border-left: 0;
-      width: 4px;
-      height: 8px;
+      width: 6px;
+      height: 9px;
+      .box-sizing(border-box);
       .transform(rotate(45deg) scale(1) translate(-50%, -50%));
       content: '';
     }

src/less/base/single/input/radio.less

@@ -4,6 +4,7 @@
   & .radio-content, &.radio-content {
     .border-radius(8px);
     border: 1px solid @color-bi-border-dark-line;
+    .box-sizing(border-box);
     &:after {
       content: "";
     }

src/less/base/tree/ztree.less

@@ -108,6 +108,7 @@
 .ztree li span.button.chk {
   &.bi-checkbox {
     border: 1px solid @color-bi-border-dark-line;
+    box-sizing: border-box;
     &.active {
       background-color: @color-bi-background-highlight;
       border-color: @color-bi-border-highlight;;
@@ -115,6 +116,7 @@
   }
   &.bi-half-button {
     border: 1px solid @color-bi-border-highlight;
+    box-sizing: border-box;
   }
 }
 

src/widget/dynamicdate/dynamicdate.combo.js

@@ -30,20 +30,24 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
         this.storeTriggerValue = "";
         var date = BI.getDate();
         this.storeValue = opts.value;
+        
         return {
+            type: "bi.absolute",
+            items: [{
+                el: {
                     type: "bi.htape",
-            cls: "bi-border bi-border-radius",
+                    cls: "bi-border bi-border-radius bi-focus-shadow",
                     items: [{
                         el: {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button date-change-h-font",
-                    width: opts.height,
+                            width: opts.height - 2,
                             height: opts.height - 2,
                             ref: function () {
                                 self.changeIcon = this;
                             }
                         },
-                width: opts.height
+                        width: opts.height - 2
                     }, {
                         type: "bi.absolute",
                         items: [{
@@ -222,8 +226,8 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                             el: {
                                 type: "bi.icon_button",
                                 cls: "bi-trigger-icon-button date-font",
-                        width: opts.height,
-                        height: opts.height,
+                                width: opts.height - 2,
+                                height: opts.height - 2,
                                 listeners: [{
                                     eventName: BI.IconButton.EVENT_CHANGE,
                                     action: function () {
@@ -245,6 +249,12 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                     ref: function (_ref) {
                         self.comboWrapper = _ref;
                     }
+                },
+                top: 1,
+                left: 1,
+                right: 1,
+                bottom: 1
+            }]
         };
     },
 
@@ -261,7 +271,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
         switch (type) {
             case BI.DynamicDateCombo.Dynamic:
                 this.changeIcon.setVisible(true);
-                this.comboWrapper.attr("items")[0].width = o.height;
+                this.comboWrapper.attr("items")[0].width = o.height - 2;
                 this.comboWrapper.resize();
                 break;
             default:
@@ -279,6 +289,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                 return BI.isNotEmptyObject(v.value);
             case BI.DynamicDateCombo.Static:
                 var value = v.value || {};
+                
                 return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0];
             default:
                 return true;

src/widget/dynamicdatetime/dynamicdatetime.combo.js

@@ -30,25 +30,30 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
         this.storeTriggerValue = "";
         var date = BI.getDate();
         this.storeValue = opts.value;
+        
         return {
+            type: "bi.absolute",
+            items: [{
+                el: {
                     type: "bi.htape",
-            cls: "bi-border bi-border-radius",
+                    cls: "bi-border bi-border-radius bi-focus-shadow",
                     items: [{
                         el: {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button date-change-h-font",
-                    width: opts.height,
+                            width: opts.height - 2,
                             height: opts.height - 2,
                             ref: function () {
                                 self.changeIcon = this;
                             }
                         },
-                width: opts.height
+                        width: opts.height - 2
                     }, {
                         type: "bi.absolute",
                         items: [{
                             el: {
                                 type: "bi.combo",
+                                cls: "bi-focus-shadow",
                                 destroyWhenHide: true,
                                 container: opts.container,
                                 ref: function () {
@@ -230,8 +235,8 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                             el: {
                                 type: "bi.icon_button",
                                 cls: "bi-trigger-icon-button date-font",
-                        width: opts.height,
-                        height: opts.height,
+                                width: opts.height - 2,
+                                height: opts.height - 2,
                                 listeners: [{
                                     eventName: BI.IconButton.EVENT_CHANGE,
                                     action: function () {
@@ -253,6 +258,12 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                     ref: function (_ref) {
                         self.comboWrapper = _ref;
                     }
+                },
+                top: 1,
+                left: 1,
+                right: 1,
+                bottom: 1
+            }]
         };
     },
 
@@ -269,7 +280,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
         switch (type) {
             case BI.DynamicDateTimeCombo.Dynamic:
                 this.changeIcon.setVisible(true);
-                this.comboWrapper.attr("items")[0].width = o.height;
+                this.comboWrapper.attr("items")[0].width = o.height - 2;
                 this.comboWrapper.resize();
                 break;
             default:
@@ -287,6 +298,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                 return BI.isNotEmptyObject(v.value);
             case BI.DynamicDateCombo.Static:
                 var value = v.value || {};
+
                 return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0];
             default:
                 return true;

src/widget/year/combo.year.js

@@ -6,7 +6,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
         minDate: "1900-01-01", // 最小日期
         maxDate: "2099-12-31", // 最大日期
         height: 24,
-        supportDynamic: true,
+        supportDynamic: true
     },
 
     _init: function () {
@@ -119,9 +119,12 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
         });
 
         BI.createWidget({
-            type: "bi.htape",
-            cls: "bi-border bi-border-radius",
+            type: "bi.absolute",
             element: this,
+            items: [{
+                el: {
+                    type: "bi.htape",
+                    cls: "bi-border bi-border-radius bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
                     },
@@ -129,14 +132,20 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
                         el: {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button date-change-h-font",
-                    width: 24,
+                            width: o.height - 2,
                             height: o.height - 2,
                             ref: function () {
                                 self.changeIcon = this;
                             }
                         },
-                width: 24
+                        width: o.height - 2
                     }, this.combo]
+                },
+                top: 1,
+                left: 1,
+                right: 1,
+                bottom: 1
+            }]
         });
         this._checkDynamicValue(o.value);
     },
@@ -149,7 +158,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
         switch (type) {
             case BI.DynamicYearCombo.Dynamic:
                 this.changeIcon.setVisible(true);
-                this.comboWrapper.attr("items")[0].width = 24;
+                this.comboWrapper.attr("items")[0].width = this.options.height - 2,
                 this.comboWrapper.resize();
                 break;
             default:

src/widget/yearmonth/combo.yearmonth.js

@@ -123,9 +123,12 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
         });
 
         BI.createWidget({
-            type: "bi.htape",
-            cls: "bi-border bi-border-radius",
+            type: "bi.absolute",
             element: this,
+            items: [{
+                el: {
+                    type: "bi.htape",
+                    cls: "bi-border bi-border-radius bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
                     },
@@ -133,14 +136,20 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
                         el: {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button date-change-h-font",
-                    width: 24,
+                            width:  o.height - 2,
                             height: o.height - 2,
                             ref: function () {
                                 self.changeIcon = this;
                             }
                         },
-                width: 24
+                        width:  o.height - 2
                     }, this.combo]
+                },
+                top: 1,
+                left: 1,
+                right: 1,
+                bottom: 1
+            }]
         });
         this._checkDynamicValue(o.value);
     },
@@ -153,7 +162,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
         switch (type) {
             case BI.DynamicYearMonthCombo.Dynamic:
                 this.changeIcon.setVisible(true);
-                this.comboWrapper.attr("items")[0].width = 24;
+                this.comboWrapper.attr("items")[0].width = this.options.height - 2,
                 this.comboWrapper.resize();
                 break;
             default:
@@ -171,6 +180,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
                 return BI.isNotEmptyObject(v.value);
             case BI.DynamicDateCombo.Static:
                 var value = v.value || {};
+
                 return !BI.checkDateVoid(value.year, value.month, 1, o.minDate, o.maxDate)[0];
             default:
                 return true;

src/widget/yearquarter/combo.yearquarter.js

@@ -123,9 +123,12 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
         });
 
         BI.createWidget({
-            type: "bi.htape",
-            cls: "bi-border bi-border-radius",
+            type: "bi.absolute",
             element: this,
+            items: [{
+                el: {
+                    type: "bi.htape",
+                    cls: "bi-border bi-border-radius bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
                     },
@@ -133,14 +136,20 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
                         el: {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button date-change-h-font",
-                    width: 24,
+                            width: o.height - 2,
                             height: o.height - 2,
                             ref: function () {
                                 self.changeIcon = this;
                             }
                         },
-                width: 24
+                        width: o.height - 2
                     }, this.combo]
+                },
+                top: 1,
+                left: 1,
+                right: 1,
+                bottom: 1
+            }]
         });
         this._checkDynamicValue(o.value);
     },
@@ -153,7 +162,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
         switch (type) {
             case BI.DynamicYearQuarterCombo.Dynamic:
                 this.changeIcon.setVisible(true);
-                this.comboWrapper.attr("items")[0].width = 24;
+                this.comboWrapper.attr("items")[0].width = this.options.height - 2;
                 this.comboWrapper.resize();
                 break;
             default:
@@ -171,6 +180,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
                 return BI.isNotEmptyObject(v.value);
             case BI.DynamicDateCombo.Static:
                 var value = v.value || {};
+
                 return !BI.checkDateVoid(value.year, (value.quarter - 1) * 3 + 1, 1, o.minDate, o.maxDate)[0];
             default:
                 return true;