stk-table-vue 0.6.3 → 0.6.4

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

@@ -438,6 +438,7 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<{
     width: string;
     minWidth: string;
     maxWidth: string;
+    sortConfig: SortConfig<any>;
     rowHeight: number;
     headerRowHeight: number | null;
     headless: boolean;
@@ -475,7 +476,6 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<{
     bordered: boolean | "h" | "v" | "body-v";
     autoResize: boolean | (() => void);
     fixedColShadow: boolean;
-    sortConfig: SortConfig<any>;
     hideHeaderTitle: boolean | string[];
     highlightConfig: HighlightConfig;
     seqConfig: SeqConfig;

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

@@ -71,6 +71,8 @@ export type StkTableColumn<T extends Record<string, any>> = {
     sortField?: keyof T;
     /** 排序方式。按数字/字符串 */
     sortType?: 'number' | 'string';
+    /** 配置当前列的排序规则 */
+    sortConfig?: Pick<SortConfig<T>, 'emptyToBottom' | 'stringLocaleCompare'>;
     /** 固定列 */
     fixed?: 'left' | 'right' | null;
     /** private */ rowSpan?: number;

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

@@ -36,6 +36,6 @@ export declare function strCompare(a: string, b: string, isNumber: boolean, loca
 export declare function tableSort<T extends Record<string, any>>(sortOption: SortOption<T>, order: Order, dataSource: T[], sortConfig?: SortConfig<T>): T[];
 /** 多级表头深度 从0开始为一级*/
 export declare function howDeepTheHeader(arr: StkTableColumn<any>[], level?: number): number;
-/** number列宽+px */
-export declare function transformWidthToStr(width?: string | number): string | undefined;
+/** number width +px */
+export declare function transformWidthToStr(width?: string | number): string;
 export declare function getBrowsersVersion(browserName: string): number;

package/lib/stk-table-vue.js

@@ -158,10 +158,8 @@ function howDeepTheHeader(arr, level = 0) {
   return Math.max(...levels);
 }
 function transformWidthToStr(width) {
-  if (typeof width === "number") {
-    return width + "px";
-  }
-  return width;
+  const numberWidth = Number(width);
+  return width + (!Number.isNaN(numberWidth) ? "px" : "");
 }
 function getBrowsersVersion(browserName) {
   try {
@@ -369,7 +367,8 @@ function useColResize({
     const { clientX } = e;
     let moveX = clientX - startX;
     const currentColWidth = getCalculatedColWidth(lastCol);
-    if (currentColWidth + moveX < props.colMinWidth) {
+    const minWidth = (lastCol == null ? void 0 : lastCol.minWidth) ?? props.colMinWidth;
+    if (currentColWidth + moveX < minWidth) {
       moveX = -currentColWidth;
     }
     const offsetTableX = startOffsetTableX + moveX;
@@ -1701,7 +1700,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (click) sortOrderIndex.value++;
       sortOrderIndex.value = sortOrderIndex.value % 3;
       let order = sortSwitchOrder[sortOrderIndex.value];
-      const sortConfig = props.sortConfig;
+      const sortConfig = { ...props.sortConfig, ...col.sortConfig };
       const defaultSort = sortConfig.defaultSort;
       if (!order && defaultSort) {
         const colKey2 = defaultSort.key || defaultSort.dataIndex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stk-table-vue",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Simple 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

@@ -136,15 +136,10 @@
                         hover: props.showTrHoverClass && (rowKey ? rowKeyGen(row) === currentHoverRowKey : row === currentHoverRowKey),
                         [rowClassName(row, (virtual_on ? virtualScroll.startIndex : 0) + rowIndex)]: true,
                         expanded: row?.__EXPANDED__,
-                        'expanded-row': row && (row as ExpandedRow).__EXPANDED_ROW__,
+                        'expanded-row': row && row.__EXPANDED_ROW__,
                     }"
                     :style="{
-                        '--row-height':
-                            row &&
-                            (row as ExpandedRow).__EXPANDED_ROW__ &&
-                            virtual_on &&
-                            props.expandConfig?.height &&
-                            props.expandConfig?.height + 'px',
+                        '--row-height': row && row.__EXPANDED_ROW__ && virtual_on && props.expandConfig?.height && props.expandConfig?.height + 'px',
                     }"
                     @click="e => onRowClick(e, row)"
                     @dblclick="e => onRowDblclick(e, row)"
@@ -154,11 +149,11 @@
                 >
                     <!--这个td用于配合虚拟滚动的th对应，防止列错位-->
                     <td v-if="virtualX_on" class="vt-x-left"></td>
-                    <td v-if="row && (row as ExpandedRow).__EXPANDED_ROW__" :colspan="virtualX_columnPart.length">
+                    <td v-if="row && row.__EXPANDED_ROW__" :colspan="virtualX_columnPart.length">
                         <!-- TODO: support wheel -->
                         <div class="table-cell-wrapper">
-                            <slot name="expand" :row="(row as ExpandedRow).__EXPANDED_ROW__" :col="(row as ExpandedRow).__EXPANDED_COL__">
-                                {{ (row as ExpandedRow).__EXPANDED_ROW__?.[(row as ExpandedRow).__EXPANDED_COL__.dataIndex] ?? '' }}
+                            <slot name="expand" :row="row.__EXPANDED_ROW__" :col="row.__EXPANDED_COL__">
+                                {{ row.__EXPANDED_ROW__?.[row.__EXPANDED_COL__.dataIndex] ?? '' }}
                             </slot>
                         </div>
                     </td>
@@ -1047,7 +1042,7 @@ function onColumnSort(col: StkTableColumn<DT> | undefined | null, click = true,
     sortOrderIndex.value = sortOrderIndex.value % 3;
 
     let order = sortSwitchOrder[sortOrderIndex.value];
-    const sortConfig = props.sortConfig;
+    const sortConfig = { ...props.sortConfig, ...col.sortConfig };
     const defaultSort = sortConfig.defaultSort;
 
     if (!order && defaultSort) {

package/src/StkTable/types/index.ts

@@ -77,6 +77,8 @@ export type StkTableColumn<T extends Record<string, any>> = {
     sortField?: keyof T;
     /** 排序方式。按数字/字符串 */
     sortType?: 'number' | 'string';
+    /** 配置当前列的排序规则 */
+    sortConfig?: Pick<SortConfig<T>, 'emptyToBottom' | 'stringLocaleCompare'>;
     /** 固定列 */
     fixed?: 'left' | 'right' | null;
     /** private */ rowSpan?: number;

package/src/StkTable/useColResize.ts

@@ -139,8 +139,9 @@ export function useColResize<DT extends Record<string, any>>({
         const { clientX } = e;
         let moveX = clientX - startX;
         const currentColWidth = getCalculatedColWidth(lastCol);
+        const minWidth = lastCol?.minWidth ?? props.colMinWidth;
         // 移动量不小于最小列宽
-        if (currentColWidth + moveX < props.colMinWidth) {
+        if (currentColWidth + moveX < minWidth) {
             moveX = -currentColWidth;
         }
 

package/src/StkTable/utils/index.ts

@@ -180,12 +180,10 @@ export function howDeepTheHeader(arr: StkTableColumn<any>[], level = 0) {
     return Math.max(...levels);
 }
 
-/** number列宽+px */
+/** number width +px */
 export function transformWidthToStr(width?: string | number) {
-    if (typeof width === 'number') {
-        return width + 'px';
-    }
-    return width;
+    const numberWidth = Number(width);
+    return width + (!Number.isNaN(numberWidth) ? 'px' : '');
 }
 
 export function getBrowsersVersion(browserName: string) {