bkui-vue 2.0.1-beta.24 → 2.0.1-beta.26

package/lib/date-picker/index.js

@@ -4644,7 +4644,8 @@ function date_picker_objectSpread(e) { for (var r = 1; r < arguments.length; r++
       if (visualValue !== null && visualValue !== void 0 && visualValue.value) {
         state.showClose = true;
       }
-      state.internalValue = state.tmpValue;
+      // state.internalValue = state.tmpValue;
+      // console.error('enterenterenterenterenterenterenterenter', e, state.internalValue);
     };
     var handleInputMouseleave = function handleInputMouseleave(_e) {
       // if (e.toElement?.classList.contains('clear-action')) {

package/lib/index.js

@@ -4,5 +4,5 @@ export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
 export * as plugins from './plugins';
-export const version = "2.0.1-beta.24";
+export const version = "2.0.1-beta.26";
 window.__bkui_vue_version__ = version;

package/lib/table/hooks/use-cell.d.ts

@@ -1,14 +1,14 @@
-import { Column, TablePropTypes } from '../props';
 import { SetupContext } from 'vue';
-import { UseMultiShiftKey } from './use-shift-key';
-import { UseRows } from './use-rows';
+import { Column, TablePropTypes } from '../props';
 import { UseColumns } from './use-columns';
+import { UseRows } from './use-rows';
+import { UseMultiShiftKey } from './use-shift-key';
 type CellRenderArgsType = {
     props: TablePropTypes;
     rows: UseRows;
     ctx: SetupContext;
     columns: UseColumns;
-    row: any;
+    row: Record<string, object>;
     index: number;
     column: Column;
     isChild: boolean;

package/lib/table/hooks/use-render.d.ts

@@ -18,6 +18,6 @@ declare const _default: ({ props, ctx, columns, rows, pagination, settings }: Re
         [key: string]: any;
     }>[] | JSX.Element;
     renderTFoot: () => JSX.Element;
-    setDragEvents: (events: Record<string, Function>) => void;
+    setDragEvents: (events: Record<string, () => void>) => void;
 };
 export default _default;

package/lib/table/index.js

@@ -17,9 +17,9 @@ import "../exception/exception.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_directives_45d4776f__ from "../directives";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_checkbox_13b1cb4a__ from "../checkbox";
 import "../checkbox/checkbox.less";
+import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__ from "../icon";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_button_a2ea7c9a__ from "../button";
 import "../button/button.less";
-import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__ from "../icon";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_input_d525237e__ from "../input";
 import "../input/input.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_popover_9b03f19d__ from "../popover";
@@ -18457,18 +18457,21 @@ function v4(options, buf, offset) {
     if (typeof node === 'function') {
       return node();
     }
+    // if (Array.isArray(node?.subTree)) {
+    //   node.subTree.forEach(resolveChildNode);
+    // }
     return;
   };
   var resolveColumns = function resolveColumns(children) {
     columns.length = 0;
     columnIndex = 0;
-    var GhostBody = children.find(function (node) {
+    var ghostBody = children.find(function (node) {
       var _node$type3;
       return ((_node$type3 = node.type) === null || _node$type3 === void 0 ? void 0 : _node$type3.name) === 'GhostBody';
     });
-    if (GhostBody) {
-      var _GhostBody$children$d, _GhostBody$children, _GhostBody$children$d2;
-      ((_GhostBody$children$d = (_GhostBody$children = GhostBody.children) === null || _GhostBody$children === void 0 || (_GhostBody$children$d2 = _GhostBody$children["default"]) === null || _GhostBody$children$d2 === void 0 ? void 0 : _GhostBody$children$d2.call(_GhostBody$children)) !== null && _GhostBody$children$d !== void 0 ? _GhostBody$children$d : []).forEach(resolveChildNode);
+    if (ghostBody) {
+      var _ghostBody$children$d, _ghostBody$children, _ghostBody$children$d2;
+      ((_ghostBody$children$d = (_ghostBody$children = ghostBody.children) === null || _ghostBody$children === void 0 || (_ghostBody$children$d2 = _ghostBody$children["default"]) === null || _ghostBody$children$d2 === void 0 ? void 0 : _ghostBody$children$d2.call(_ghostBody$children)) !== null && _ghostBody$children$d !== void 0 ? _ghostBody$children$d : []).forEach(resolveChildNode);
     }
     columns.sort(function (col1, col2) {
       return col1.index - col2.index;
@@ -21768,6 +21771,254 @@ const checkbox_namespaceObject = checkbox_x({ ["BkCheckboxGroup"]: () => __WEBPA
 var checkbox_less_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var checkbox_less_y = x => () => x
 const checkbox_less_namespaceObject = checkbox_less_x({  });
+;// CONCATENATED MODULE: external "../icon"
+var icon_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var icon_y = x => () => x
+const icon_namespaceObject = icon_x({ ["DownShape"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.DownShape, ["Funnel"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.Funnel, ["GragFill"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.GragFill, ["RightShape"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.RightShape });
+;// CONCATENATED MODULE: ../../packages/table/src/hooks/use-cell.tsx
+
+
+/*
+ * Tencent is pleased to support the open source community by making
+ * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) is licensed under the MIT License.
+ *
+ * License for 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition):
+ *
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+
+
+
+
+
+
+/* harmony default export */ const use_cell = (function (_ref) {
+  var props = _ref.props,
+    rows = _ref.rows,
+    ctx = _ref.ctx,
+    columns = _ref.columns,
+    row = _ref.row,
+    index = _ref.index,
+    column = _ref.column,
+    _ref$isChild = _ref.isChild,
+    isChild = _ref$isChild === void 0 ? false : _ref$isChild,
+    multiShiftKey = _ref.multiShiftKey;
+  var isShiftKeyDown = multiShiftKey.isShiftKeyDown,
+    getStore = multiShiftKey.getStore,
+    setStore = multiShiftKey.setStore,
+    setStoreStart = multiShiftKey.setStoreStart,
+    clearStoreStart = multiShiftKey.clearStoreStart;
+  var renderCheckboxColumn = function renderCheckboxColumn() {
+    var handleChecked = function handleChecked(value, event) {
+      event.stopImmediatePropagation();
+      event.preventDefault();
+      event.stopPropagation();
+      if (!isShiftKeyDown.value) {
+        if (value) {
+          setStoreStart(row, index);
+        } else {
+          clearStoreStart();
+        }
+      }
+      rows.setRowSelection(row, value);
+      columns.setColumnAttribute(column, COLUMN_ATTRIBUTE.SELECTION_INDETERMINATE, rows.getRowIndeterminate());
+      columns.setColumnAttribute(column, COLUMN_ATTRIBUTE.SELECTION_VAL, rows.getRowCheckedAllValue());
+      ctx.emit(EMIT_EVENTS.ROW_SELECT, {
+        row: row,
+        index: index,
+        checked: value,
+        data: props.data
+      });
+      ctx.emit(EMIT_EVENTS.ROW_SELECT_CHANGE, {
+        row: row,
+        index: index,
+        checked: value,
+        data: props.data
+      });
+    };
+    var beforeRowChange = function beforeRowChange() {
+      if (isShiftKeyDown.value) {
+        var result = setStore(row, index);
+        if (result) {
+          var _rows$pageRowList$sli;
+          var _getStore = getStore(),
+            start = _getStore.start,
+            end = _getStore.end;
+          var startIndex = start.index < end.index ? start.index : end.index;
+          var endIndex = start.index < end.index ? end.index : start.index;
+          ((_rows$pageRowList$sli = rows.pageRowList.slice(startIndex, endIndex + 1)) !== null && _rows$pageRowList$sli !== void 0 ? _rows$pageRowList$sli : []).forEach(function (item) {
+            var isRowEnabled = isRowSelectEnable(props, {
+              row: row,
+              index: index,
+              isCheckAll: false
+            });
+            isRowEnabled && rows.setRowSelection(item, true);
+          });
+        }
+        ctx.emit(EMIT_EVENTS.ROW_SELECT, {
+          row: row,
+          index: index,
+          checked: true,
+          data: props.data,
+          isShiftKeyDown: true
+        });
+        ctx.emit(EMIT_EVENTS.ROW_SELECT_CHANGE, {
+          row: row,
+          index: index,
+          checked: true,
+          data: props.data,
+          isShiftKeyDown: true
+        });
+        return Promise.resolve(!result);
+      }
+      return Promise.resolve(true);
+    };
+    var indeterminate = rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_SELECTION_INDETERMINATE);
+    var isChecked = rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_SELECTION);
+    var isEnable = isRowSelectEnable(props, {
+      row: row,
+      index: index,
+      isCheckAll: false
+    });
+    return (0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject["default"], {
+      "beforeChange": beforeRowChange,
+      "disabled": !isEnable,
+      "indeterminate": indeterminate,
+      "modelValue": isChecked,
+      "onChange": handleChecked
+    }, null);
+  };
+  /**
+   * 渲染表格Cell内容
+   * @param row 当前行
+   * @param column 当前列
+   * @param index 当前列
+   * @param rows 当前列
+   * @returns
+   */
+  var renderCell = function renderCell() {
+    var _renderFn$column$type, _renderFn$column$type2;
+    var defaultFn = function defaultFn() {
+      var type = resolvePropVal(column, 'type', [column, row]);
+      if (type === 'index') {
+        return rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_INDEX);
+      }
+      var key = resolvePropVal(column, 'field', [column, row]);
+      var cell = getRowText(row, key);
+      if (typeof column.render === 'function') {
+        return renderCellCallbackFn();
+      }
+      if (typeof cell === 'boolean') {
+        return String(cell);
+      }
+      if (!cell && typeof cell !== 'number') {
+        var emptyCellText = props.emptyCellText;
+        if (emptyCellText) {
+          if (typeof emptyCellText === 'function') {
+            return emptyCellText(row, column, index, rows.tableRowList.value);
+          }
+          return emptyCellText;
+        }
+      }
+      if (typeof_typeof(cell) === 'object') {
+        return JSON.stringify((0,external_vue_namespaceObject.unref)(cell));
+      }
+      return cell;
+    };
+    var renderFn = {
+      expand: function expand() {
+        return isChild ? '' : renderExpandColumn();
+      },
+      selection: function selection() {
+        return renderCheckboxColumn();
+      },
+      drag: renderDraggableCell
+    };
+    return (_renderFn$column$type = (_renderFn$column$type2 = renderFn[column.type]) === null || _renderFn$column$type2 === void 0 ? void 0 : _renderFn$column$type2.call(renderFn, row, column, index, rows)) !== null && _renderFn$column$type !== void 0 ? _renderFn$column$type : defaultFn();
+  };
+  var renderCellCallbackFn = function renderCellCallbackFn() {
+    var cell = getRowText(row, resolvePropVal(column, 'field', [column, row]));
+    var data = row;
+    return column.render({
+      cell: cell,
+      data: data,
+      row: row,
+      column: column,
+      index: index,
+      rows: rows.tableRowList.value
+    });
+  };
+  var getExpandCell = function getExpandCell() {
+    var _ctx$slots$expandCont, _ctx$slots$expandCont2, _ctx$slots;
+    var isExpand = rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_EXPAND);
+    var icon = isExpand ? (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.DownShape, null, null) : (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.RightShape, null, null);
+    return (0,external_vue_namespaceObject.createVNode)("span", null, [[icon, (_ctx$slots$expandCont = (_ctx$slots$expandCont2 = (_ctx$slots = ctx.slots).expandContent) === null || _ctx$slots$expandCont2 === void 0 ? void 0 : _ctx$slots$expandCont2.call(_ctx$slots, row)) !== null && _ctx$slots$expandCont !== void 0 ? _ctx$slots$expandCont : '']]);
+  };
+  var handleRowExpandClick = function handleRowExpandClick(e) {
+    rows.setRowExpand(row, !rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_EXPAND));
+    ctx.emit(EMIT_EVENTS.ROW_EXPAND_CLICK, {
+      row: row,
+      column: column,
+      index: index,
+      rows: rows.tableRowList.value,
+      e: e
+    });
+  };
+  var renderExpandColumn = function renderExpandColumn() {
+    var renderExpandSlot = function renderExpandSlot() {
+      var _ctx$slots$expandCell, _ctx$slots$expandCell2, _ctx$slots2;
+      if (typeof column.render === 'function') {
+        return renderCellCallbackFn();
+      }
+      return (_ctx$slots$expandCell = (_ctx$slots$expandCell2 = (_ctx$slots2 = ctx.slots).expandCell) === null || _ctx$slots$expandCell2 === void 0 ? void 0 : _ctx$slots$expandCell2.call(_ctx$slots2, {
+        row: row,
+        column: column,
+        index: index,
+        rows: rows
+      })) !== null && _ctx$slots$expandCell !== void 0 ? _ctx$slots$expandCell : getExpandCell();
+    };
+    return (0,external_vue_namespaceObject.createVNode)("span", {
+      "class": "expand-btn-action",
+      "onClick": function onClick(e) {
+        return handleRowExpandClick(e);
+      }
+    }, [renderExpandSlot()]);
+  };
+  var renderDraggableCell = function renderDraggableCell() {
+    var _props$rowDraggable$r, _props$rowDraggable, _props$rowDraggable$f, _props$rowDraggable2, _props$rowDraggable$i, _props$rowDraggable3;
+    var renderFn = (_props$rowDraggable$r = (_props$rowDraggable = props.rowDraggable) === null || _props$rowDraggable === void 0 ? void 0 : _props$rowDraggable.render) !== null && _props$rowDraggable$r !== void 0 ? _props$rowDraggable$r : props.rowDraggable;
+    if (typeof renderFn === 'function') {
+      return renderFn(row, column, index, rows.tableRowList.value);
+    }
+    var fontSize = (_props$rowDraggable$f = (_props$rowDraggable2 = props.rowDraggable) === null || _props$rowDraggable2 === void 0 ? void 0 : _props$rowDraggable2.fontSize) !== null && _props$rowDraggable$f !== void 0 ? _props$rowDraggable$f : '14px';
+    var fontIcon = (_props$rowDraggable$i = (_props$rowDraggable3 = props.rowDraggable) === null || _props$rowDraggable3 === void 0 ? void 0 : _props$rowDraggable3.icon) !== null && _props$rowDraggable$i !== void 0 ? _props$rowDraggable$i : (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.GragFill, {
+      "style": "'--font-size: ".concat(fontSize, ";'"),
+      "class": "drag-cell"
+    }, null);
+    return fontIcon;
+  };
+  return {
+    renderCell: renderCell
+  };
+});
 ;// CONCATENATED MODULE: external "../button"
 var button_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var button_y = x => () => x
@@ -21776,10 +22027,6 @@ const button_namespaceObject = button_x({ ["default"]: () => __WEBPACK_EXTERNAL_
 var button_less_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var button_less_y = x => () => x
 const button_less_namespaceObject = button_less_x({  });
-;// CONCATENATED MODULE: external "../icon"
-var icon_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
-var icon_y = x => () => x
-const icon_namespaceObject = icon_x({ ["DownShape"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.DownShape, ["Funnel"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.Funnel, ["GragFill"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.GragFill, ["RightShape"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.RightShape });
 ;// CONCATENATED MODULE: external "../input"
 var input_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var input_y = x => () => x
@@ -22474,250 +22721,6 @@ function use_head_isSlot(s) {
     getTH: getTH
   };
 });
-;// CONCATENATED MODULE: ../../packages/table/src/hooks/use-cell.tsx
-
-
-/*
- * Tencent is pleased to support the open source community by making
- * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) available.
- *
- * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
- *
- * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) is licensed under the MIT License.
- *
- * License for 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition):
- *
- * ---------------------------------------------------
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
- * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
- * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
- * the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
- * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-
-
-
-
-
-
-/* harmony default export */ const use_cell = (function (_ref) {
-  var props = _ref.props,
-    rows = _ref.rows,
-    ctx = _ref.ctx,
-    columns = _ref.columns,
-    row = _ref.row,
-    index = _ref.index,
-    column = _ref.column,
-    _ref$isChild = _ref.isChild,
-    isChild = _ref$isChild === void 0 ? false : _ref$isChild,
-    multiShiftKey = _ref.multiShiftKey;
-  var isShiftKeyDown = multiShiftKey.isShiftKeyDown,
-    getStore = multiShiftKey.getStore,
-    setStore = multiShiftKey.setStore,
-    setStoreStart = multiShiftKey.setStoreStart,
-    clearStoreStart = multiShiftKey.clearStoreStart;
-  var renderCheckboxColumn = function renderCheckboxColumn() {
-    var handleChecked = function handleChecked(value, event) {
-      event.stopImmediatePropagation();
-      event.preventDefault();
-      event.stopPropagation();
-      if (!isShiftKeyDown.value) {
-        if (value) {
-          setStoreStart(row, index);
-        } else {
-          clearStoreStart();
-        }
-      }
-      rows.setRowSelection(row, value);
-      columns.setColumnAttribute(column, COLUMN_ATTRIBUTE.SELECTION_INDETERMINATE, rows.getRowIndeterminate());
-      columns.setColumnAttribute(column, COLUMN_ATTRIBUTE.SELECTION_VAL, rows.getRowCheckedAllValue());
-      ctx.emit(EMIT_EVENTS.ROW_SELECT, {
-        row: row,
-        index: index,
-        checked: value,
-        data: props.data
-      });
-      ctx.emit(EMIT_EVENTS.ROW_SELECT_CHANGE, {
-        row: row,
-        index: index,
-        checked: value,
-        data: props.data
-      });
-    };
-    var beforeRowChange = function beforeRowChange() {
-      if (isShiftKeyDown.value) {
-        var result = setStore(row, index);
-        if (result) {
-          var _rows$pageRowList$sli;
-          var _getStore = getStore(),
-            start = _getStore.start,
-            end = _getStore.end;
-          var startIndex = start.index < end.index ? start.index : end.index;
-          var endIndex = start.index < end.index ? end.index : start.index;
-          ((_rows$pageRowList$sli = rows.pageRowList.slice(startIndex, endIndex + 1)) !== null && _rows$pageRowList$sli !== void 0 ? _rows$pageRowList$sli : []).forEach(function (item) {
-            var isRowEnabled = isRowSelectEnable(props, {
-              row: row,
-              index: index,
-              isCheckAll: false
-            });
-            isRowEnabled && rows.setRowSelection(item, true);
-          });
-        }
-        ctx.emit(EMIT_EVENTS.ROW_SELECT, {
-          row: row,
-          index: index,
-          checked: true,
-          data: props.data,
-          isShiftKeyDown: true
-        });
-        ctx.emit(EMIT_EVENTS.ROW_SELECT_CHANGE, {
-          row: row,
-          index: index,
-          checked: true,
-          data: props.data,
-          isShiftKeyDown: true
-        });
-        return Promise.resolve(!result);
-      }
-      return Promise.resolve(true);
-    };
-    var indeterminate = rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_SELECTION_INDETERMINATE);
-    var isChecked = rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_SELECTION);
-    var isEnable = isRowSelectEnable(props, {
-      row: row,
-      index: index,
-      isCheckAll: false
-    });
-    return (0,external_vue_namespaceObject.createVNode)(checkbox_namespaceObject["default"], {
-      "beforeChange": beforeRowChange,
-      "disabled": !isEnable,
-      "indeterminate": indeterminate,
-      "modelValue": isChecked,
-      "onChange": handleChecked
-    }, null);
-  };
-  /**
-   * 渲染表格Cell内容
-   * @param row 当前行
-   * @param column 当前列
-   * @param index 当前列
-   * @param rows 当前列
-   * @returns
-   */
-  var renderCell = function renderCell() {
-    var _renderFn$column$type, _renderFn$column$type2;
-    var defaultFn = function defaultFn() {
-      var type = resolvePropVal(column, 'type', [column, row]);
-      if (type === 'index') {
-        return rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_INDEX);
-      }
-      var key = resolvePropVal(column, 'field', [column, row]);
-      var cell = getRowText(row, key);
-      if (typeof column.render === 'function') {
-        return renderCellCallbackFn();
-      }
-      if (typeof cell === 'boolean') {
-        return String(cell);
-      }
-      if (!cell && typeof cell !== 'number') {
-        var emptyCellText = props.emptyCellText;
-        if (emptyCellText) {
-          if (typeof emptyCellText === 'function') {
-            return emptyCellText(row, column, index, rows.tableRowList.value);
-          }
-          return emptyCellText;
-        }
-      }
-      if (typeof_typeof(cell) === 'object') {
-        return JSON.stringify((0,external_vue_namespaceObject.unref)(cell));
-      }
-      return cell;
-    };
-    var renderFn = {
-      expand: function expand() {
-        return isChild ? '' : renderExpandColumn();
-      },
-      selection: function selection() {
-        return renderCheckboxColumn();
-      },
-      drag: renderDraggableCell
-    };
-    return (_renderFn$column$type = (_renderFn$column$type2 = renderFn[column.type]) === null || _renderFn$column$type2 === void 0 ? void 0 : _renderFn$column$type2.call(renderFn, row, column, index, rows)) !== null && _renderFn$column$type !== void 0 ? _renderFn$column$type : defaultFn();
-  };
-  var renderCellCallbackFn = function renderCellCallbackFn() {
-    var cell = getRowText(row, resolvePropVal(column, 'field', [column, row]));
-    var data = row;
-    return column.render({
-      cell: cell,
-      data: data,
-      row: row,
-      column: column,
-      index: index,
-      rows: rows.tableRowList.value
-    });
-  };
-  var getExpandCell = function getExpandCell() {
-    var _ctx$slots$expandCont, _ctx$slots$expandCont2, _ctx$slots;
-    var isExpand = rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_EXPAND);
-    var icon = isExpand ? (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.DownShape, null, null) : (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.RightShape, null, null);
-    return (0,external_vue_namespaceObject.createVNode)("span", null, [[icon, (_ctx$slots$expandCont = (_ctx$slots$expandCont2 = (_ctx$slots = ctx.slots).expandContent) === null || _ctx$slots$expandCont2 === void 0 ? void 0 : _ctx$slots$expandCont2.call(_ctx$slots, row)) !== null && _ctx$slots$expandCont !== void 0 ? _ctx$slots$expandCont : '']]);
-  };
-  var handleRowExpandClick = function handleRowExpandClick(e) {
-    rows.setRowExpand(row, !rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_EXPAND));
-    ctx.emit(EMIT_EVENTS.ROW_EXPAND_CLICK, {
-      row: row,
-      column: column,
-      index: index,
-      rows: rows.tableRowList.value,
-      e: e
-    });
-  };
-  var renderExpandColumn = function renderExpandColumn() {
-    var renderExpandSlot = function renderExpandSlot() {
-      var _ctx$slots$expandCell, _ctx$slots$expandCell2, _ctx$slots2;
-      if (typeof column.render === 'function') {
-        return renderCellCallbackFn();
-      }
-      return (_ctx$slots$expandCell = (_ctx$slots$expandCell2 = (_ctx$slots2 = ctx.slots).expandCell) === null || _ctx$slots$expandCell2 === void 0 ? void 0 : _ctx$slots$expandCell2.call(_ctx$slots2, {
-        row: row,
-        column: column,
-        index: index,
-        rows: rows
-      })) !== null && _ctx$slots$expandCell !== void 0 ? _ctx$slots$expandCell : getExpandCell();
-    };
-    return (0,external_vue_namespaceObject.createVNode)("span", {
-      "class": "expand-btn-action",
-      "onClick": function onClick(e) {
-        return handleRowExpandClick(e);
-      }
-    }, [renderExpandSlot()]);
-  };
-  var renderDraggableCell = function renderDraggableCell() {
-    var _props$rowDraggable$r, _props$rowDraggable, _props$rowDraggable$f, _props$rowDraggable2, _props$rowDraggable$i, _props$rowDraggable3;
-    var renderFn = (_props$rowDraggable$r = (_props$rowDraggable = props.rowDraggable) === null || _props$rowDraggable === void 0 ? void 0 : _props$rowDraggable.render) !== null && _props$rowDraggable$r !== void 0 ? _props$rowDraggable$r : props.rowDraggable;
-    if (typeof renderFn === 'function') {
-      return renderFn(row, column, index, rows.tableRowList.value);
-    }
-    var fontSize = (_props$rowDraggable$f = (_props$rowDraggable2 = props.rowDraggable) === null || _props$rowDraggable2 === void 0 ? void 0 : _props$rowDraggable2.fontSize) !== null && _props$rowDraggable$f !== void 0 ? _props$rowDraggable$f : '14px';
-    var fontIcon = (_props$rowDraggable$i = (_props$rowDraggable3 = props.rowDraggable) === null || _props$rowDraggable3 === void 0 ? void 0 : _props$rowDraggable3.icon) !== null && _props$rowDraggable$i !== void 0 ? _props$rowDraggable$i : (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.GragFill, {
-      "style": "'--font-size: ".concat(fontSize, ";'"),
-      "class": "drag-cell"
-    }, null);
-    return fontIcon;
-  };
-  return {
-    renderCell: renderCell
-  };
-});
 ;// CONCATENATED MODULE: ../../packages/table/src/hooks/use-shift-key.tsx
 /*
  * Tencent is pleased to support the open source community by making
@@ -23101,7 +23104,7 @@ function use_render_isSlot(s) {
                 ctx: ctx,
                 columns: columns,
                 row: row,
-                index: index,
+                index: rowIndex,
                 column: column,
                 isChild: isChild,
                 multiShiftKey: multiShiftKey
@@ -23127,8 +23130,8 @@ function use_render_isSlot(s) {
               "style": cellStyle,
               "class": cellClass,
               "colspan": colspan,
-              "rowspan": rowspan,
               "data-id": columnKey,
+              "rowspan": rowspan,
               "onClick": function onClick(event) {
                 return handleEmit(event, EMIT_EVENTS.CELL_CLICK);
               },
@@ -23137,9 +23140,9 @@ function use_render_isSlot(s) {
               }
             }, [(0,external_vue_namespaceObject.createVNode)(table_cell, {
               "key": cellKey,
-              "data-id": cellKey,
               "class": tdCtxClass,
               "column": column,
+              "data-id": cellKey,
               "observerResize": props.observerResize,
               "parentSetting": props.showOverflowTooltip,
               "row": row

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.1-beta.24",
+  "version": "2.0.1-beta.26",
   "workspaces": [
     "packages/**",
     "scripts/cli",