stk-table-vue 0.7.0 → 0.7.1

package/lib/src/StkTable/types/index.d.ts

@@ -38,7 +38,7 @@ export type CustomCell<T extends CustomCellProps<U> | CustomHeaderCellProps<U>,
 /** 表格列配置 */
 export type StkTableColumn<T extends Record<string, any>> = {
     /**
-     * 用于区分相同dataIndex 的列。
+     * 列唯一键，(可选)，不传则默认取dataIndex 字段作为列唯一键。
      */
     key?: any;
     /**

package/lib/src/StkTable/utils/index.d.ts

@@ -14,7 +14,9 @@ export declare function isEmptyValue(val: any, isNumber?: boolean): boolean;
  * @param targetArray 表格数据
  * @return targetArray 的浅拷贝
  */
-export declare function insertToOrderedArray<T extends object>(sortState: SortState<T>, newItem: T, targetArray: T[], sortConfig?: SortConfig<T>): T[];
+export declare function insertToOrderedArray<T extends object>(sortState: SortState<T>, newItem: T, targetArray: T[], sortConfig?: SortConfig<T> & {
+    customCompare?: (a: T, b: T) => number;
+}): T[];
 /**
  * 二分查找
  *  @param searchArray 查找数组

package/lib/stk-table-vue.js

@@ -61,7 +61,6 @@ function isEmptyValue(val, isNumber) {
 }
 function insertToOrderedArray(sortState, newItem, targetArray, sortConfig = {}) {
   const { dataIndex, sortField, order } = sortState;
-  sortConfig = { emptyToBottom: false, ...sortConfig };
   let { sortType } = sortState;
   const field = sortField || dataIndex;
   if (!sortType) sortType = typeof newItem[field];
@@ -70,15 +69,19 @@ function insertToOrderedArray(sortState, newItem, targetArray, sortConfig = {})
     data.unshift(newItem);
     return data;
   }
+  const { emptyToBottom, customCompare, stringLocaleCompare } = { emptyToBottom: false, ...sortConfig };
   const targetVal = newItem[field];
-  if (sortConfig.emptyToBottom && isEmptyValue(targetVal)) {
+  if (emptyToBottom && isEmptyValue(targetVal)) {
     data.push(newItem);
   } else {
+    const customCompareFn = customCompare || ((a, b) => {
+      const midVal = a[field];
+      const compareRes = strCompare(midVal, targetVal, isNumber, stringLocaleCompare);
+      return order === "asc" ? compareRes : -compareRes;
+    });
     const isNumber = sortType === "number";
     const sIndex = binarySearch(data, (midIndex) => {
-      const midVal = data[midIndex][field];
-      const compareRes = strCompare(midVal, targetVal, isNumber, sortConfig.stringLocaleCompare);
-      return order === "asc" ? compareRes : -compareRes;
+      return customCompareFn(data[midIndex], newItem);
     });
     data.splice(sIndex, 0, newItem);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stk-table-vue",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Simple realtime virtual table for vue3 and vue2.7",
   "main": "./lib/stk-table-vue.js",
   "types": "./lib/src/StkTable/index.d.ts",
@@ -40,7 +40,6 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/d3-interpolate": "^3.0.4",
     "@types/mockjs": "^1.0.10",
     "@types/node": "^20.12.10",
     "@typescript-eslint/eslint-plugin": "^7.7.0",

package/src/StkTable/types/index.ts

@@ -43,7 +43,7 @@ export type CustomCell<T extends CustomCellProps<U> | CustomHeaderCellProps<U>,
 /** 表格列配置 */
 export type StkTableColumn<T extends Record<string, any>> = {
     /**
-     * 用于区分相同dataIndex 的列。
+     * 列唯一键，(可选)，不传则默认取dataIndex 字段作为列唯一键。
      */
     key?: any;
     /**

package/src/StkTable/utils/index.ts

@@ -21,9 +21,13 @@ export function isEmptyValue(val: any, isNumber?: boolean) {
  * @param targetArray 表格数据
  * @return targetArray 的浅拷贝
  */
-export function insertToOrderedArray<T extends object>(sortState: SortState<T>, newItem: T, targetArray: T[], sortConfig: SortConfig<T> = {}) {
+export function insertToOrderedArray<T extends object>(
+    sortState: SortState<T>,
+    newItem: T,
+    targetArray: T[],
+    sortConfig: SortConfig<T> & { customCompare?: (a: T, b: T) => number } = {},
+) {
     const { dataIndex, sortField, order } = sortState;
-    sortConfig = { emptyToBottom: false, ...sortConfig };
     let { sortType } = sortState;
     const field = sortField || dataIndex;
     if (!sortType) sortType = typeof newItem[field] as 'number' | 'string';
@@ -35,17 +39,24 @@ export function insertToOrderedArray<T extends object>(sortState: SortState<T>,
         return data;
     }
 
+    const { emptyToBottom, customCompare, stringLocaleCompare } = { emptyToBottom: false, ...sortConfig };
+
     const targetVal: any = newItem[field];
-    if (sortConfig.emptyToBottom && isEmptyValue(targetVal)) {
+    if (emptyToBottom && isEmptyValue(targetVal)) {
         // 空值排在最下方
         data.push(newItem);
     } else {
+        const customCompareFn =
+            customCompare ||
+            ((a, b) => {
+                const midVal: any = a[field];
+                const compareRes = strCompare(midVal, targetVal, isNumber, stringLocaleCompare);
+                return order === 'asc' ? compareRes : -compareRes;
+            });
         const isNumber = sortType === 'number';
         // 二分插入
         const sIndex = binarySearch(data, midIndex => {
-            const midVal: any = data[midIndex][field];
-            const compareRes = strCompare(midVal, targetVal, isNumber, sortConfig.stringLocaleCompare);
-            return order === 'asc' ? compareRes : -compareRes;
+            return customCompareFn(data[midIndex], newItem);
         });
         data.splice(sIndex, 0, newItem);
     }