stk-table-vue 0.11.13 → 0.11.15

package/lib/index-BzpbBYPO.js

@@ -1,6 +1,6 @@
 /**
  * name: stk-table-vue
- * version: v0.11.12
+ * version: v0.11.15
  * description: High performance realtime virtual table for vue3 and vue2.7
  * author: japlus
  * homepage: https://ja-plus.github.io/stk-table-vue/

package/lib/src/StkTable/useIndexResolver.d.ts

@@ -0,0 +1,4 @@
+import { Ref } from 'vue';
+import { StkTableColumn, UniqKey } from './types';
+
+export declare function useIndexResolver<DT extends Record<string, any>>(dataSourceRef: Ref<DT[]>, columnsRef: Ref<StkTableColumn<DT>[]>, rowKeyGen: (row: DT | null | undefined) => UniqKey): readonly [(row: DT) => number, (column: StkTableColumn<DT>) => number];

package/lib/stk-table-vue.js

@@ -1,6 +1,6 @@
 /**
  * name: stk-table-vue
- * version: v0.11.12
+ * version: v0.11.15
  * description: High performance realtime virtual table for vue3 and vue2.7
  * author: japlus
  * homepage: https://ja-plus.github.io/stk-table-vue/
@@ -54,7 +54,7 @@ function insertToOrderedArray(sortState, newItem, targetArray, sortConfig = {})
   }
   const { emptyToBottom, customCompare, stringLocaleCompare } = { emptyToBottom: false, ...sortConfig };
   const targetVal = newItem[field];
-  if (emptyToBottom && isEmptyValue(targetVal)) {
+  if (emptyToBottom && isEmptyValue(targetVal, sortType === "number")) {
     data.push(newItem);
   } else {
     const customCompareFn = customCompare || ((a, b) => {
@@ -4137,7 +4137,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                           class: "table-cell-wrapper",
                           tabindex: "-1",
                           title: row[col.dataIndex] || ""
-                        }, toDisplayString((row && row[col.dataIndex]) !== void 0 ? row && row[col.dataIndex] : getEmptyCellText.value(col, row)), 9, _hoisted_16)) : col.type === "seq" ? (openBlock(), createElementBlock("div", _hoisted_17, toDisplayString((props.seqConfig.startIndex || 0) + getAbsoluteRowIndex(rowIndex) + 1), 1)) : col.type === "tree-node" ? (openBlock(), createBlock(_sfc_main$3, {
+                        }, toDisplayString((row && row[col.dataIndex]) != null ? row && row[col.dataIndex] : getEmptyCellText.value(col, row)), 9, _hoisted_16)) : col.type === "seq" ? (openBlock(), createElementBlock("div", _hoisted_17, toDisplayString((props.seqConfig.startIndex || 0) + getAbsoluteRowIndex(rowIndex) + 1), 1)) : col.type === "tree-node" ? (openBlock(), createBlock(_sfc_main$3, {
                           key: 3,
                           class: "table-cell-wrapper",
                           tabindex: "-1",

package/lib/style.css

@@ -1,6 +1,6 @@
 /**
  * name: stk-table-vue
- * version: v0.11.12
+ * version: v0.11.15
  * description: High performance realtime virtual table for vue3 and vue2.7
  * author: japlus
  * homepage: https://ja-plus.github.io/stk-table-vue/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stk-table-vue",
-  "version": "0.11.13",
+  "version": "0.11.15",
   "description": "High performance realtime virtual table for vue3 and vue2.7",
   "main": "./lib/stk-table-vue.js",
   "types": "./lib/src/StkTable/index.d.ts",

package/src/StkTable/StkTable.vue

@@ -179,7 +179,7 @@
                                         </template>
                                     </component>
                                     <div v-else-if="!col.type" class="table-cell-wrapper" tabindex="-1" :title="row[col.dataIndex] || ''">
-                                        {{ (row && row[col.dataIndex]) !== void 0 ? row && row[col.dataIndex] : getEmptyCellText(col, row) }}
+                                        {{ (row && row[col.dataIndex]) != null ? row && row[col.dataIndex] : getEmptyCellText(col, row) }}
                                     </div>
                                     <div v-else-if="col.type === 'seq'" class="table-cell-wrapper" tabindex="-1">
                                         {{ (props.seqConfig.startIndex || 0) + getAbsoluteRowIndex(rowIndex) + 1 }}
@@ -296,6 +296,7 @@ import { useTableColumns } from './useTableColumns';
 import { useThDrag } from './useThDrag';
 import { useTrDrag } from './useTrDrag';
 import { useTree } from './useTree';
+import { useIndexResolver } from './useIndexResolver';
 import { useVirtualScroll } from './useVirtualScroll';
 import { useWheeling } from './useWheeling';
 import { createStkTableId, getCalculatedColWidth } from './utils/constRefUtils';

package/src/StkTable/useIndexResolver.ts

@@ -0,0 +1,29 @@
+import type { Ref } from 'vue';
+import type { StkTableColumn, UniqKey } from './types';
+
+export function useIndexResolver<DT extends Record<string, any>>(
+    dataSourceRef: Ref<DT[]>,
+    columnsRef: Ref<StkTableColumn<DT>[]>,
+    rowKeyGen: (row: DT | null | undefined) => UniqKey,
+) {
+    function getRowIndex(row: DT): number {
+        const targetKey = rowKeyGen(row);
+        const data = dataSourceRef.value;
+        for (let i = 0; i < data.length; i++) {
+            if (rowKeyGen(data[i]) === targetKey) return i;
+        }
+        return -1;
+    }
+
+    function getColumnIndex(column: StkTableColumn<DT>): number {
+        const targetDataIndex = column?.dataIndex;
+        if (targetDataIndex === void 0 || targetDataIndex === null) return -1;
+        const columns = columnsRef.value;
+        for (let i = 0; i < columns.length; i++) {
+            if (columns[i]?.dataIndex === targetDataIndex) return i;
+        }
+        return -1;
+    }
+
+    return [getRowIndex, getColumnIndex] as const;
+}

package/src/StkTable/utils/index.ts

@@ -43,7 +43,7 @@ export function insertToOrderedArray<T extends object>(
     const { emptyToBottom, customCompare, stringLocaleCompare } = { emptyToBottom: false, ...sortConfig };
 
     const targetVal: any = newItem[field];
-    if (emptyToBottom && isEmptyValue(targetVal)) {
+    if (emptyToBottom && isEmptyValue(targetVal, sortType === 'number')) {
         // 空值排在最下方
         data.push(newItem);
     } else {