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

4 years ago · a32eabe467
39 changed files with 105 additions and 60 deletions
--- a/dist/2.0/fineui.css
+++ b/dist/2.0/fineui.css
--- a/dist/2.0/fineui.ie.min.js
+++ b/dist/2.0/fineui.ie.min.js
--- a/dist/2.0/fineui.ie.min.js.map
+++ b/dist/2.0/fineui.ie.min.js.map
--- a/dist/2.0/fineui.js
+++ b/dist/2.0/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-23 2:40:31 PM */
+/*! time: 2021-4-25 3:30:31 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -41804,7 +41804,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                return selectedValues.length > 0;
            },
            halfSelected: false,
-            iconWrapperWidth: 26
+            iconWrapperWidth: 26,
+            iconWidth: 16,
+            iconHeight: 16,
        });
    },
    _init: function () {
@ -41819,7 +41821,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                self.setSelected(self.isSelected());
            },
            selected: isSelect,
-            invisible: isHalfSelect
+            invisible: isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.half = BI.createWidget({
            type: "bi.half_icon_button",
@ -41827,7 +41831,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
            handler: function () {
                self.setSelected(true);
            },
-            invisible: isSelect || !isHalfSelect
+            invisible: isSelect || !isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.checkbox.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, self.isSelected(), self);
--- a/dist/2.0/fineui.js.map
+++ b/dist/2.0/fineui.js.map
--- a/dist/2.0/fineui.min.css
+++ b/dist/2.0/fineui.min.css
--- a/dist/2.0/fineui.min.js
+++ b/dist/2.0/fineui.min.js
--- a/dist/2.0/fineui.min.js.map
+++ b/dist/2.0/fineui.min.js.map
--- a/dist/2.0/fineui_without_normalize.css
+++ b/dist/2.0/fineui_without_normalize.css
--- a/dist/2.0/fineui_without_normalize.min.css
+++ b/dist/2.0/fineui_without_normalize.min.css
--- a/dist/core.css
+++ b/dist/core.css
--- a/dist/core.js
+++ b/dist/core.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-23 2:40:31 PM */
+/*! time: 2021-4-25 3:30:31 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -41804,7 +41804,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                return selectedValues.length > 0;
            },
            halfSelected: false,
-            iconWrapperWidth: 26
+            iconWrapperWidth: 26,
+            iconWidth: 16,
+            iconHeight: 16,
        });
    },
    _init: function () {
@ -41819,7 +41821,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                self.setSelected(self.isSelected());
            },
            selected: isSelect,
-            invisible: isHalfSelect
+            invisible: isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.half = BI.createWidget({
            type: "bi.half_icon_button",
@ -41827,7 +41831,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
            handler: function () {
                self.setSelected(true);
            },
-            invisible: isSelect || !isHalfSelect
+            invisible: isSelect || !isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.checkbox.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, self.isSelected(), self);
--- a/dist/core.js.map
+++ b/dist/core.js.map
--- a/dist/demo.css
+++ b/dist/demo.css
--- a/dist/demo.js
+++ b/dist/demo.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-23 2:40:31 PM */
+/*! time: 2021-4-25 3:30:31 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -41804,7 +41804,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                return selectedValues.length > 0;
            },
            halfSelected: false,
-            iconWrapperWidth: 26
+            iconWrapperWidth: 26,
+            iconWidth: 16,
+            iconHeight: 16,
        });
    },
    _init: function () {
@ -41819,7 +41821,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                self.setSelected(self.isSelected());
            },
            selected: isSelect,
-            invisible: isHalfSelect
+            invisible: isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.half = BI.createWidget({
            type: "bi.half_icon_button",
@ -41827,7 +41831,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
            handler: function () {
                self.setSelected(true);
            },
-            invisible: isSelect || !isHalfSelect
+            invisible: isSelect || !isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.checkbox.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, self.isSelected(), self);
--- a/dist/demo.js.map
+++ b/dist/demo.js.map
--- a/dist/fineui.css
+++ b/dist/fineui.css
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.ie.min.js.map
+++ b/dist/fineui.ie.min.js.map
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-23 2:40:31 PM */
+/*! time: 2021-4-25 3:30:31 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -41804,7 +41804,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                return selectedValues.length > 0;
            },
            halfSelected: false,
-            iconWrapperWidth: 26
+            iconWrapperWidth: 26,
+            iconWidth: 16,
+            iconHeight: 16,
        });
    },
    _init: function () {
@ -41819,7 +41821,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                self.setSelected(self.isSelected());
            },
            selected: isSelect,
-            invisible: isHalfSelect
+            invisible: isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.half = BI.createWidget({
            type: "bi.half_icon_button",
@ -41827,7 +41831,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
            handler: function () {
                self.setSelected(true);
            },
-            invisible: isSelect || !isHalfSelect
+            invisible: isSelect || !isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.checkbox.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, self.isSelected(), self);
--- a/dist/fineui.js.map
+++ b/dist/fineui.js.map
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui.min.js.map
+++ b/dist/fineui.min.js.map
--- a/dist/fineui.proxy.css
+++ b/dist/fineui.proxy.css
--- a/dist/fineui.proxy.js
+++ b/dist/fineui.proxy.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-23 2:40:31 PM */
+/*! time: 2021-4-25 3:30:31 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -39265,7 +39265,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                return selectedValues.length > 0;
            },
            halfSelected: false,
-            iconWrapperWidth: 26
+            iconWrapperWidth: 26,
+            iconWidth: 16,
+            iconHeight: 16,
        });
    },
    _init: function () {
@ -39280,7 +39282,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                self.setSelected(self.isSelected());
            },
            selected: isSelect,
-            invisible: isHalfSelect
+            invisible: isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.half = BI.createWidget({
            type: "bi.half_icon_button",
@ -39288,7 +39292,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
            handler: function () {
                self.setSelected(true);
            },
-            invisible: isSelect || !isHalfSelect
+            invisible: isSelect || !isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.checkbox.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, self.isSelected(), self);
--- a/dist/fineui.proxy.js.map
+++ b/dist/fineui.proxy.js.map
--- a/dist/fineui.proxy.min.css
+++ b/dist/fineui.proxy.min.css
--- a/dist/fineui.proxy.min.js
+++ b/dist/fineui.proxy.min.js
--- a/dist/fineui.proxy.min.js.map
+++ b/dist/fineui.proxy.min.js.map
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-23 2:40:31 PM */
+/*! time: 2021-4-25 3:30:31 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -38875,7 +38875,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                return selectedValues.length > 0;
            },
            halfSelected: false,
-            iconWrapperWidth: 26
+            iconWrapperWidth: 26,
+            iconWidth: 16,
+            iconHeight: 16,
        });
    },
    _init: function () {
@ -38890,7 +38892,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
                self.setSelected(self.isSelected());
            },
            selected: isSelect,
-            invisible: isHalfSelect
+            invisible: isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.half = BI.createWidget({
            type: "bi.half_icon_button",
@ -38898,7 +38902,9 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
            handler: function () {
                self.setSelected(true);
            },
-            invisible: isSelect || !isHalfSelect
+            invisible: isSelect || !isHalfSelect,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight
        });
        this.checkbox.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, self.isSelected(), self);
--- a/dist/fineui_without_jquery_polyfill.js.map
+++ b/dist/fineui_without_jquery_polyfill.js.map
--- a/dist/font.css
+++ b/dist/font.css
--- a/dist/lib/core/widget.d.ts
+++ b/dist/lib/core/widget.d.ts
@ -389,6 +389,10 @@ export declare class Widget extends OB {
     * 初始化前
     */
    beforeInit?(cb: Function): void;
+    /**
+     * 渲染前
+     */
+    beforeRender?(cb: Function): void;
    /**
     * 创建前
     */
--- a/dist/resource.css
+++ b/dist/resource.css
--- a/dist/utils.js
+++ b/dist/utils.js
@ -1,4 +1,4 @@
-/*! time: 2021-4-23 2:40:31 PM */
+/*! time: 2021-4-25 3:30:31 PM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20210423144238",
+  "version": "2.0.20210425153336",
  "description": "fineui",
  "main": "dist/fineui.min.js",
  "types": "dist/lib/index.d.ts",
--- a/typescript/core/widget.ts
+++ b/typescript/core/widget.ts
@ -484,6 +484,11 @@ export declare class Widget extends OB {
     */
    beforeInit?(cb: Function): void;

+    /**
+     * 渲染前
+     */
+    beforeRender?(cb: Function): void;
+
    /**
     * 创建前
     */