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

package.json

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

src/base/grid/grid.js

@@ -130,9 +130,9 @@ BI.GridView = BI.inherit(BI.Widget, {
             var visibleColumnIndices = this._columnSizeAndPositionManager.getVisibleCellRange(width, scrollLeft);
             var visibleRowIndices = this._rowSizeAndPositionManager.getVisibleCellRange(height, scrollTop);
 
-            if (BI.isEmpty(visibleColumnIndices) || BI.isEmpty(visibleRowIndices)) {
+            var renderedCells = [], renderedKeys = {}, renderedWidgets = {};
-                return;
+            // 没有可见的单元格就干掉所有渲染过的
-            }
+            if (!BI.isEmpty(visibleColumnIndices) && !BI.isEmpty(visibleRowIndices)) {
                 var horizontalOffsetAdjustment = this._columnSizeAndPositionManager.getOffsetAdjustment(width, scrollLeft);
                 var verticalOffsetAdjustment = this._rowSizeAndPositionManager.getOffsetAdjustment(height, scrollTop);
 
@@ -164,7 +164,6 @@ BI.GridView = BI.inherit(BI.Widget, {
                     return;
                 }
 
-            var renderedCells = [], renderedKeys = {}, renderedWidgets = {};
                 var minX = this._getMaxScrollLeft(), minY = this._getMaxScrollTop(), maxX = 0, maxY = 0;
                 var count = 0;
                 for (var rowIndex = rowStartIndex; rowIndex <= rowStopIndex; rowIndex++) {
@@ -225,6 +224,7 @@ BI.GridView = BI.inherit(BI.Widget, {
                         count++;
                     }
                 }
+            }
             // 已存在的， 需要添加的和需要删除的
             var existSet = {}, addSet = {}, deleteArray = [];
             BI.each(renderedKeys, function (i, key) {

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

@@ -11,9 +11,6 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, {
         var conf = BI.BlankIconIconTextItem.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-blank-icon-text-item",
-            logic: {
-                dynamic: false
-            },
             iconCls1: "",
             iconCls2: "",
             blankWidth: 0,

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

@@ -12,9 +12,6 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
         var conf = BI.BlankIconTextIconItem.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-blank-icon-text-icon-item",
-            logic: {
-                dynamic: false
-            },
             iconCls1: "",
             iconCls2: "",
             blankWidth: 0,

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

@@ -11,9 +11,6 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
         var conf = BI.BlankIconTextItem.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-blank-icon-text-item",
-            logic: {
-                dynamic: false
-            },
             blankWidth: 0,
             iconHeight: null,
             iconWidth: null,

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

@@ -12,9 +12,6 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
         var conf = BI.IconTextIconItem.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-icon-text-icon-item",
-            logic: {
-                dynamic: false
-            },
             iconCls1: "",
             iconCls2: "",
             iconHeight: null,

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

@@ -12,9 +12,6 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-icon-text-item",
             direction: BI.Direction.Left,
-            logic: {
-                dynamic: false
-            },
             iconWrapperWidth: null,
             iconHeight: null,
             iconWidth: null,

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

@@ -12,9 +12,6 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
         var conf = BI.TextIconItem.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-text-icon-item",
-            logic: {
-                dynamic: false
-            },
             iconWrapperWidth: null,
             iconHeight: null,
             iconWidth: null,

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

@@ -10,9 +10,6 @@ BI.IconTextIconNode = BI.inherit(BI.NodeButton, {
         var conf = BI.IconTextIconNode.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-icon-text-icon-node",
-            logic: {
-                dynamic: false
-            },
             iconCls1: "close-ha-font",
             iconCls2: "close-ha-font",
             iconHeight: null,

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

@@ -10,9 +10,6 @@ BI.IconTextNode = BI.inherit(BI.NodeButton, {
         var conf = BI.IconTextNode.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-icon-text-node",
-            logic: {
-                dynamic: false
-            },
             cls: "close-ha-font",
             iconHeight: null,
             iconWidth: null,

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

@@ -9,9 +9,6 @@ BI.TextIconNode = BI.inherit(BI.NodeButton, {
         var conf = BI.TextIconNode.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-text-icon-node",
-            logic: {
-                dynamic: false
-            },
             cls: "close-ha-font",
             iconHeight: null,
             iconWidth: null,

src/case/button/item.multiselect.js

@@ -11,9 +11,6 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
                 tabIndex: 1
             },
             height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
-            logic: {
-                dynamic: false
-            },
             iconWrapperWidth: 26,
         });
     },

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

@@ -10,9 +10,6 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
             attributes: {
                 tabIndex: 1
             },
-            logic: {
-                dynamic: false
-            },
             height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
             iconWrapperWidth: 16,
             textHgap: 10,

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

@@ -6,9 +6,6 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
         var conf = BI.ArrowNode.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-arrow-group-node bi-list-item",
-            logic: {
-                dynamic: false
-            },
             id: "",
             pId: "",
             open: false,

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

@@ -9,9 +9,6 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, {
         var conf = BI.PlusGroupNode.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
             baseCls: (conf.baseCls || "") + " bi-plus-group-node bi-list-item",
-            logic: {
-                dynamic: false
-            },
             id: "",
             pId: "",
             open: false,

src/case/button/switch.js

@@ -14,9 +14,6 @@ BI.Switch = BI.inherit(BI.BasicButton, {
         },
         height: 20,
         width: 44,
-        logic: {
-            dynamic: false
-        },
         showTip: false
     },
 

typescript/base/single/button/listitem/icontexticonitem.ts

@@ -5,9 +5,6 @@ export declare class IconTextIconItem extends BasicButton {
     static EVENT_CHANGE: string;
 
     props: {
-        logic?: {
-            dynamic: boolean;
-        };
         iconCls1?: string;
         iconCls2?: string;
         iconHeight?: number;

typescript/base/single/button/listitem/icontextitem.ts

@@ -6,9 +6,6 @@ export declare class IconTextItem extends BasicButton {
 
     props: {
         direction?: string;
-        logic?: {
-            dynamic: boolean;
-        };
         iconWrapperWidth?: number;
         iconCls?: string;
         iconHeight?: number;

typescript/case/button/item.multiselect.ts

@@ -6,9 +6,6 @@ export declare class MultiSelectItem extends BasicButton {
     static EVENT_CHANGE: string;
 
     props: {
-        logic: {
-            dynamic: boolean;
-        }
         text: string;
         iconWrapperWidth: number;
         textLgap: number;

typescript/case/button/item.singleselect.radio.ts

@@ -6,9 +6,6 @@ export declare class SingleSelectRadioItem extends BasicButton {
 
     props: {
         iconWrapperWidth: number;
-        logic: {
-            dynamic: boolean;
-        };
         textHgap: number;
         textLgap: number;
         textRgap: number;