bkui-vue 1.0.3-beta.29 → 1.0.3-beta.30

package/lib/table/cache.d.ts

@@ -1,6 +1,14 @@
+type StackStorageFnType = {
+    [name: string]: {
+        timerId?: number;
+        fn?: () => void;
+    };
+};
 export default class BkTableCache {
-    storage: any;
+    storage: WeakMap<Object, StackStorageFnType>;
+    defKey: symbol;
     constructor();
-    queueStack(methodName: any, fn?: () => void): void;
-    clearQueueStack(methodName: any): void;
+    queueStack(methodName: any, fn?: () => void, key?: Object): void;
+    clearQueueStack(methodName: any, key?: Object): void;
 }
+export {};

package/lib/table/components/table-column.d.ts

@@ -14,7 +14,7 @@ declare const TableColumnProp: {
         default: string;
     };
     showOverflowTooltip: import("vue-types").VueTypeDef<import("../props").IOverflowTooltipProp>;
-    type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+    type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
     resizable: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -65,7 +65,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     showOverflowTooltip: import("vue-types").VueTypeDef<import("../props").IOverflowTooltipProp>;
-    type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+    type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
     resizable: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -162,7 +162,7 @@ declare const _default: import("vue").DefineComponent<{
             height?: number;
             maxHeight?: number;
         };
-        type?: "none" | "index" | "selection" | "expand";
+        type?: "index" | "selection" | "expand" | "__COL_TYPE_NONE";
         label?: import("../props").LabelFunctionString;
         width?: string | number;
         className?: import("../props").RowClassFunctionString;
@@ -199,7 +199,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     showOverflowTooltip: import("vue-types").VueTypeDef<import("../props").IOverflowTooltipProp>;
-    type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+    type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
     resizable: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {

package/lib/table/index.d.ts

@@ -1289,7 +1289,7 @@ declare const BkTable: {
             default: string;
         };
         showOverflowTooltip: import("vue-types").VueTypeDef<import("./props").IOverflowTooltipProp>;
-        type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+        type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
         resizable: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {
@@ -1386,7 +1386,7 @@ declare const BkTable: {
                 height?: number;
                 maxHeight?: number;
             };
-            type?: "none" | "index" | "selection" | "expand";
+            type?: "index" | "selection" | "expand" | "__COL_TYPE_NONE";
             label?: import("./props").LabelFunctionString;
             width?: string | number;
             className?: import("./props").RowClassFunctionString;
@@ -1419,7 +1419,7 @@ declare const BkTable: {
                 default: string;
             };
             showOverflowTooltip: import("vue-types").VueTypeDef<import("./props").IOverflowTooltipProp>;
-            type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+            type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
             resizable: import("vue-types").VueTypeValidableDef<boolean> & {
                 default: boolean;
             } & {
@@ -1472,7 +1472,7 @@ declare const BkTable: {
             default: string;
         };
         showOverflowTooltip: import("vue-types").VueTypeDef<import("./props").IOverflowTooltipProp>;
-        type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+        type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
         resizable: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {

package/lib/table/index.js

@@ -302,7 +302,7 @@ var ColumnTypeEnum;
   ColumnTypeEnum["SELECTION"] = "selection";
   ColumnTypeEnum["INDEX"] = "index";
   ColumnTypeEnum["EXPAND"] = "expand";
-  ColumnTypeEnum["NONE"] = "none";
+  ColumnTypeEnum["NONE"] = "__COL_TYPE_NONE";
 })(ColumnTypeEnum || (ColumnTypeEnum = {}));
 var TableAlignEnum;
 (function (TableAlignEnum) {
@@ -640,6 +640,7 @@ var tableProps = {
 ;// CONCATENATED MODULE: ../../packages/table/src/components/table-column.tsx
 
 
+
 /*
  * Tencent is pleased to support the open source community by making
  * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) available.
@@ -788,38 +789,51 @@ var TableColumnProp = {
         if (!tableNode) {
           return;
         }
-        var colList = tableNode.children["default"]() || [];
         var sortColumns = [];
         var index = 0;
+        var resolveChildNode = function resolveChildNode(node) {
+          var _node$type;
+          if (!node) {
+            return null;
+          }
+          if (((_node$type = node.type) === null || _node$type === void 0 ? void 0 : _node$type.name) === 'TableColumn') {
+            var _node$children;
+            var resolveProp = Object.assign({
+              index: index
+            }, _this.copyProps(node.props), {
+              field: node.props.prop || node.props.field,
+              render: (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children["default"]
+            });
+            sortColumns.push((0,external_vue_namespaceObject.unref)(resolveProp));
+            index = index + 1;
+            return null;
+          }
+          if (Array.isArray(node.children)) {
+            return node.children;
+          }
+          if ((0,external_vue_namespaceObject.isVNode)(node) && typeof_typeof(node.children) === 'object') {
+            return Object.keys(node.children).map(function (key) {
+              return node.children[key];
+            });
+          }
+          if (typeof node === 'function') {
+            return node();
+          }
+          return null;
+        };
         var reduceColumns = function reduceColumns(nodes) {
           if (!Array.isArray(nodes)) {
+            var children = resolveChildNode(nodes);
+            if (children) {
+              reduceColumns(children);
+            }
             return;
           }
-          nodes.forEach(function (node) {
-            var _node$type, _node$children2, _node$type2;
-            if (Array.isArray(node)) {
-              reduceColumns(node);
-              return;
-            }
-            var skipValidateKey0 = true;
-            if (((_node$type = node.type) === null || _node$type === void 0 ? void 0 : _node$type.name) === 'TableColumn') {
-              var _node$children;
-              skipValidateKey0 = Object.hasOwnProperty.call(node.props || {}, 'key');
-              var resolveProp = Object.assign({
-                index: index
-              }, _this.copyProps(node.props), {
-                field: node.props.prop || node.props.field,
-                render: (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children["default"]
-              });
-              sortColumns.push((0,external_vue_namespaceObject.unref)(resolveProp));
-              index = index + 1;
-            }
-            if ((_node$children2 = node.children) !== null && _node$children2 !== void 0 && _node$children2.length && skipValidateKey0 && ((_node$type2 = node.type) === null || _node$type2 === void 0 ? void 0 : _node$type2.name) !== 'Table') {
-              reduceColumns(node.children);
-            }
+          nodes === null || nodes === void 0 || nodes.forEach(function (node) {
+            return reduceColumns(node);
           });
         };
-        reduceColumns(colList);
+        reduceColumns(tableNode);
         _this.initColumns(sortColumns);
       };
       if (typeof this.bkTableCache.queueStack === 'function') {
@@ -911,21 +925,41 @@ var BkTableCache = /*#__PURE__*/function () {
   function BkTableCache() {
     _classCallCheck(this, BkTableCache);
     defineProperty_defineProperty(this, "storage", undefined);
-    this.storage = {};
+    defineProperty_defineProperty(this, "defKey", Symbol('bk-table-cache-def-key'));
+    this.storage = new WeakMap();
   }
   _createClass(BkTableCache, [{
     key: "queueStack",
     value: function queueStack(methodName) {
+      var _target$methodName;
       var fn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function () {};
-      this.storage[methodName] && clearTimeout(this.storage[methodName]);
-      this.storage[methodName] = setTimeout(function () {
-        return fn();
-      });
+      var key = arguments.length > 2 ? arguments[2] : undefined;
+      var stackKey = key !== null && key !== void 0 ? key : this.defKey;
+      if (!this.storage.has(stackKey)) {
+        this.storage.set(stackKey, {});
+      }
+      var target = this.storage.get(stackKey);
+      if ((_target$methodName = target[methodName]) !== null && _target$methodName !== void 0 && _target$methodName.timerId) {
+        var _target$methodName2;
+        clearTimeout((_target$methodName2 = target[methodName]) === null || _target$methodName2 === void 0 ? void 0 : _target$methodName2.timerId);
+      }
+      Object.assign(target, defineProperty_defineProperty({}, methodName, {
+        timerId: setTimeout(fn),
+        fn: fn
+      }));
     }
   }, {
     key: "clearQueueStack",
-    value: function clearQueueStack(methodName) {
-      this.storage[methodName] && clearTimeout(this.storage[methodName]);
+    value: function clearQueueStack(methodName, key) {
+      var stackKey = key !== null && key !== void 0 ? key : this.defKey;
+      if (this.storage.has(stackKey)) {
+        var _target$methodName3;
+        var target = this.storage.get(stackKey);
+        if ((_target$methodName3 = target[methodName]) !== null && _target$methodName3 !== void 0 && _target$methodName3.timerId) {
+          var _target$methodName4;
+          clearTimeout((_target$methodName4 = target[methodName]) === null || _target$methodName4 === void 0 ? void 0 : _target$methodName4.timerId);
+        }
+      }
     }
   }]);
   return BkTableCache;

package/lib/table/props.d.ts

@@ -17,7 +17,7 @@ export declare enum ColumnTypeEnum {
     SELECTION = "selection",
     INDEX = "index",
     EXPAND = "expand",
-    NONE = "none"
+    NONE = "__COL_TYPE_NONE"
 }
 export declare enum TableAlignEnum {
     LEFT = "left",
@@ -25,7 +25,7 @@ export declare enum TableAlignEnum {
     CENTER = "center",
     NONE = ""
 }
-export declare const columnType: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+export declare const columnType: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
 export declare const TableAlign: import("vue-types").VueTypeDef<"" | "right" | "left" | "center">;
 export declare enum FullEnum {
     FULL = "full",

package/lib/table-column/index.d.ts

@@ -13,7 +13,7 @@ declare const BkTableColumn: {
             default: string;
         };
         showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-        type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+        type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
         resizable: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {
@@ -110,7 +110,7 @@ declare const BkTableColumn: {
                 height?: number;
                 maxHeight?: number;
             };
-            type?: "none" | "index" | "selection" | "expand";
+            type?: "index" | "selection" | "expand" | "__COL_TYPE_NONE";
             label?: import("../table/props").LabelFunctionString;
             width?: string | number;
             className?: import("../table/props").RowClassFunctionString;
@@ -143,7 +143,7 @@ declare const BkTableColumn: {
                 default: string;
             };
             showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-            type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+            type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
             resizable: import("vue-types").VueTypeValidableDef<boolean> & {
                 default: boolean;
             } & {
@@ -196,7 +196,7 @@ declare const BkTableColumn: {
             default: string;
         };
         showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-        type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+        type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
         resizable: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {
@@ -260,7 +260,7 @@ declare const BkTableColumn: {
             default: string;
         };
         showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-        type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+        type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
         resizable: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {
@@ -357,7 +357,7 @@ declare const BkTableColumn: {
                 height?: number;
                 maxHeight?: number;
             };
-            type?: "none" | "index" | "selection" | "expand";
+            type?: "index" | "selection" | "expand" | "__COL_TYPE_NONE";
             label?: import("../table/props").LabelFunctionString;
             width?: string | number;
             className?: import("../table/props").RowClassFunctionString;
@@ -390,7 +390,7 @@ declare const BkTableColumn: {
                 default: string;
             };
             showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-            type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+            type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
             resizable: import("vue-types").VueTypeValidableDef<boolean> & {
                 default: boolean;
             } & {
@@ -455,7 +455,7 @@ declare const BkTableColumn: {
         default: string;
     };
     showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-    type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+    type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
     resizable: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -552,7 +552,7 @@ declare const BkTableColumn: {
             height?: number;
             maxHeight?: number;
         };
-        type?: "none" | "index" | "selection" | "expand";
+        type?: "index" | "selection" | "expand" | "__COL_TYPE_NONE";
         label?: import("../table/props").LabelFunctionString;
         width?: string | number;
         className?: import("../table/props").RowClassFunctionString;
@@ -585,7 +585,7 @@ declare const BkTableColumn: {
             default: string;
         };
         showOverflowTooltip: import("vue-types").VueTypeDef<import("../table/props").IOverflowTooltipProp>;
-        type: import("vue-types").VueTypeDef<"none" | "index" | "selection" | "expand">;
+        type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
         resizable: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
         } & {

package/lib/table-column/index.js

@@ -83,7 +83,7 @@ function _defineProperty(obj, key, value) {
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref });
+const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref });
 ;// CONCATENATED MODULE: ../../packages/table/src/const.ts
 
 /*
@@ -263,7 +263,7 @@ var ColumnTypeEnum;
   ColumnTypeEnum["SELECTION"] = "selection";
   ColumnTypeEnum["INDEX"] = "index";
   ColumnTypeEnum["EXPAND"] = "expand";
-  ColumnTypeEnum["NONE"] = "none";
+  ColumnTypeEnum["NONE"] = "__COL_TYPE_NONE";
 })(ColumnTypeEnum || (ColumnTypeEnum = {}));
 var TableAlignEnum;
 (function (TableAlignEnum) {
@@ -601,6 +601,7 @@ var tableProps = {
 ;// CONCATENATED MODULE: ../../packages/table/src/components/table-column.tsx
 
 
+
 /*
  * Tencent is pleased to support the open source community by making
  * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) available.
@@ -749,38 +750,51 @@ var TableColumnProp = {
         if (!tableNode) {
           return;
         }
-        var colList = tableNode.children["default"]() || [];
         var sortColumns = [];
         var index = 0;
+        var resolveChildNode = function resolveChildNode(node) {
+          var _node$type;
+          if (!node) {
+            return null;
+          }
+          if (((_node$type = node.type) === null || _node$type === void 0 ? void 0 : _node$type.name) === 'TableColumn') {
+            var _node$children;
+            var resolveProp = Object.assign({
+              index: index
+            }, _this.copyProps(node.props), {
+              field: node.props.prop || node.props.field,
+              render: (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children["default"]
+            });
+            sortColumns.push((0,external_vue_namespaceObject.unref)(resolveProp));
+            index = index + 1;
+            return null;
+          }
+          if (Array.isArray(node.children)) {
+            return node.children;
+          }
+          if ((0,external_vue_namespaceObject.isVNode)(node) && _typeof(node.children) === 'object') {
+            return Object.keys(node.children).map(function (key) {
+              return node.children[key];
+            });
+          }
+          if (typeof node === 'function') {
+            return node();
+          }
+          return null;
+        };
         var reduceColumns = function reduceColumns(nodes) {
           if (!Array.isArray(nodes)) {
+            var children = resolveChildNode(nodes);
+            if (children) {
+              reduceColumns(children);
+            }
             return;
           }
-          nodes.forEach(function (node) {
-            var _node$type, _node$children2, _node$type2;
-            if (Array.isArray(node)) {
-              reduceColumns(node);
-              return;
-            }
-            var skipValidateKey0 = true;
-            if (((_node$type = node.type) === null || _node$type === void 0 ? void 0 : _node$type.name) === 'TableColumn') {
-              var _node$children;
-              skipValidateKey0 = Object.hasOwnProperty.call(node.props || {}, 'key');
-              var resolveProp = Object.assign({
-                index: index
-              }, _this.copyProps(node.props), {
-                field: node.props.prop || node.props.field,
-                render: (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children["default"]
-              });
-              sortColumns.push((0,external_vue_namespaceObject.unref)(resolveProp));
-              index = index + 1;
-            }
-            if ((_node$children2 = node.children) !== null && _node$children2 !== void 0 && _node$children2.length && skipValidateKey0 && ((_node$type2 = node.type) === null || _node$type2 === void 0 ? void 0 : _node$type2.name) !== 'Table') {
-              reduceColumns(node.children);
-            }
+          nodes === null || nodes === void 0 || nodes.forEach(function (node) {
+            return reduceColumns(node);
           });
         };
-        reduceColumns(colList);
+        reduceColumns(tableNode);
         _this.initColumns(sortColumns);
       };
       if (typeof this.bkTableCache.queueStack === 'function') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "1.0.3-beta.29",
+  "version": "1.0.3-beta.30",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",