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

3 years ago · 6e4160af54
43 changed files with 189 additions and 106 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-6-8 2:20:16 PM */
+/*! time: 2021-6-10 11:00:18 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -40963,7 +40963,8 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
            curr: 1, // 初始化当前页， pages为数字时可用，
            count: 1, // 总行数
            rowInfoObject: null,
-            showRowCount: true
+            showRowCount: true,
+            showRowInfo: true,
        });
    },
    _init: function () {
@ -41058,8 +41059,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        });
    },

-    alwaysShowPager: true,
-
    _getPagerIconCls: function () {
        var o = this.options;
        switch (o.pagerDirection) {
@ -41122,6 +41121,11 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        this.setPagerVisible(v > 1);
    },

+    setShowRowInfo: function (b) {
+        this.options.showRowInfo = b;
+        this.rowCountObject.setVisible(b);
+    },
+
    setValue: function (v) {
        this.pager.setValue(v);
    },
@ -41155,16 +41159,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        return this.pager.hasNext();
    },

+    isShowPager: function () {
+        return this.options.showRowInfo || this.options.pages > 1;
+    },
+
    setPagerVisible: function (b) {
        this.editor.setVisible(b);
        this.allPages.setVisible(b);
        this.pager.setVisible(b);
    },

-    setRowCountVisible: function (b) {
-        this.rowCountObject.setVisible(b);
-    },
-
    populate: function () {
        this.pager.populate();
        this.setPagerVisible(this.options.pages > 1);
@ -55513,7 +55517,10 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        // arguments.length为0时对arguments[0]赋值后不同环境对其length的取值不同(nashorn)
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -55696,7 +55703,9 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -62292,7 +62301,9 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

--- 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-6-8 2:20:16 PM */
+/*! time: 2021-6-10 11:00:18 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -40963,7 +40963,8 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
            curr: 1, // 初始化当前页， pages为数字时可用，
            count: 1, // 总行数
            rowInfoObject: null,
-            showRowCount: true
+            showRowCount: true,
+            showRowInfo: true,
        });
    },
    _init: function () {
@ -41058,8 +41059,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        });
    },

-    alwaysShowPager: true,
-
    _getPagerIconCls: function () {
        var o = this.options;
        switch (o.pagerDirection) {
@ -41122,6 +41121,11 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        this.setPagerVisible(v > 1);
    },

+    setShowRowInfo: function (b) {
+        this.options.showRowInfo = b;
+        this.rowCountObject.setVisible(b);
+    },
+
    setValue: function (v) {
        this.pager.setValue(v);
    },
@ -41155,16 +41159,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        return this.pager.hasNext();
    },

+    isShowPager: function () {
+        return this.options.showRowInfo || this.options.pages > 1;
+    },
+
    setPagerVisible: function (b) {
        this.editor.setVisible(b);
        this.allPages.setVisible(b);
        this.pager.setVisible(b);
    },

-    setRowCountVisible: function (b) {
-        this.rowCountObject.setVisible(b);
-    },
-
    populate: function () {
        this.pager.populate();
        this.setPagerVisible(this.options.pages > 1);
@ -55513,7 +55517,10 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        // arguments.length为0时对arguments[0]赋值后不同环境对其length的取值不同(nashorn)
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -55696,7 +55703,9 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -62292,7 +62301,9 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

--- 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-6-8 2:20:16 PM */
+/*! time: 2021-6-10 11:00:18 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -40963,7 +40963,8 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
            curr: 1, // 初始化当前页， pages为数字时可用，
            count: 1, // 总行数
            rowInfoObject: null,
-            showRowCount: true
+            showRowCount: true,
+            showRowInfo: true,
        });
    },
    _init: function () {
@ -41058,8 +41059,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        });
    },

-    alwaysShowPager: true,
-
    _getPagerIconCls: function () {
        var o = this.options;
        switch (o.pagerDirection) {
@ -41122,6 +41121,11 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        this.setPagerVisible(v > 1);
    },

+    setShowRowInfo: function (b) {
+        this.options.showRowInfo = b;
+        this.rowCountObject.setVisible(b);
+    },
+
    setValue: function (v) {
        this.pager.setValue(v);
    },
@ -41155,16 +41159,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        return this.pager.hasNext();
    },

+    isShowPager: function () {
+        return this.options.showRowInfo || this.options.pages > 1;
+    },
+
    setPagerVisible: function (b) {
        this.editor.setVisible(b);
        this.allPages.setVisible(b);
        this.pager.setVisible(b);
    },

-    setRowCountVisible: function (b) {
-        this.rowCountObject.setVisible(b);
-    },
-
    populate: function () {
        this.pager.populate();
        this.setPagerVisible(this.options.pages > 1);
@ -55513,7 +55517,10 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        // arguments.length为0时对arguments[0]赋值后不同环境对其length的取值不同(nashorn)
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -55696,7 +55703,9 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -62292,7 +62301,9 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

--- 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-6-8 2:20:16 PM */
+/*! time: 2021-6-10 11:00:18 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -40963,7 +40963,8 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
            curr: 1, // 初始化当前页， pages为数字时可用，
            count: 1, // 总行数
            rowInfoObject: null,
-            showRowCount: true
+            showRowCount: true,
+            showRowInfo: true,
        });
    },
    _init: function () {
@ -41058,8 +41059,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        });
    },

-    alwaysShowPager: true,
-
    _getPagerIconCls: function () {
        var o = this.options;
        switch (o.pagerDirection) {
@ -41122,6 +41121,11 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        this.setPagerVisible(v > 1);
    },

+    setShowRowInfo: function (b) {
+        this.options.showRowInfo = b;
+        this.rowCountObject.setVisible(b);
+    },
+
    setValue: function (v) {
        this.pager.setValue(v);
    },
@ -41155,16 +41159,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        return this.pager.hasNext();
    },

+    isShowPager: function () {
+        return this.options.showRowInfo || this.options.pages > 1;
+    },
+
    setPagerVisible: function (b) {
        this.editor.setVisible(b);
        this.allPages.setVisible(b);
        this.pager.setVisible(b);
    },

-    setRowCountVisible: function (b) {
-        this.rowCountObject.setVisible(b);
-    },
-
    populate: function () {
        this.pager.populate();
        this.setPagerVisible(this.options.pages > 1);
@ -55513,7 +55517,10 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        // arguments.length为0时对arguments[0]赋值后不同环境对其length的取值不同(nashorn)
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -55696,7 +55703,9 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -62292,7 +62301,9 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

--- 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-6-8 2:20:16 PM */
+/*! time: 2021-6-10 11:00:18 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -38424,7 +38424,8 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
            curr: 1, // 初始化当前页， pages为数字时可用，
            count: 1, // 总行数
            rowInfoObject: null,
-            showRowCount: true
+            showRowCount: true,
+            showRowInfo: true,
        });
    },
    _init: function () {
@ -38519,8 +38520,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        });
    },

-    alwaysShowPager: true,
-
    _getPagerIconCls: function () {
        var o = this.options;
        switch (o.pagerDirection) {
@ -38583,6 +38582,11 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        this.setPagerVisible(v > 1);
    },

+    setShowRowInfo: function (b) {
+        this.options.showRowInfo = b;
+        this.rowCountObject.setVisible(b);
+    },
+
    setValue: function (v) {
        this.pager.setValue(v);
    },
@ -38616,16 +38620,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        return this.pager.hasNext();
    },

+    isShowPager: function () {
+        return this.options.showRowInfo || this.options.pages > 1;
+    },
+
    setPagerVisible: function (b) {
        this.editor.setVisible(b);
        this.allPages.setVisible(b);
        this.pager.setVisible(b);
    },

-    setRowCountVisible: function (b) {
-        this.rowCountObject.setVisible(b);
-    },
-
    populate: function () {
        this.pager.populate();
        this.setPagerVisible(this.options.pages > 1);
@ -52974,7 +52978,10 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        // arguments.length为0时对arguments[0]赋值后不同环境对其length的取值不同(nashorn)
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -53157,7 +53164,9 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -59753,7 +59762,9 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

--- 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-6-8 2:20:16 PM */
+/*! time: 2021-6-10 11:00:18 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -38034,7 +38034,8 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
            curr: 1, // 初始化当前页， pages为数字时可用，
            count: 1, // 总行数
            rowInfoObject: null,
-            showRowCount: true
+            showRowCount: true,
+            showRowInfo: true,
        });
    },
    _init: function () {
@ -38129,8 +38130,6 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        });
    },

-    alwaysShowPager: true,
-
    _getPagerIconCls: function () {
        var o = this.options;
        switch (o.pagerDirection) {
@ -38193,6 +38192,11 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        this.setPagerVisible(v > 1);
    },

+    setShowRowInfo: function (b) {
+        this.options.showRowInfo = b;
+        this.rowCountObject.setVisible(b);
+    },
+
    setValue: function (v) {
        this.pager.setValue(v);
    },
@ -38226,16 +38230,16 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
        return this.pager.hasNext();
    },

+    isShowPager: function () {
+        return this.options.showRowInfo || this.options.pages > 1;
+    },
+
    setPagerVisible: function (b) {
        this.editor.setVisible(b);
        this.allPages.setVisible(b);
        this.pager.setVisible(b);
    },

-    setRowCountVisible: function (b) {
-        this.rowCountObject.setVisible(b);
-    },
-
    populate: function () {
        this.pager.populate();
        this.setPagerVisible(this.options.pages > 1);
@ -52584,7 +52588,10 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        // arguments.length为0时对arguments[0]赋值后不同环境对其length的取值不同(nashorn)
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -52767,7 +52774,9 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

@ -59363,7 +59372,9 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

--- 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/base/single/label/icon.label.d.ts
+++ b/dist/lib/base/single/label/icon.label.d.ts
@ -1,4 +1,8 @@
 import { Single } from '../single';
 export declare class IconLabel extends Single {
    static xtype: string;
+    props: {
+        iconWidth: number;
+        iconHeight: number;
+    } & Single['props'];
 }
--- a/dist/lib/case/pager/pager.all.count.d.ts
+++ b/dist/lib/case/pager/pager.all.count.d.ts
@ -11,6 +11,7 @@ export declare class AllCountPager extends Widget {
    hasPrev(): boolean;
    hasNext(): boolean;
    setPagerVisible(v: boolean): void;
-    setRowCountVisible(v: boolean): void;
+    setShowRowInfo(v: boolean): void;
+    isShowPager(): boolean;
    populate(): void;
 }
--- a/dist/resource.css
+++ b/dist/resource.css
--- a/dist/utils.js
+++ b/dist/utils.js
@ -1,4 +1,4 @@
-/*! time: 2021-6-8 2:20:16 PM */
+/*! time: 2021-6-10 11:00:18 AM */
 /******/ (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.20210608142119",
+  "version": "2.0.20210610110230",
  "description": "fineui",
  "main": "dist/fineui.min.js",
  "types": "dist/lib/index.d.ts",
--- a/src/widget/multiselect/multiselect.loader.js
+++ b/src/widget/multiselect/multiselect.loader.js
@ -172,7 +172,10 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        // arguments.length为0时对arguments[0]赋值后不同环境对其length的取值不同(nashorn)
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

--- a/src/widget/multiselect/multiselect.loader.nobar.js
+++ b/src/widget/multiselect/multiselect.loader.nobar.js
@ -161,7 +161,9 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

--- a/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js
+++ b/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js
@ -158,7 +158,9 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
    },

    populate: function (items) {
-        arguments[0] = this._createItems(items);
+        if (BI.isNotNull(items)) {
+            arguments[0] = this._createItems(items);
+        }
        this.button_group.populate.apply(this.button_group, arguments);
    },

--- a/typescript/base/single/label/icon.label.ts
+++ b/typescript/base/single/label/icon.label.ts
@ -2,4 +2,9 @@ import { Single } from '../single';

 export declare class IconLabel extends Single {
    static xtype: string;
+
+    props: {
+        iconWidth: number;
+        iconHeight: number;
+    } & Single['props'];
 }