dcp-design-react 1.9.23 → 1.9.24

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { TableBodyRef, IColumn, IDerivedRowKey, IFetchParams, IPagination, IRecord, IRowColSpan, IRowKey, IRule } from '../table/types';
+import type { TableBodyRef, IColumn, IDerivedRowKey, IFetchParams, IPagination, IRecord, IRowColSpan, IRowKey, IRule, IMergeCellItem, IMergedCell } from '../table/types';
 import type { ITableRef } from '../hooks/useTableRef';
 import type { ITableState } from '../hooks/useTableState';
 import type { ComponentSize } from '../../../_utils/types';
@@ -16,6 +16,8 @@ export type ITableContext = {
     sorter: ITableState['sorter'];
     filters: ITableState['filters'];
     superFilters: ITableState['superFilters'];
+    mergedTdCells: IMergedCell[];
+    derivedMergeCells: IMergeCellItem[];
     layout: ITableState['layout'];
     bordered: boolean;
     showFooter: boolean;
@@ -55,6 +57,7 @@ export type ITableContext = {
     setSelectionRows: (records: IRecord[]) => void;
     setSelectionKeysEffect: (rowKeys: IRowKey[]) => void;
     setInvalidRowKeys: (rowKeys: IRowKey[]) => void;
+    setMergedCells: (options: IMergedCell[]) => void;
     getSpan: (row: IRecord, column: IColumn, rowIndex: number, columnIndex: number, tableData: IRecord[]) => IRowColSpan;
     getStickyLeft: (dataIndex: string, part?: string) => number;
     getStickyRight: (dataIndex: string, part?: string) => number;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { ITableRef } from './useTableRef';
-import type { TableBodyRef, IColumn, IPagination, IRowKey, ITableProps, IDeriveRowKeys, IMergeCell } from '../table/types';
+import type { TableBodyRef, IColumn, IPagination, IRowKey, ITableProps, IDeriveRowKeys } from '../table/types';
 import type { ComponentSize } from '../../../_utils/types';
 type IExtra = {
     tableRef: React.MutableRefObject<ITableRef>;
@@ -27,7 +27,6 @@ type IExtra = {
     setRowExpandedKeys: (rowKeys: IRowKey[]) => void;
     setHighlightKey: (rowKey: IRowKey) => void;
     setResizeState: (option: ITableRef['resizeState']) => void;
-    setMergeCells: (values: IMergeCell[]) => void;
     setPingRight: (value: boolean) => void;
     setUnMounted: (value: boolean) => void;
     calcTableHeight: () => void;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { getRowKeyType } from '../table/types';
-import type { IColumn, IRecord, IRowKey, ITableProps } from '../table/types';
+import type { IColumn, IMergeCellItem, IRecord, IRowKey, ITableProps } from '../table/types';
 import type { ITableState } from './useTableState';
 import type { ITableRef } from './useTableRef';
 import type { ComponentSize } from '../../../_utils/types';
@@ -13,6 +13,7 @@ type IExtra = {
     tableColumns: IColumn[];
     flattenColumns: IColumn[];
     leftFixedColumns: IColumn[];
+    derivedMergeCells: IMergeCellItem[];
     layout: ITableState['layout'];
     scrollX: boolean;
     scrollY: boolean;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ITableProps, IColumn, IRowKey, IRecord, getRowKeyType, IFetchParams, ISorter, IFilter, IPagination, ISuperFilter } from '../table/types';
+import type { ITableProps, IColumn, IRowKey, IRecord, getRowKeyType, IFetchParams, ISorter, IFilter, IPagination, ISuperFilter, IMergedCell, IMergeCellItem } from '../table/types';
 import type { ITableRef } from './useTableRef';
 type IExtra = {
     getRowKey: getRowKeyType;
@@ -11,6 +11,7 @@ type IExtra = {
     superFilters: ISuperFilter[];
     selectionKeys: IRowKey[];
     pagination: IPagination;
+    mergedTdCells: IMergedCell[];
 };
 declare const useTableMemo: <T extends ITableProps>(props: T, extra: IExtra) => {
     isFetch: boolean;
@@ -24,6 +25,7 @@ declare const useTableMemo: <T extends ITableProps>(props: T, extra: IExtra) =>
     summationColumns: IColumn[];
     leftFixedColumns: IColumn[];
     rightFixedColumns: IColumn[];
+    derivedMergeCells: IMergeCellItem[];
     treeExpandIndex: string;
     showSummary: boolean;
     showFooter: boolean;

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

@@ -2,7 +2,7 @@ import React from 'react';
 import TableManager from '../manager';
 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 { getRowKeyType, IColumn, IDerivedRowKey, IFieldAuthItem, InsertMode, IRecord, IRowKey, ITableProps } from '../table/types';
 import type { ComponentSize, Nullable } from '../../../_utils/types';
 export type ITableRef = {
     props: ITableProps;
@@ -19,7 +19,6 @@ export type ITableRef = {
     flattenRowKeys: IRowKey[];
     invalidRowKeys: IRowKey[];
     fieldAuth: Record<string, IFieldAuthItem>;
-    mergedCells: IMergeCell[];
     columnsDefined: boolean;
     scrollBarRef: React.RefObject<ScrollbarRef>;
     scrollXStore: {
@@ -69,7 +68,6 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     setDeriveRowKeys: (records: IRecord[]) => void;
     setInvalidRowKeys: (rowKeys: IRowKey[]) => void;
     setFieldAuth: (key: string, value: IFieldAuthItem) => void;
-    setMergeCells: (values: IMergeCell[]) => void;
     setColumnsDefined: (value: boolean) => void;
     setScrollXStore: (option: ITableRef['scrollXStore']) => void;
     setScrollYStore: (option: ITableRef['scrollYStore']) => void;
@@ -98,7 +96,6 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     flattenRowKeys: IRowKey[];
     invalidRowKeys: IRowKey[];
     fieldAuth: Record<string, IFieldAuthItem>;
-    mergedCells: IMergeCell[];
     columnsDefined: boolean;
     scrollBarRef: React.RefObject<ScrollbarRef>;
     scrollXStore: {

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IColumn, IFilter, IPagination, IRecord, IRowKey, ISorter, ISuperFilter, ITableProps } from '../table/types';
+import type { IColumn, IFilter, IMergedCell, IPagination, IRecord, IRowKey, ISorter, ISuperFilter, ITableProps } from '../table/types';
 export type ITableState = {
     tableData: IRecord[];
     tableFlatColumns: IColumn[];
@@ -11,6 +11,7 @@ export type ITableState = {
     rowExpandedKeys: IRowKey[];
     highlightKey: IRowKey;
     updateMark: number;
+    mergedTdCells: IMergedCell[];
     layout: {
         gutterWidth: number;
         tableWidth: number;
@@ -55,6 +56,8 @@ declare const useTableState: <T extends ITableProps>(props: T) => {
     setHighlightKey: React.Dispatch<React.SetStateAction<string | number>>;
     updateMark: number;
     forceUpdate: React.DispatchWithoutAction;
+    mergedTdCells: IMergedCell[];
+    setMergedCells: (updater: IMergedCell[] | ((origin: IMergedCell[]) => IMergedCell[])) => void;
     layout: {
         gutterWidth: number;
         tableWidth: number;

package/lib/table/src/table/types.d.ts

@@ -33,7 +33,11 @@ export type IRowColSpan = {
     rowSpan: number;
     colSpan: number;
 };
-export type IMergeCell = {
+export type IMergedCell = {
+    rowKey: IRowKey;
+    dataIndex: string;
+} & IRowColSpan;
+export type IMergeCellItem = {
     row: number;
     col: number;
 } & IRowColSpan;
@@ -219,7 +223,7 @@ export type IExpandable = {
 };
 export type IAreaSelection = {
     cellMerge?: boolean;
-    onCellMerge?: (cells: IMergeCell[]) => void;
+    onCellMerge?: (cells: IMergedCell[]) => void;
 };
 export type ISummation = {
     groupItems?: Array<{
@@ -348,7 +352,7 @@ export type ITableProps = {
     nativeScrollBar?: boolean;
     rowStyle?: CSSProperties | ((row: IRecord, rowIndex: number) => CSSProperties);
     cellStyle?: CSSProperties | ((row: IRecord, column: IColumn, rowIndex: number, columnIndex: number) => CSSProperties);
-    mergedCells?: IMergeCell[];
+    mergedCells?: IMergedCell[];
     spanMethod?: (options: {
         row: IRecord;
         column: IColumn;

package/lib/table/style/area-select.less

@@ -2,7 +2,7 @@
  * @Author: 焦质晔
  * @Date: 2024-07-23 09:27:27
  * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-07-24 13:32:48
+ * @Last Modified time: 2024-07-26 08:39:21
  */
 .@{prefix-table}--area-select {
   position: static;
@@ -10,7 +10,7 @@
   font-size: 0;
   .checked-area {
     border: 1px solid @--primary-5;
-    background-color: rgba(@--primary-2, 0.35);
+    background-color: rgba(@--primary-2, 0.25);
     position: absolute;
     z-index: 2;
     pointer-events: none;

package/package.json

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

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

@@ -1,7 +0,0 @@
-import React from 'react';
-declare const useMergeCell: () => {
-    dragStart: (ev: any) => void;
-    renderDragPanel: () => React.JSX.Element;
-    closeDragPanel: () => void;
-};
-export default useMergeCell;