@jiaozhiye/qm-design-react 1.9.21 → 1.9.23

package/lib/table/src/area-select/index.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+export type AreaSelectRef = {
+    blur: () => void;
+};
+declare const AreaSelect: React.ForwardRefExoticComponent<React.RefAttributes<AreaSelectRef>>;
+export default AreaSelect;

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

@@ -40,7 +40,6 @@ export type ITableContext = {
     isTreeTable: boolean;
     isGroupSubtotal: boolean;
     isWebPagination: boolean;
-    isDragMergeCell: boolean;
     dataChange: () => void;
     tableChange: () => void;
     getTableData: () => Promise<void>;

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

@@ -7,6 +7,8 @@ import type { ComponentSize } from '../../../_utils/types';
 type IExtra = {
     getRowKey: getRowKeyType;
     tableRef: React.MutableRefObject<ITableRef>;
+    topElementRef: React.RefObject<HTMLDivElement>;
+    tableElementRef: React.RefObject<HTMLDivElement>;
     $size: ComponentSize;
     tableColumns: IColumn[];
     flattenColumns: IColumn[];
@@ -26,7 +28,7 @@ type IExtra = {
     setShouldToTop: (value: boolean) => void;
 };
 declare const useTableLayout: <T extends ITableProps>(props: T, extra: IExtra) => {
-    createElementStore: (option: Record<string, HTMLElement>) => void;
+    createElementStore: () => void;
     tableStyles: React.CSSProperties;
     getSpan: (row: IRecord, column: IColumn, rowIndex: number, columnIndex: number, tableData: IRecord[]) => {
         rowSpan: number;

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

@@ -39,7 +39,6 @@ declare const useTableMemo: <T extends ITableProps>(props: T, extra: IExtra) =>
     isFastSearch: boolean;
     isGroupSummary: boolean;
     isGroupSubtotal: boolean;
-    isDragMergeCell: boolean;
     isTreeTable: boolean;
     isTableEmpty: boolean;
     summationRows: Record<string, string | number>[];

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

@@ -19,7 +19,7 @@ export type ITableRef = {
     flattenRowKeys: IRowKey[];
     invalidRowKeys: IRowKey[];
     fieldAuth: Record<string, IFieldAuthItem>;
-    mergeCells: IMergeCell[];
+    mergedCells: IMergeCell[];
     columnsDefined: boolean;
     scrollBarRef: React.RefObject<ScrollbarRef>;
     scrollXStore: {
@@ -98,7 +98,7 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     flattenRowKeys: IRowKey[];
     invalidRowKeys: IRowKey[];
     fieldAuth: Record<string, IFieldAuthItem>;
-    mergeCells: IMergeCell[];
+    mergedCells: IMergeCell[];
     columnsDefined: boolean;
     scrollBarRef: React.RefObject<ScrollbarRef>;
     scrollXStore: {

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

@@ -143,10 +143,9 @@ export declare const propTypes: {
     nativeScrollBar: PropTypes.Requireable<boolean>;
     rowStyle: PropTypes.Requireable<object>;
     cellStyle: PropTypes.Requireable<object>;
-    mergeCells: PropTypes.Requireable<any[]>;
+    mergedCells: PropTypes.Requireable<any[]>;
     spanMethod: PropTypes.Requireable<(...args: any[]) => any>;
     rowDraggable: PropTypes.Requireable<boolean>;
-    dragMergeCell: PropTypes.Requireable<boolean>;
     initialSorter: PropTypes.Requireable<object>;
     initialFilter: PropTypes.Requireable<object>;
     rowSelection: PropTypes.Requireable<PropTypes.InferProps<{
@@ -199,6 +198,10 @@ export declare const propTypes: {
         onExpand: PropTypes.Requireable<(...args: any[]) => any>;
         onChange: PropTypes.Requireable<(...args: any[]) => any>;
     }>>;
+    areaSelection: PropTypes.Requireable<PropTypes.InferProps<{
+        cellMerge: PropTypes.Requireable<boolean>;
+        onCellMerge: PropTypes.Requireable<(...args: any[]) => any>;
+    }>>;
     summation: PropTypes.Requireable<PropTypes.InferProps<{
         groupItems: PropTypes.Requireable<(PropTypes.InferProps<{
             dataIndex: PropTypes.Validator<string>;
@@ -275,7 +278,6 @@ export declare const propTypes: {
     onRowEnter: PropTypes.Requireable<(...args: any[]) => any>;
     onScrollEnd: PropTypes.Requireable<(...args: any[]) => any>;
     onFetchError: PropTypes.Requireable<(...args: any[]) => any>;
-    onMergeChange: PropTypes.Requireable<(...args: any[]) => any>;
 };
 export declare const defaultProps: ITableProps;
 /**

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

@@ -36,9 +36,7 @@ export type IRowColSpan = {
 export type IMergeCell = {
     row: number;
     col: number;
-    rowSpan: number;
-    colSpan: number;
-};
+} & IRowColSpan;
 export declare enum EAlign {
     left = "flex-start",
     right = "flex-end"
@@ -219,6 +217,10 @@ export type IExpandable = {
     onExpand?: (expand: boolean, row: IRecord) => void;
     onChange?: (expandedKeys: IRowKey[], expandedRows: IRecord[]) => void;
 };
+export type IAreaSelection = {
+    cellMerge?: boolean;
+    onCellMerge?: (cells: IMergeCell[]) => void;
+};
 export type ISummation = {
     groupItems?: Array<{
         dataIndex: string;
@@ -346,7 +348,7 @@ export type ITableProps = {
     nativeScrollBar?: boolean;
     rowStyle?: CSSProperties | ((row: IRecord, rowIndex: number) => CSSProperties);
     cellStyle?: CSSProperties | ((row: IRecord, column: IColumn, rowIndex: number, columnIndex: number) => CSSProperties);
-    mergeCells?: IMergeCell[];
+    mergedCells?: IMergeCell[];
     spanMethod?: (options: {
         row: IRecord;
         column: IColumn;
@@ -354,7 +356,6 @@ export type ITableProps = {
         columnIndex: number;
         tableData: IRecord[];
     }) => IRowColSpan | [number, number];
-    dragMergeCell?: boolean;
     rowDraggable?: boolean;
     initialSorter?: ISorter;
     initialFilter?: IFilter;
@@ -363,6 +364,7 @@ export type ITableProps = {
     tableConfig?: ITableConfig;
     treeConfig?: ITreeConfig;
     expandable?: IExpandable;
+    areaSelection?: IAreaSelection;
     summation?: ISummation;
     footRender?: (flattenColumns: IColumn[], tableData: IRecord[]) => React.ReactNode;
     multipleSort?: boolean;
@@ -405,7 +407,6 @@ export type ITableProps = {
     onRowEnter?: (row: IRecord, event: KeyboardEvent) => void;
     onScrollEnd?: (event: React.MouseEvent<HTMLDivElement>) => void;
     onFetchError?: (error: any) => void;
-    onMergeChange?: (cells: IMergeCell[]) => void;
 };
 export type TableRef = {
     CALCULATE_HEIGHT: () => void;

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

@@ -0,0 +1,29 @@
+/*
+ * @Author: 焦质晔
+ * @Date: 2024-07-23 09:27:27
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2024-07-24 13:32:48
+ */
+.@{prefix-table}--area-select {
+  position: static;
+  height: 0;
+  font-size: 0;
+  .checked-area {
+    border: 1px solid @--primary-5;
+    background-color: rgba(@--primary-2, 0.35);
+    position: absolute;
+    z-index: 2;
+    pointer-events: none;
+  }
+  .active-area {
+    border: 2px solid @--primary-5;
+    position: absolute;
+    z-index: 2;
+    pointer-events: none;
+  }
+  .context-menu {
+    position: absolute;
+    z-index: 3;
+    background-color: #fff;
+  }
+}

package/lib/table/style/index.less

@@ -1,29 +1,30 @@
-/*
- * @Author: 焦质晔
- * @Date: 2021-07-23 19:05:57
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2022-03-16 19:06:00
- */
-@import './variable.less';
-@import './toper.less';
-@import './alert.less';
-@import './full-screen.less';
-@import './reload.less';
-@import './print.less';
-@import './import.less';
-@import './export.less';
-@import './clipboard.less';
-@import './tollbox.less';
-@import './select-collection.less';
-@import './group-summary.less';
-@import './super-search.less';
-@import './fast-search.less';
-@import './column-filter.less';
-@import './table.less';
-@import './header.less';
-@import './body.less';
-@import './footer.less';
-@import './pager.less';
-@import './empty.less';
-@import './expandable.less';
-@import './size.less';
+/*
+ * @Author: 焦质晔
+ * @Date: 2021-07-23 19:05:57
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2024-07-23 09:28:50
+ */
+@import './variable.less';
+@import './toper.less';
+@import './alert.less';
+@import './full-screen.less';
+@import './reload.less';
+@import './print.less';
+@import './import.less';
+@import './export.less';
+@import './clipboard.less';
+@import './tollbox.less';
+@import './select-collection.less';
+@import './group-summary.less';
+@import './super-search.less';
+@import './fast-search.less';
+@import './column-filter.less';
+@import './table.less';
+@import './header.less';
+@import './body.less';
+@import './footer.less';
+@import './area-select.less';
+@import './pager.less';
+@import './empty.less';
+@import './expandable.less';
+@import './size.less';