@jiaozhiye/qm-design-react 1.12.7 → 1.12.9

package/lib/table/src/context/index.d.ts

@@ -27,6 +27,7 @@ export type ITableContext = {
     showFooter: boolean;
     showSummary: boolean;
     summationRows: Record<string, number | string>[];
+    tableRowHeight: number;
     pagination: IPagination;
     fetchParams: IFetchParams;
     selectionKeys: IRowKey[];

package/lib/table/src/hooks/useTableLayout.d.ts

@@ -19,6 +19,7 @@ type IExtra = {
     selectionKeys: IRowKey[];
     highlightKey: IRowKey;
     layout: ITableState['layout'];
+    tableRowHeight: number;
     showFooter: boolean;
     showPagination: boolean;
     isFullScreen: boolean;

package/lib/table/src/hooks/useTableMemo.d.ts

@@ -1,9 +1,11 @@
 import React from 'react';
 import type { ITableProps, IColumn, IRowKey, IRecord, getRowKeyType, IFetchParams, ISorter, IFilter, IPagination, ISuperFilter, IMergedCell, IMergeCellItem } from '../table/types';
 import type { ITableRef } from './useTableRef';
+import type { ComponentSize } from '../../../_utils/types';
 type IExtra = {
     getRowKey: getRowKeyType;
     tableRef: React.MutableRefObject<ITableRef>;
+    $size: ComponentSize;
     tableFullData: IRecord[];
     tableFlatData: IRecord[];
     updateMark: number;
@@ -25,6 +27,7 @@ declare const useTableMemo: <T extends ITableProps>(props: T, extra: IExtra) =>
     summationColumns: IColumn[];
     leftFixedColumns: IColumn[];
     rightFixedColumns: IColumn[];
+    tableRowHeight: number;
     derivedMergeCells: IMergeCellItem[];
     treeExpandIndex: string;
     showSummary: boolean;

package/lib/table/src/hooks/useTableRef.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
 import TableManager from '../manager';
 import Store from '../store';
+import type { Nullable } from '../../../_utils/types';
 import type { ScrollbarRef } from '../../../scrollbar/src/scrollbar';
 import type { getRowKeyType, IColumn, IFieldAuthItem, InsertMode, IRecord, IRowKey, ITableProps } from '../table/types';
-import type { ComponentSize, Nullable } from '../../../_utils/types';
 export type ITableRef = {
     props: ITableProps;
     uid: string;
@@ -16,7 +16,6 @@ export type ITableRef = {
     fieldAuth: Record<string, IFieldAuthItem>;
     columnsDefined: boolean;
     scrollBarRef: React.RefObject<ScrollbarRef>;
-    rowHeight: number;
     store: Store;
     resizeState: {
         width: number;
@@ -39,9 +38,8 @@ export type ITableRef = {
 };
 type IExtra = {
     getRowKey: getRowKeyType;
-    $size: ComponentSize;
 };
-declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size }: IExtra) => {
+declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey }: IExtra) => {
     setElementStore: (key: string, value: HTMLElement) => void;
     setOriginColumns: (columns: IColumn[]) => void;
     setTableFullData: (records: IRecord[]) => void;
@@ -69,7 +67,6 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     fieldAuth: Record<string, IFieldAuthItem>;
     columnsDefined: boolean;
     scrollBarRef: React.RefObject<ScrollbarRef>;
-    rowHeight: number;
     store: Store;
     resizeState: {
         width: number;

package/lib/table/src/hooks/useTableVirtual.d.ts

@@ -9,8 +9,8 @@ declare const useTableVirtual: (tableFlatData: IRecord[], tableFlatColumns: ICol
     getXIndexes: () => number[];
     virtualTranslateY: () => number;
     virtualTranslateX: () => number;
-    calcVirtualYSize: () => number | undefined;
-    calcVirtualXSize: () => number | undefined;
+    calcVirtualYSize: () => number | "";
+    calcVirtualXSize: () => number | "";
     scrollToYIndex: (index: number) => void;
     scrollToXIndex: (index: number) => void;
 };

package/lib/table/src/store/index.d.ts

@@ -14,6 +14,8 @@ type IStoreState = {
 };
 declare class Store {
     state: IStoreState;
+    private getRowKey;
+    constructor(props: any);
     addToRequired: (data: any) => void;
     removeFromRequired: (data: any) => void;
     addToValidate: (data: any) => void;

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

@@ -4,6 +4,7 @@ import type { IColumn, IDerivedRowKeys, IMergeCellItem, IRecord, IRowKey, ISorte
 import type { Nullable, AnyObject } from '../../../_utils/types';
 export declare const columnsFlatMap: (columns: IColumn[]) => IColumn[];
 export declare const createFilterColumns: (columns: IColumn[]) => IColumn[];
+export declare const createShadowColumns: (columns: IColumn[]) => IColumn[];
 export declare const getAllColumns: (columns: IColumn[]) => IColumn[];
 export declare const mapTableColumns: (columns: IColumn[], callback?: ((column: IColumn) => void) | undefined) => IColumn[];
 export declare const deepFindColumn: (columns: IColumn[], mark: string) => Nullable<IColumn>;

package/lib/table/style/body.less

@@ -1,105 +1,105 @@
-/*
- * @Author: 焦质晔
- * @Date: 2020-02-28 22:13:54
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-12-01 18:48:00
- */
-.body--row {
-  // position: sticky; // 解决列固定快读滚动时，非固定列上下留白卡顿问题(chrome 135~137)，138版本后已修复
-  &-draggable {
-    position: relative;
-    .drop-indicator {
-      position: absolute;
-      right: 0;
-      bottom: 0;
-      z-index: 5;
-      height: 2px;
-      background-color: @v-primary-color;
-      border-radius: 1px;
-      pointer-events: none;
-      &::after {
-        position: absolute;
-        top: -3px;
-        left: 0;
-        width: 8px;
-        height: 8px;
-        background-color: #fff;
-        border: 2px solid @v-primary-color;
-        border-radius: 50%;
-        content: '';
-      }
-    }
-  }
-}
-.body--column {
-  .cell--edit {
-    margin: 0 -1 * (@v-module-distance - 1px);
-    // placeholder
-    input::placeholder {
-      text-align: left;
-    }
-    // search
-    .ant-input-search {
-      width: calc(100% + 1px);
-      & > .ant-input-group > .ant-input-group-addon {
-        line-height: 1;
-      }
-    }
-    // search-helper-multiple
-    .search-helper-multiple {
-      .ant-input-group > .ant-select:first-child {
-        z-index: 1;
-        .ant-select-selector {
-          border-top-right-radius: 0;
-          border-bottom-right-radius: 0;
-        }
-      }
-      .ant-select-multiple {
-        .ant-select-selection-overflow-item-rest {
-          pointer-events: none;
-        }
-      }
-    }
-    // textArea
-    textarea[class='ant-input'] {
-      resize: none;
-    }
-    &.is-error {
-      position: relative;
-      .ant-input,
-      .ant-input-affix-wrapper,
-      .ant-select > .ant-select-selector {
-        border-color: @v-danger-color;
-        box-shadow: none;
-        z-index: 1;
-      }
-      .ant-input-search {
-        & + .cell-error {
-          right: 38px;
-        }
-      }
-      .cell-error {
-        position: absolute;
-        top: calc(50% - 9px);
-        font-size: @v-font-size-small;
-        color: @v-danger-color;
-        right: 8px;
-        pointer-events: none;
-        z-index: 1;
-      }
-    }
-  }
-  &.col--center {
-    .cell--edit .ant-input {
-      text-align: center;
-    }
-  }
-  &.col--right {
-    .cell--edit .ant-input {
-      text-align: right;
-    }
-  }
-  &.selected {
-    background-color: @v-table-row-selected-background-color !important;
-  }
-}
+/*
+ * @Author: 焦质晔
+ * @Date: 2020-02-28 22:13:54
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2024-12-01 18:48:00
+ */
+.body--row {
+  // position: sticky; // 解决列固定快读滚动时，非固定列上下留白卡顿问题(chrome 135~137)，138版本后已修复
+  &-draggable {
+    position: relative;
+    .drop-indicator {
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      z-index: 5;
+      height: 2px;
+      background-color: @v-primary-color;
+      border-radius: 1px;
+      pointer-events: none;
+      &::after {
+        position: absolute;
+        top: -3px;
+        left: 0;
+        width: 8px;
+        height: 8px;
+        background-color: #fff;
+        border: 2px solid @v-primary-color;
+        border-radius: 50%;
+        content: '';
+      }
+    }
+  }
+}
+.body--column {
+  .cell--edit {
+    margin: 0 -1 * (@v-module-distance - 1px);
+    // placeholder
+    input::placeholder {
+      text-align: left;
+    }
+    // search
+    .ant-input-search {
+      width: calc(100% + 1px);
+      & > .ant-input-group > .ant-input-group-addon {
+        line-height: 1;
+      }
+    }
+    // search-helper-multiple
+    .search-helper-multiple {
+      .ant-input-group > .ant-select:first-child {
+        z-index: 1;
+        .ant-select-selector {
+          border-top-right-radius: 0;
+          border-bottom-right-radius: 0;
+        }
+      }
+      .ant-select-multiple {
+        .ant-select-selection-overflow-item-rest {
+          pointer-events: none;
+        }
+      }
+    }
+    // textArea
+    textarea[class='ant-input'] {
+      resize: none;
+    }
+    &.is-error {
+      position: relative;
+      .ant-input,
+      .ant-input-affix-wrapper,
+      .ant-select > .ant-select-selector {
+        border-color: @v-danger-color;
+        box-shadow: none;
+        z-index: 1;
+      }
+      .ant-input-search {
+        & + .cell-error {
+          right: 38px;
+        }
+      }
+      .cell-error {
+        position: absolute;
+        top: calc(50% - 9px);
+        font-size: @v-font-size-small;
+        color: @v-danger-color;
+        right: 8px;
+        pointer-events: none;
+        z-index: 1;
+      }
+    }
+  }
+  &.col--center {
+    .cell--edit .ant-input {
+      text-align: center;
+    }
+  }
+  &.col--right {
+    .cell--edit .ant-input {
+      text-align: right;
+    }
+  }
+  &.selected {
+    background-color: @v-table-row-selected-background-color !important;
+  }
+}

package/lib/table/style/fast-search.less

@@ -47,11 +47,11 @@
         overflow-y: auto;
         .rtable {
           width: 100%;
-          border: 1px solid @v-table-border-color;
           thead {
             position: sticky;
             top: 0;
             th {
+              border-bottom: 1px solid @v-table-border-color;
               background-color: @v-table-header-background-color;
               height: 30px;
               text-align: center;
@@ -73,7 +73,7 @@
               td {
                 height: 30px;
                 text-align: center;
-                border-top: 1px solid @v-table-border-color;
+                border-bottom: 1px solid @v-table-border-color;
                 cursor: pointer;
                 .text-overflow-cut();
                 max-width: 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jiaozhiye/qm-design-react",
-  "version": "1.12.7",
+  "version": "1.12.9",
   "description": "A Component Library for React",
   "keywords": [
     "React",