bkui-vue 0.0.1-beta.457 → 0.0.1-beta.458

package/dist/index.esm.js

@@ -17513,7 +17513,8 @@ const TABLE_ROW_ATTRIBUTE = {
 };
 const COLUMN_ATTRIBUTE = {
   COL_UID: "__col_$uuid",
-  COL_SOURCE_DATA: "__col_source_data"
+  COL_SOURCE_DATA: "__col_source_data",
+  SORT_TYPE: "__sort_type"
 };
 const SCROLLY_WIDTH = 6;
 const LINE_HEIGHT = 42;
@@ -17831,9 +17832,9 @@ var usePagination = (props2, indexData) => {
     endIndex.value = pagination2.current * pagination2.limit;
   };
   const pageData = reactive([]);
-  const sort = (sourceData, sortFn) => {
+  const sort = (sourceData, sortFn, activeSortColumn) => {
     if (typeof sortFn === "function") {
-      sourceData.sort(sortFn);
+      sourceData.sort((a2, b2) => sortFn(a2, b2, activeSortColumn[COLUMN_ATTRIBUTE.SORT_TYPE]));
     }
   };
   const filter = (sourceData, filterFn) => {
@@ -17850,12 +17851,12 @@ var usePagination = (props2, indexData) => {
       sortScope
     } = (_a = activeSortColumn == null ? void 0 : activeSortColumn.sort) != null ? _a : {};
     if (sortScope === SortScope.ALL) {
-      sort(sourceData, sortFn);
+      sort(sourceData, sortFn, activeSortColumn);
     }
     pageData.length = 0;
     pageData.push(...sourceData.slice(startIndex.value, endIndex.value));
     filter(pageData, filterFn);
-    sort(pageData, sortFn);
+    sort(pageData, sortFn, activeSortColumn);
   };
   const watchEffectFn = (filterFn, sortFn, activeSortColumn) => {
     pagination2 = resolvePaginationOption(props2.pagination, pagination2);
@@ -19133,16 +19134,6 @@ const isRowSelectEnable = (props2, {
   }
   return true;
 };
-const getRowId = (row, index2, props2) => {
-  if (row[TABLE_ROW_ATTRIBUTE.ROW_UID] !== void 0) {
-    return row[TABLE_ROW_ATTRIBUTE.ROW_UID];
-  }
-  const key2 = getRowKey(row, props2, index2);
-  if (key2 !== void 0 && row[key2] !== void 0) {
-    return row[key2];
-  }
-  return index2;
-};
 const getRowSourceData = (row) => unref(row[TABLE_ROW_ATTRIBUTE.ROW_SOURCE_DATA] || row);
 const getColumnSourceData = (column) => unref(column[COLUMN_ATTRIBUTE.COL_SOURCE_DATA] || column);
 var TableCell = defineComponent({
@@ -20180,14 +20171,10 @@ class TableRender {
         "--row-height": `${this.getRowHeight(row, rowIndex)}px`
       }];
       const rowClass = [...formatPropAsArray(this.props.rowClass, [row, rowIndex, this]), `hover-${this.props.rowHover}`];
-      const rowKey = getRowId(row, rowIndex, this.props);
-      return [createVNode(TableRow, {
-        "key": rowKey
-      }, {
+      return [createVNode(TableRow, null, {
         default: () => [createVNode("tr", {
           "style": rowStyle,
           "class": rowClass,
-          "data-key": rowKey,
           "onClick": (e) => this.handleRowClick(e, row, rowIndex, rows),
           "onDblclick": (e) => this.handleRowDblClick(e, row, rowIndex, rows),
           "onMouseenter": (e) => this.handleRowEnter(e, row, rowIndex, rows),
@@ -20198,7 +20185,6 @@ class TableRender {
           const tdCtxClass = {
             "expand-cell": column.type === "expand"
           };
-          const cellKey = `__CELL_${rowIndex}_${index2}`;
           const {
             colspan,
             rowspan
@@ -20231,7 +20217,6 @@ class TableRender {
             return createVNode("td", {
               "class": cellClass,
               "style": cellStyle,
-              "key": cellKey,
               "colspan": colspan,
               "rowspan": rowspan,
               "onClick": (event) => handleEmit(event, EMIT_EVENTS.CELL_CLICK),
@@ -20248,20 +20233,16 @@ class TableRender {
           }
           return null;
         })])]
-      }), this.renderExpandRow(row, rowClass, rowIndex)];
+      }), this.renderExpandRow(row, rowClass)];
     })]);
   }
-  renderExpandRow(row, rowClass, rowIndex) {
+  renderExpandRow(row, rowClass) {
     const isExpand = !!row[TABLE_ROW_ATTRIBUTE.ROW_EXPAND];
     if (isExpand) {
       const resovledClass = [...rowClass, {
         row_expend: true
       }];
-      const rowId = getRowId(row, rowIndex, this.props);
-      const rowKey = `${rowId}_expand`;
-      return createVNode(TableRow, {
-        "key": rowKey
-      }, {
+      return createVNode(TableRow, null, {
         default: () => {
           var _a, _b, _c;
           return [createVNode("tr", {
@@ -21216,6 +21197,9 @@ var Component$f = defineComponent({
       if (typeof sortFn === "function") {
         columnSortFn = sortFn;
         activeSortColumn = column;
+        Object.assign(activeSortColumn, {
+          [COLUMN_ATTRIBUTE.SORT_TYPE]: type
+        });
         resolvePageData(columnFilterFn, columnSortFn, activeSortColumn);
         (_b = (_a = refVirtualRender.value) == null ? void 0 : _a.reset) == null ? void 0 : _b.call(_a);
       }
@@ -31811,7 +31795,6 @@ var FormItem = defineComponent({
   }
 });
 const BkForm = withInstallProps(Form, { FormItem, ComposeFormItem });
-const containerKey = Symbol("containerProps");
 const colProps = {
   span: PropTypes.number.def(1),
   offset: PropTypes.number.def(0),
@@ -31827,7 +31810,7 @@ var Col = defineComponent({
       col,
       gutter,
       flex
-    } = inject(containerKey);
+    } = inject("containerProps");
     const {
       span,
       offset: offset2,
@@ -31878,7 +31861,7 @@ var Container = defineComponent({
       flex,
       extCls
     } = props2;
-    provide(containerKey, {
+    provide("containerProps", {
       col,
       gutter,
       flex
@@ -31910,7 +31893,7 @@ var Row = defineComponent({
       col,
       gutter,
       flex
-    } = inject(containerKey);
+    } = inject("containerProps");
     provide("containerProps", {
       col,
       gutter,