bkui-vue 1.0.3-beta.35 → 1.0.3-beta.37

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

@@ -49,6 +49,17 @@ declare const TableColumnProp: {
     } & {
         default: number;
     };
+    uniqueId: import("vue-types").VueTypeValidableDef<{
+        [key: string]: any;
+    }> & {
+        default: () => {
+            [key: string]: any;
+        };
+    } & {
+        default: () => {
+            [key: string]: any;
+        };
+    };
 };
 export type ITableColumn = Partial<ExtractPropTypes<typeof TableColumnProp>>;
 declare const _default: import("vue").DefineComponent<{
@@ -100,6 +111,17 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
+    uniqueId: import("vue-types").VueTypeValidableDef<{
+        [key: string]: any;
+    }> & {
+        default: () => {
+            [key: string]: any;
+        };
+    } & {
+        default: () => {
+            [key: string]: any;
+        };
+    };
 }, {
     isIndexPropChanged: import("vue").Ref<boolean>;
     setIsIndexChanged: (val: boolean) => void;
@@ -145,6 +167,9 @@ declare const _default: import("vue").DefineComponent<{
                 (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
             };
         };
+        uniqueId?: {
+            [key: string]: any;
+        };
         render?: import("../props").RenderFunctionString;
         sort?: string | boolean | {
             sortFn?: Function;
@@ -181,8 +206,72 @@ declare const _default: import("vue").DefineComponent<{
     };
 }, unknown, {}, {
     updateColumnDefine(unmounted?: boolean): void;
-    copyProps(props: ITableColumn): {};
+    copyProps(props: Partial<ExtractPropTypes<{
+        label: import("vue-types").VueTypeDef<import("../props").LabelFunctionString>;
+        field: import("vue-types").VueTypeDef<import("../props").LabelFunctionString>;
+        render: import("vue-types").VueTypeDef<import("../props").RenderFunctionString>;
+        width: import("vue-types").VueTypeDef<string | number>;
+        minWidth: import("vue-types").VueTypeDef<string | number> & {
+            default: string | number;
+        };
+        columnKey: import("vue-types").VueTypeValidableDef<string> & {
+            default: string;
+        } & {
+            default: string;
+        };
+        showOverflowTooltip: import("vue-types").VueTypeDef<import("../props").IOverflowTooltipProp>;
+        type: import("vue-types").VueTypeDef<"index" | "selection" | "expand" | "__COL_TYPE_NONE">;
+        resizable: import("vue-types").VueTypeValidableDef<boolean> & {
+            default: boolean;
+        } & {
+            default: boolean;
+        };
+        fixed: import("vue-types").VueTypeDef<boolean | "right" | "left"> & {
+            default: boolean | "right" | "left";
+        };
+        sort: import("vue-types").VueTypeDef<import("../props").ISortPropShape>;
+        filter: import("vue-types").VueTypeDef<import("../props").IFilterPropShape>;
+        colspan: import("vue-types").VueTypeDef<import("../props").SpanFunctionString> & {
+            default: (({ column, colIndex, row, rowIndex }: {
+                column: any;
+                colIndex: any;
+                row: any;
+                rowIndex: any;
+            }) => number) | (() => Number);
+        };
+        rowspan: import("vue-types").VueTypeDef<import("../props").SpanFunctionString> & {
+            default: (({ column, colIndex, row, rowIndex }: {
+                column: any;
+                colIndex: any;
+                row: any;
+                rowIndex: any;
+            }) => number) | (() => Number);
+        };
+        align: import("vue-types").VueTypeDef<"" | "right" | "left" | "center">;
+        className: import("vue-types").VueTypeDef<import("../props").RowClassFunctionString>;
+        prop: import("vue-types").VueTypeDef<import("../props").LabelFunctionString>;
+        index: import("vue-types").VueTypeValidableDef<number> & {
+            default: number;
+        } & {
+            default: number;
+        };
+        uniqueId: import("vue-types").VueTypeValidableDef<{
+            [key: string]: any;
+        }> & {
+            default: () => {
+                [key: string]: any;
+            };
+        } & {
+            default: () => {
+                [key: string]: any;
+            };
+        };
+    }>> | {
+        [key: string]: any;
+    }): {};
     rsolveIndexedColumn(): boolean;
+    setNodeUid(): void;
+    getNodeUid(ctx: any): any;
     updateColumnDefineByParent(): void;
     unmountColumn(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
@@ -234,6 +323,17 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
+    uniqueId: import("vue-types").VueTypeValidableDef<{
+        [key: string]: any;
+    }> & {
+        default: () => {
+            [key: string]: any;
+        };
+    } & {
+        default: () => {
+            [key: string]: any;
+        };
+    };
 }>>, {
     fixed: boolean | "right" | "left";
     resizable: boolean;
@@ -242,5 +342,8 @@ declare const _default: import("vue").DefineComponent<{
     columnKey: string;
     colspan: import("../props").SpanFunctionString;
     rowspan: import("../props").SpanFunctionString;
+    uniqueId: {
+        [key: string]: any;
+    };
 }, {}>;
 export default _default;

package/lib/table/index.d.ts

@@ -1324,6 +1324,17 @@ declare const BkTable: {
         } & {
             default: number;
         };
+        uniqueId: import("vue-types").VueTypeValidableDef<{
+            [key: string]: any;
+        }> & {
+            default: () => {
+                [key: string]: any;
+            };
+        } & {
+            default: () => {
+                [key: string]: any;
+            };
+        };
     }, {
         isIndexPropChanged: import("vue").Ref<boolean>;
         setIsIndexChanged: (val: boolean) => void;
@@ -1369,6 +1380,9 @@ declare const BkTable: {
                     (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
                 };
             };
+            uniqueId?: {
+                [key: string]: any;
+            };
             render?: import("./props").RenderFunctionString;
             sort?: string | boolean | {
                 sortFn?: Function;
@@ -1454,8 +1468,23 @@ declare const BkTable: {
             } & {
                 default: number;
             };
-        }>>): {};
+            uniqueId: import("vue-types").VueTypeValidableDef<{
+                [key: string]: any;
+            }> & {
+                default: () => {
+                    [key: string]: any;
+                };
+            } & {
+                default: () => {
+                    [key: string]: any;
+                };
+            };
+        }>> | {
+            [key: string]: any;
+        }): {};
         rsolveIndexedColumn(): boolean;
+        setNodeUid(): void;
+        getNodeUid(ctx: any): any;
         updateColumnDefineByParent(): void;
         unmountColumn(): void;
     }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
@@ -1507,6 +1536,17 @@ declare const BkTable: {
         } & {
             default: number;
         };
+        uniqueId: import("vue-types").VueTypeValidableDef<{
+            [key: string]: any;
+        }> & {
+            default: () => {
+                [key: string]: any;
+            };
+        } & {
+            default: () => {
+                [key: string]: any;
+            };
+        };
     }>>, {
         fixed: boolean | "right" | "left";
         resizable: boolean;
@@ -1515,6 +1555,9 @@ declare const BkTable: {
         columnKey: string;
         colspan: import("./props").SpanFunctionString;
         rowspan: import("./props").SpanFunctionString;
+        uniqueId: {
+            [key: string]: any;
+        };
     }, {}>;
 }>;
 export default BkTable;

package/lib/table/index.js

@@ -123,6 +123,94 @@ function defineProperty_defineProperty(obj, key, value) {
 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, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createTextVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isProxy"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isProxy, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["provide"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.provide, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch, ["watchEffect"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watchEffect });
+;// CONCATENATED MODULE: ../../node_modules/uuid/dist/esm-browser/native.js
+const randomUUID = typeof crypto !== 'undefined' && crypto.randomUUID && crypto.randomUUID.bind(crypto);
+/* harmony default export */ const esm_browser_native = ({
+  randomUUID
+});
+;// CONCATENATED MODULE: ../../node_modules/uuid/dist/esm-browser/rng.js
+// Unique ID creation requires a high quality random # generator. In the browser we therefore
+// require the crypto API and do not support built-in fallback to lower quality random number
+// generators (like Math.random()).
+let getRandomValues;
+const rnds8 = new Uint8Array(16);
+function rng() {
+  // lazy load so that environments that need to polyfill have a chance to do so
+  if (!getRandomValues) {
+    // getRandomValues needs to be invoked in a context where "this" is a Crypto implementation.
+    getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto);
+
+    if (!getRandomValues) {
+      throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
+    }
+  }
+
+  return getRandomValues(rnds8);
+}
+;// CONCATENATED MODULE: ../../node_modules/uuid/dist/esm-browser/stringify.js
+
+/**
+ * Convert array of 16 byte values to UUID string format of the form:
+ * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+ */
+
+const byteToHex = [];
+
+for (let i = 0; i < 256; ++i) {
+  byteToHex.push((i + 0x100).toString(16).slice(1));
+}
+
+function unsafeStringify(arr, offset = 0) {
+  // Note: Be careful editing this code!  It's been tuned for performance
+  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
+  return byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]];
+}
+
+function stringify(arr, offset = 0) {
+  const uuid = unsafeStringify(arr, offset); // Consistency check for valid UUID.  If this throws, it's likely due to one
+  // of the following:
+  // - One or more input array values don't map to a hex octet (leading to
+  // "undefined" in the uuid)
+  // - Invalid input values for the RFC `version` or `variant` fields
+
+  if (!validate(uuid)) {
+    throw TypeError('Stringified UUID is invalid');
+  }
+
+  return uuid;
+}
+
+/* harmony default export */ const esm_browser_stringify = ((/* unused pure expression or super */ null && (stringify)));
+;// CONCATENATED MODULE: ../../node_modules/uuid/dist/esm-browser/v4.js
+
+
+
+
+function v4(options, buf, offset) {
+  if (esm_browser_native.randomUUID && !buf && !options) {
+    return esm_browser_native.randomUUID();
+  }
+
+  options = options || {};
+  const rnds = options.random || (options.rng || rng)(); // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+
+  rnds[6] = rnds[6] & 0x0f | 0x40;
+  rnds[8] = rnds[8] & 0x3f | 0x80; // Copy bytes to buffer, if provided
+
+  if (buf) {
+    offset = offset || 0;
+
+    for (let i = 0; i < 16; ++i) {
+      buf[offset + i] = rnds[i];
+    }
+
+    return buf;
+  }
+
+  return unsafeStringify(rnds);
+}
+
+/* harmony default export */ const esm_browser_v4 = (v4);
 ;// CONCATENATED MODULE: ../../packages/table/src/const.ts
 
 /*
@@ -670,6 +758,7 @@ var tableProps = {
 
 
 
+
 var TableColumnProp = {
   label: LabelFunctionStringType,
   field: LabelFunctionStringType,
@@ -688,7 +777,10 @@ var TableColumnProp = {
   align: TableAlign,
   className: RowClassFunctionStringType,
   prop: LabelFunctionStringType,
-  index: shared_namespaceObject.PropTypes.number.def(undefined)
+  index: shared_namespaceObject.PropTypes.number.def(undefined),
+  uniqueId: shared_namespaceObject.PropTypes.object.def({
+    val: ''
+  })
 };
 /* harmony default export */ const table_column = ((0,external_vue_namespaceObject.defineComponent)({
   name: 'TableColumn',
@@ -729,6 +821,7 @@ var TableColumnProp = {
     this.updateColumnDefine(true);
   },
   mounted: function mounted() {
+    this.setNodeUid();
     this.updateColumnDefine();
   },
   updated: function updated() {
@@ -757,15 +850,35 @@ var TableColumnProp = {
     rsolveIndexedColumn: function rsolveIndexedColumn() {
       // 如果是设置了Index，则先添加Index列，不做自动递归读取Column
       if (/\d+\.?\d*/.test("".concat(this.$props.index))) {
-        var resolveProp = Object.assign({}, this.copyProps(this.$props), {
-          field: this.$props.prop || this.$props.field,
-          render: this.$slots["default"]
+        var _props$render;
+        var props = this.$.vnode.props;
+        var resolveProp = Object.assign({}, this.copyProps(props), {
+          field: props.prop || props.field,
+          render: (_props$render = props.render) !== null && _props$render !== void 0 ? _props$render : this.$slots["default"],
+          uniqueId: this.getNodeUid(this.$.ctx)
         });
         this.initColumns(resolveProp);
         return false;
       }
       return true;
     },
+    setNodeUid: function setNodeUid() {
+      var ctx = this.$.ctx;
+      if (ctx.uniqueId && !ctx.uniqueId.val) {
+        ctx.uniqueId.val = esm_browser_v4();
+      }
+      if (!ctx.uniqueId) {
+        Object.assign(ctx, {
+          uniqueId: {
+            val: esm_browser_v4()
+          }
+        });
+      }
+    },
+    getNodeUid: function getNodeUid(ctx) {
+      var _ctx$uniqueId;
+      return (_ctx$uniqueId = ctx.uniqueId) === null || _ctx$uniqueId === void 0 ? void 0 : _ctx$uniqueId.val;
+    },
     updateColumnDefineByParent: function updateColumnDefineByParent() {
       var _this = this;
       if (!this.rsolveIndexedColumn()) {
@@ -773,7 +886,7 @@ var TableColumnProp = {
       }
       var fn = function fn() {
         // @ts-ignore
-        var selfVnode = _this._;
+        var selfVnode = _this.$;
         var getTableNode = function getTableNode(root) {
           var _parentVnode$type;
           if (root === document.body || !root) {
@@ -785,6 +898,9 @@ var TableColumnProp = {
           }
           return getTableNode(parentVnode);
         };
+        var getNodeUid = function getNodeUid(node) {
+          return _this.getNodeUid(node.ctx);
+        };
         var tableNode = getTableNode(selfVnode);
         if (!tableNode) {
           return;
@@ -797,12 +913,13 @@ var TableColumnProp = {
             return null;
           }
           if (((_node$type = node.type) === null || _node$type === void 0 ? void 0 : _node$type.name) === 'TableColumn') {
-            var _node$children;
+            var _node$props$render, _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"]
+              render: (_node$props$render = node.props.render) !== null && _node$props$render !== void 0 ? _node$props$render : (_node$children = node.children) === null || _node$children === void 0 ? void 0 : _node$children["default"],
+              uniqueId: getNodeUid(node.ctx)
             });
             sortColumns.push((0,external_vue_namespaceObject.unref)(resolveProp));
             index = index + 1;
@@ -841,9 +958,12 @@ var TableColumnProp = {
       }
     },
     unmountColumn: function unmountColumn() {
+      var _props$render2;
+      var props = this.$.vnode.props;
       var resolveProp = Object.assign({}, this.copyProps(this.$props), {
-        field: this.$props.prop || this.$props.field,
-        render: this.$slots["default"]
+        field: props.prop || props.field,
+        render: (_props$render2 = props.render) !== null && _props$render2 !== void 0 ? _props$render2 : this.$slots["default"],
+        uniqueId: this.getNodeUid(this.$.ctx)
       });
       this.initColumns(resolveProp, true);
     }
@@ -2461,94 +2581,6 @@ var index = (function () {
 
 /* harmony default export */ const ResizeObserver_es = (index);
 
-;// CONCATENATED MODULE: ../../node_modules/uuid/dist/esm-browser/native.js
-const randomUUID = typeof crypto !== 'undefined' && crypto.randomUUID && crypto.randomUUID.bind(crypto);
-/* harmony default export */ const esm_browser_native = ({
-  randomUUID
-});
-;// CONCATENATED MODULE: ../../node_modules/uuid/dist/esm-browser/rng.js
-// Unique ID creation requires a high quality random # generator. In the browser we therefore
-// require the crypto API and do not support built-in fallback to lower quality random number
-// generators (like Math.random()).
-let getRandomValues;
-const rnds8 = new Uint8Array(16);
-function rng() {
-  // lazy load so that environments that need to polyfill have a chance to do so
-  if (!getRandomValues) {
-    // getRandomValues needs to be invoked in a context where "this" is a Crypto implementation.
-    getRandomValues = typeof crypto !== 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto);
-
-    if (!getRandomValues) {
-      throw new Error('crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported');
-    }
-  }
-
-  return getRandomValues(rnds8);
-}
-;// CONCATENATED MODULE: ../../node_modules/uuid/dist/esm-browser/stringify.js
-
-/**
- * Convert array of 16 byte values to UUID string format of the form:
- * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
- */
-
-const byteToHex = [];
-
-for (let i = 0; i < 256; ++i) {
-  byteToHex.push((i + 0x100).toString(16).slice(1));
-}
-
-function unsafeStringify(arr, offset = 0) {
-  // Note: Be careful editing this code!  It's been tuned for performance
-  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
-  return byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]];
-}
-
-function stringify(arr, offset = 0) {
-  const uuid = unsafeStringify(arr, offset); // Consistency check for valid UUID.  If this throws, it's likely due to one
-  // of the following:
-  // - One or more input array values don't map to a hex octet (leading to
-  // "undefined" in the uuid)
-  // - Invalid input values for the RFC `version` or `variant` fields
-
-  if (!validate(uuid)) {
-    throw TypeError('Stringified UUID is invalid');
-  }
-
-  return uuid;
-}
-
-/* harmony default export */ const esm_browser_stringify = ((/* unused pure expression or super */ null && (stringify)));
-;// CONCATENATED MODULE: ../../node_modules/uuid/dist/esm-browser/v4.js
-
-
-
-
-function v4(options, buf, offset) {
-  if (esm_browser_native.randomUUID && !buf && !options) {
-    return esm_browser_native.randomUUID();
-  }
-
-  options = options || {};
-  const rnds = options.random || (options.rng || rng)(); // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
-
-  rnds[6] = rnds[6] & 0x0f | 0x40;
-  rnds[8] = rnds[8] & 0x3f | 0x80; // Copy bytes to buffer, if provided
-
-  if (buf) {
-    offset = offset || 0;
-
-    for (let i = 0; i < 16; ++i) {
-      buf[offset + i] = rnds[i];
-    }
-
-    return buf;
-  }
-
-  return unsafeStringify(rnds);
-}
-
-/* harmony default export */ const esm_browser_v4 = (v4);
 ;// CONCATENATED MODULE: ../../packages/table/src/utils.tsx
 
 
@@ -4135,7 +4167,7 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
     if (!remove) {
       resolveColumns.forEach(function (col) {
         var index = targetColumns.findIndex(function (tc) {
-          return tc.label === col.label && tc.field === col.field;
+          return tc.label === col.label && tc.field === col.field && tc.uniqueId === col.uniqueId;
         });
         if (index >= 0) {
           Object.assign(targetColumns[index], col);
@@ -4149,7 +4181,7 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
     } else {
       resolveColumns.forEach(function (col) {
         var matchColIndex = targetColumns.findIndex(function (c) {
-          return c.label === col.label && c.field === col.field;
+          return c.label === col.label && c.field === col.field && c.uniqueId === col.uniqueId;
         });
         if (matchColIndex >= 0) {
           targetColumns.splice(matchColIndex, 1);