bkui-vue 1.0.3-beta.41 → 1.0.3-beta.43

package/lib/table/index.js

@@ -855,7 +855,7 @@ var TableColumnProp = {
         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)
+          uniqueId: this.getNodeCtxUid(this.$.ctx)
         });
         this.initColumns(resolveProp);
         return false;
@@ -864,6 +864,9 @@ var TableColumnProp = {
     },
     setNodeUid: function setNodeUid() {
       var ctx = this.$.ctx;
+      if (!ctx) {
+        return;
+      }
       if (ctx.uniqueId && !ctx.uniqueId.val) {
         ctx.uniqueId.val = esm_browser_v4();
       }
@@ -875,9 +878,9 @@ var TableColumnProp = {
         });
       }
     },
-    getNodeUid: function getNodeUid(ctx) {
+    getNodeCtxUid: function getNodeCtxUid(ctx) {
       var _ctx$uniqueId;
-      return (_ctx$uniqueId = ctx.uniqueId) === null || _ctx$uniqueId === void 0 ? void 0 : _ctx$uniqueId.val;
+      return ctx === null || ctx === void 0 || (_ctx$uniqueId = ctx.uniqueId) === null || _ctx$uniqueId === void 0 ? void 0 : _ctx$uniqueId.val;
     },
     updateColumnDefineByParent: function updateColumnDefineByParent() {
       var _this = this;
@@ -899,7 +902,7 @@ var TableColumnProp = {
           return getTableNode(parentVnode);
         };
         var getNodeUid = function getNodeUid(node) {
-          return _this.getNodeUid(node.ctx);
+          return _this.getNodeCtxUid(node.ctx);
         };
         var tableNode = getTableNode(selfVnode);
         if (!tableNode) {
@@ -919,7 +922,7 @@ var TableColumnProp = {
             }, _this.copyProps(node.props), {
               field: node.props.prop || node.props.field,
               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)
+              uniqueId: getNodeUid(node)
             });
             sortColumns.push((0,external_vue_namespaceObject.unref)(resolveProp));
             index = index + 1;
@@ -963,7 +966,7 @@ var TableColumnProp = {
       var resolveProp = Object.assign({}, this.copyProps(this.$props), {
         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)
+        uniqueId: this.getNodeCtxUid(this.$.ctx)
       });
       this.initColumns(resolveProp, true);
     }
@@ -2881,7 +2884,7 @@ var getRowKeyNull = function getRowKeyNull(item, props, index) {
     if (props.rowKey === TABLE_ROW_ATTRIBUTE.ROW_INDEX) {
       return "__ROW_INDEX_".concat(index);
     }
-    return (0,get_namespaceObject["default"])(item, props.rowKey);
+    return props.rowKey;
   }
   if (typeof props.rowKey === 'function') {
     return Reflect.apply(props.rowKey, _this, [item]);
@@ -3055,7 +3058,7 @@ var isRowSelectEnable = function isRowSelectEnable(props, _ref3) {
 var getRowId = function getRowId(row, defVal, props) {
   var key = getRowKey(row, props, defVal);
   if (key !== undefined && row[key] !== undefined) {
-    return row[key];
+    return (0,get_namespaceObject["default"])(row, key);
   }
   return defVal;
 };
@@ -6404,7 +6407,8 @@ function use_render_isSlot(s) {
         return [(0,external_vue_namespaceObject.createVNode)("tr", (0,external_vue_namespaceObject.mergeProps)({
           "style": rowStyle,
           "class": rowClass,
-          "key": getRowKeyNull(row, props, rowIndex),
+          "data-row-id": rowId,
+          "key": rowId,
           "data-row-index": rowIndex,
           "onClick": function onClick(e) {
             return handleRowClick(e, row, rowIndex, rows);

package/lib/table/utils.d.ts

@@ -97,7 +97,7 @@ export declare const getRowValue: (row: any, key: string) => any;
 export declare const formatPropAsArray: (prop: string | object | (() => any), args: any[]) => any;
 export declare const isRenderScrollBottomLoading: (props: TablePropTypes) => boolean;
 export declare const getRowKey: (item: any, props: TablePropTypes, index: number) => any;
-export declare const getRowKeyNull: (item: any, props: TablePropTypes, index: number) => any;
+export declare const getRowKeyNull: (item: any, props: TablePropTypes, index: number) => unknown;
 export declare const hasRootScrollY: (root: any, querySelector: string, offsetHeight?: number) => boolean;
 export declare const getColumnClass: (column: Column, colIndex?: number, uuid?: string) => {
     column_fixed: boolean;

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

@@ -208,7 +208,7 @@ declare const BkTableColumn: {
         }): {};
         rsolveIndexedColumn(): boolean;
         setNodeUid(): void;
-        getNodeUid(ctx: any): any;
+        getNodeCtxUid(ctx: any): any;
         updateColumnDefineByParent(): void;
         unmountColumn(): void;
     }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
@@ -498,7 +498,7 @@ declare const BkTableColumn: {
         }): {};
         rsolveIndexedColumn(): boolean;
         setNodeUid(): void;
-        getNodeUid(ctx: any): any;
+        getNodeCtxUid(ctx: any): any;
         updateColumnDefineByParent(): void;
         unmountColumn(): void;
     }, {
@@ -725,7 +725,7 @@ declare const BkTableColumn: {
     }): {};
     rsolveIndexedColumn(): boolean;
     setNodeUid(): void;
-    getNodeUid(ctx: any): any;
+    getNodeCtxUid(ctx: any): any;
     updateColumnDefineByParent(): void;
     unmountColumn(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {

package/lib/table-column/index.js

@@ -816,7 +816,7 @@ var TableColumnProp = {
         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)
+          uniqueId: this.getNodeCtxUid(this.$.ctx)
         });
         this.initColumns(resolveProp);
         return false;
@@ -825,6 +825,9 @@ var TableColumnProp = {
     },
     setNodeUid: function setNodeUid() {
       var ctx = this.$.ctx;
+      if (!ctx) {
+        return;
+      }
       if (ctx.uniqueId && !ctx.uniqueId.val) {
         ctx.uniqueId.val = esm_browser_v4();
       }
@@ -836,9 +839,9 @@ var TableColumnProp = {
         });
       }
     },
-    getNodeUid: function getNodeUid(ctx) {
+    getNodeCtxUid: function getNodeCtxUid(ctx) {
       var _ctx$uniqueId;
-      return (_ctx$uniqueId = ctx.uniqueId) === null || _ctx$uniqueId === void 0 ? void 0 : _ctx$uniqueId.val;
+      return ctx === null || ctx === void 0 || (_ctx$uniqueId = ctx.uniqueId) === null || _ctx$uniqueId === void 0 ? void 0 : _ctx$uniqueId.val;
     },
     updateColumnDefineByParent: function updateColumnDefineByParent() {
       var _this = this;
@@ -860,7 +863,7 @@ var TableColumnProp = {
           return getTableNode(parentVnode);
         };
         var getNodeUid = function getNodeUid(node) {
-          return _this.getNodeUid(node.ctx);
+          return _this.getNodeCtxUid(node.ctx);
         };
         var tableNode = getTableNode(selfVnode);
         if (!tableNode) {
@@ -880,7 +883,7 @@ var TableColumnProp = {
             }, _this.copyProps(node.props), {
               field: node.props.prop || node.props.field,
               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)
+              uniqueId: getNodeUid(node)
             });
             sortColumns.push((0,external_vue_namespaceObject.unref)(resolveProp));
             index = index + 1;
@@ -924,7 +927,7 @@ var TableColumnProp = {
       var resolveProp = Object.assign({}, this.copyProps(this.$props), {
         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)
+        uniqueId: this.getNodeCtxUid(this.$.ctx)
       });
       this.initColumns(resolveProp, true);
     }

package/package.json

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