dcp-design-react 1.8.31 → 1.9.0

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

@@ -1,8 +1,8 @@
 import React from 'react';
 import type { IColumn, IRecord, TableBodyRef } from '../table/types';
 type IBodyProps = {
+    tableFlatColumns: IColumn[];
     tableData: IRecord[];
-    flattenColumns: IColumn[];
 };
 declare const TableBody: React.ForwardRefExoticComponent<IBodyProps & React.RefAttributes<TableBodyRef>>;
 export default TableBody;

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

@@ -1,7 +1,6 @@
 import React from 'react';
-import type { IColumn, ToolMethodRef } from '../table/types';
+import type { ToolMethodRef } from '../table/types';
 type ITableClipboardProps = {
-    flattenColumns: IColumn[];
     open?: boolean;
 };
 declare const TableClipboard: React.ForwardRefExoticComponent<ITableClipboardProps & React.RefAttributes<ToolMethodRef>>;

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

@@ -32,6 +32,7 @@ declare const config: {
     dataKey: string;
     summationKey: string;
     totalKey: string;
+    virtualScrollX: number;
     virtualScrollY: number;
     sorterFieldName: string;
     filterFieldName: string;

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

@@ -72,6 +72,7 @@ export type ITableContext = {
     createGroupData: (records: IRecord[]) => IRecord[];
     findParentRowKeys: (deriveRowKeys: IDerivedRowKey[], key: IRowKey) => IRowKey[];
     getAllChildRowKeys: (deriveRowKeys: IDerivedRowKey[]) => IRowKey[];
+    triggerScrollXEvent: (sl: number) => void;
     triggerScrollYEvent: (st: number) => void;
     scrollBottomDebouncer: (event: React.MouseEvent<HTMLDivElement>) => void;
     resetTableScroll: () => void;

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

@@ -1,8 +1,6 @@
 import React from 'react';
-import type { IColumn } from '../table/types';
 type IFootProps = {
     summationRows: Record<string, string | number>[];
-    flattenColumns: IColumn[];
 };
 declare const TableFooter: React.FC<IFootProps>;
 export default TableFooter;

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

@@ -2,7 +2,6 @@ import React from 'react';
 import type { IColumn, IFilter, ISorter } from '../table/types';
 type IHeaderProps = {
     tableColumns: IColumn[];
-    flattenColumns: IColumn[];
     sorter: ISorter;
     filters: IFilter;
 };

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

@@ -31,6 +31,7 @@ type IExtra = {
     isGroupSubtotal: boolean;
     doLayout: () => void;
     setTableData: (records: IRecord[]) => void;
+    setTableFlatColumns: (columns: IColumn[]) => void;
     setTableFullData: (records: IRecord[]) => void;
     setTableOriginData: (records: IRecord[]) => void;
     setAllTableData: (records: IRecord[]) => void;
@@ -44,8 +45,17 @@ type IExtra = {
     setRowExpandedKeys: (rowKeys: IRowKey[]) => void;
     setHighlightKey: (rowKey: IRowKey) => void;
     setSelectionRows: (records: IRecord[]) => void;
-    setScrollYLoad: (scrollYLoad: boolean) => void;
+    setScrollXLoad: (value: boolean) => void;
+    setScrollYLoad: (value: boolean) => void;
+    setScrollXStore: (option: ITableRef['scrollXStore']) => void;
     setScrollYStore: (option: ITableRef['scrollYStore']) => void;
+    computeVirtualX: (sl: number, tableWidth: number) => {
+        toVisibleIndex: number;
+        visibleSize: number;
+    };
+    computeVirtualY: (st: number, rowHeight: number) => {
+        toVisibleIndex: number;
+    };
     setFieldAuth: (key: string, value: IFieldAuthItem) => void;
     setResizeState: (option: ITableRef['resizeState']) => void;
     setSummaries: (option: ITableRef['summaries']) => void;
@@ -82,6 +92,7 @@ declare const useTableCore: <T extends ITableProps>(props: T, extra: IExtra) =>
     toFirstPage: () => void;
     getPageCount: () => number;
     pagerChangeHandle: ({ current, pageSize }: Omit<IPagination, 'total'>) => void;
+    triggerScrollXEvent: (sl: number) => void;
     triggerScrollYEvent: (st: number) => void;
     scrollBottomDebouncer: (...args: any[]) => void;
     clearTableSorter: () => void;

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

@@ -22,6 +22,7 @@ type IExtra = {
     setScrollX: (scrollX: boolean) => void;
     setScrollY: (scrollY: boolean) => void;
     setElementStore: (key: string, value: HTMLElement) => void;
+    setScrollXStore: (option: ITableRef['scrollXStore']) => void;
     setScrollYStore: (option: ITableRef['scrollYStore']) => void;
     setShouldToTop: (value: boolean) => void;
 };
@@ -39,6 +40,13 @@ declare const useTableLayout: <T extends ITableProps>(props: T, extra: IExtra) =
     rowInViewport: (index: number) => boolean;
     calcTableHeight: () => void;
     resetTableScroll: () => void;
+    computeVirtualX: (sl: number, tableWidth: number) => {
+        toVisibleIndex: number;
+        visibleSize: number;
+    };
+    computeVirtualY: (st: number, rowHeight: number) => {
+        toVisibleIndex: number;
+    };
     doLayout: () => void;
 };
 export default useTableLayout;

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import Store from '../store';
+import type { ScrollbarRef } from '../../../scrollbar/src/scrollbar';
 import type { getRowKeyType, IColumn, IDerivedRowKey, IFieldAuthItem, IMergeCell, InsertMode, IRecord, IRowKey, ITableProps } from '../table/types';
 import type { ComponentSize, Nullable } from '../../../_utils/types';
 export type ITableRef = {
@@ -17,6 +18,13 @@ export type ITableRef = {
     fieldAuth: Record<string, IFieldAuthItem>;
     mergeCells: IMergeCell[];
     columnsDefined: boolean;
+    scrollBarRef: React.RefObject<ScrollbarRef>;
+    scrollXStore: {
+        startIndex: number;
+        endIndex: number;
+        offsetSize: number;
+        visibleSize: number;
+    };
     scrollYStore: {
         startIndex: number;
         endIndex: number;
@@ -36,6 +44,7 @@ export type ITableRef = {
     };
     summaries: Record<string, number>;
     treeTable: boolean;
+    scrollXLoad: boolean;
     scrollYLoad: boolean;
     shouldToTop: boolean;
     selectionRows: IRecord[];
@@ -59,10 +68,12 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     setFieldAuth: (key: string, value: IFieldAuthItem) => void;
     setMergeCells: (values: IMergeCell[]) => void;
     setColumnsDefined: (value: boolean) => void;
+    setScrollXStore: (option: ITableRef['scrollXStore']) => void;
     setScrollYStore: (option: ITableRef['scrollYStore']) => void;
     setResizeState: (option: ITableRef['resizeState']) => void;
     setHandleState: (option: ITableRef['handleState']) => void;
     setSummaries: (option: ITableRef['summaries']) => void;
+    setScrollXLoad: (value: boolean) => void;
     setScrollYLoad: (value: boolean) => void;
     setShouldToTop: (value: boolean) => void;
     setSelectionRows: (selectKeys: IRecord[]) => void;
@@ -85,6 +96,13 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     fieldAuth: Record<string, IFieldAuthItem>;
     mergeCells: IMergeCell[];
     columnsDefined: boolean;
+    scrollBarRef: React.RefObject<ScrollbarRef>;
+    scrollXStore: {
+        startIndex: number;
+        endIndex: number;
+        offsetSize: number;
+        visibleSize: number;
+    };
     scrollYStore: {
         startIndex: number;
         endIndex: number;
@@ -104,6 +122,7 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     };
     summaries: Record<string, number>;
     treeTable: boolean;
+    scrollXLoad: boolean;
     scrollYLoad: boolean;
     shouldToTop: boolean;
     selectionRows: IRecord[];

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

@@ -1,7 +1,8 @@
 import React from 'react';
-import type { IFilter, IPagination, IRecord, IRowKey, ISorter, ISuperFilter, ITableProps } from '../table/types';
+import type { IColumn, IFilter, IPagination, IRecord, IRowKey, ISorter, ISuperFilter, ITableProps } from '../table/types';
 export type ITableState = {
     tableData: IRecord[];
+    tableFlatColumns: IColumn[];
     filters: IFilter;
     sorter: ISorter;
     superFilters: ISuperFilter[];
@@ -36,6 +37,8 @@ export type ITableState = {
 declare const useTableState: <T extends ITableProps>(props: T) => {
     tableData: IRecord<any>[];
     setTableData: React.Dispatch<React.SetStateAction<IRecord<any>[]>>;
+    tableFlatColumns: IColumn[];
+    setTableFlatColumns: React.Dispatch<React.SetStateAction<IColumn[]>>;
     filters: IFilter;
     setFilters: React.Dispatch<IFilter>;
     sorter: ISorter;

package/lib/table/style/table.less

@@ -44,7 +44,7 @@
     border-top: 1px solid @v-table-border-color;
   }
   &:after {
-    bottom: -1px;
+    bottom: 0;
     border-bottom: 1px solid @v-table-border-color;
   }
 
@@ -272,10 +272,19 @@
     .header--column,
     .body--column,
     .footer--column {
-      border-bottom: 1px solid @v-table-border-color;
-      border-right: 1px solid @v-table-border-color;
+      // border-bottom: 1px solid @v-table-border-color;
+      // border-right: 1px solid @v-table-border-color;
+      box-shadow: inset -1px -1px 0 @v-table-border-color;
       .box-sizing-content();
     }
+    .@{prefix-table}--body {
+      tbody > tr:nth-last-child(1) {
+        .body--column {
+          // border-bottom: 0;
+          box-shadow: inset -1px 0 0 @v-table-border-color;
+        }
+      }
+    }
   }
 
   &:not(.is--border) {
@@ -285,7 +294,8 @@
     }
     .header--column,
     .body--column {
-      border-bottom: 1px solid @v-table-border-color;
+      // border-bottom: 1px solid @v-table-border-color;
+      box-shadow: inset 0 -1px 0 @v-table-border-color;
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-design-react",
-  "version": "1.8.31",
+  "version": "1.9.0",
   "description": "A Component Library for React",
   "keywords": [
     "React",