@jiaozhiye/qm-design-react 1.7.53 → 1.7.55

package/lib/table/src/column-filter/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import type { IColumn } from '../table/types';
+import type { ColumnDefineRef, IColumn } from '../table/types';
 type IColumnFilterProps = {
     columns: IColumn[];
 };
-declare const ColumnFilter: React.FC<IColumnFilterProps>;
+declare const ColumnFilter: React.ForwardRefExoticComponent<IColumnFilterProps & React.RefAttributes<ColumnDefineRef>>;
 export default ColumnFilter;

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

@@ -1,12 +1,13 @@
 import React from 'react';
 import type { ITableRef } from './useTableRef';
-import type { getRowKeyType, ITableProps, IColumn, IFetchParams, IPagination, IRecord, IRowKey, IRule, IValidItem, TableRef, ToolBoxRef, TableBodyRef } from '../table/types';
+import type { getRowKeyType, ITableProps, IColumn, IFetchParams, IPagination, IRecord, IRowKey, IRule, IValidItem, TableRef, ToolBoxRef, TableBodyRef, ColumnDefineRef } from '../table/types';
 type IExtra = {
     getRowKey: getRowKeyType;
     tableProps: ITableProps;
     tableRef: React.MutableRefObject<ITableRef>;
     toolBoxRef: React.RefObject<ToolBoxRef>;
     tableBodyRef: React.RefObject<TableBodyRef>;
+    columnFilterRef: React.RefObject<ColumnDefineRef>;
     flattenColumns: IColumn[];
     editableColumns: IColumn[];
     pagination: IPagination;
@@ -25,6 +26,7 @@ type IExtra = {
     doFieldValidate: (rules: IRule[], val: unknown, rowKey: IRowKey, columnKey: string) => void;
     setHandleState: (option: ITableRef['handleState']) => void;
     forceUpdate: () => void;
+    setColumnsDefined: (value: boolean) => void;
     setSelectionKeysEffect: (rowKeys: IRowKey[]) => void;
     setRowExpandedKeys: (rowKeys: IRowKey[]) => void;
     setHighlightKey: (rowKey: IRowKey) => void;

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

@@ -15,6 +15,7 @@ export type ITableRef = {
     invalidRowKeys: IRowKey[];
     fieldAuth: Record<string, IFieldAuthItem>;
     mergeCells: IMergeCell[];
+    columnsDefined: boolean;
     scrollYStore: {
         startIndex: number;
         endIndex: number;
@@ -56,6 +57,7 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     setInvalidRowKeys: (rowKeys: IRowKey[]) => void;
     setFieldAuth: (key: string, value: IFieldAuthItem) => void;
     setMergeCells: (values: IMergeCell[]) => void;
+    setColumnsDefined: (value: boolean) => void;
     setScrollYStore: (option: ITableRef['scrollYStore']) => void;
     setResizeState: (option: ITableRef['resizeState']) => void;
     setHandleState: (option: ITableRef['handleState']) => void;
@@ -80,6 +82,7 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     invalidRowKeys: IRowKey[];
     fieldAuth: Record<string, IFieldAuthItem>;
     mergeCells: IMergeCell[];
+    columnsDefined: boolean;
     scrollYStore: {
         startIndex: number;
         endIndex: number;

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

@@ -137,6 +137,7 @@ export declare const propTypes: {
     customClass: PropTypes.Requireable<string>;
     showHeader: PropTypes.Requireable<boolean>;
     ellipsis: PropTypes.Requireable<boolean>;
+    dynamicThead: PropTypes.Requireable<boolean>;
     nativeScrollBar: PropTypes.Requireable<boolean>;
     rowStyle: PropTypes.Requireable<object>;
     cellStyle: PropTypes.Requireable<object>;

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

@@ -334,6 +334,7 @@ export type ITableProps = {
     customClass?: string;
     showHeader?: boolean;
     ellipsis?: boolean;
+    dynamicThead?: boolean;
     nativeScrollBar?: boolean;
     rowStyle?: CSSProperties | ((row: IRecord, rowIndex: number) => CSSProperties);
     cellStyle?: CSSProperties | ((row: IRecord, column: IColumn, rowIndex: number, columnIndex: number) => CSSProperties);
@@ -436,6 +437,9 @@ export type TableBodyRef = {
     createFocus: (rowKey: IRowKey, dataIndex: string) => void;
     forceUpdate: () => void;
 };
+export type ColumnDefineRef = {
+    initialHandler: () => void;
+};
 export type ToolBoxRef = {
     exportHandle: () => void;
 };

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

@@ -41,3 +41,4 @@ export declare const deepGetRowkey: (arr: any[], value: IRowKey) => IRowKey[] |
 export declare const deepFindRecord: (arr: IRecord[], fn: (node: IRecord) => boolean) => Nullable<IRecord>;
 export declare const deepTreeFilter: (tree: any[], fn: (node: unknown) => boolean) => any[];
 export declare const flatToTree: (list: any[], id: string, pid: string) => any[];
+export declare const sortableFormatter: <T>(items: T[]) => T[];

package/lib/table/style/column-filter.less

@@ -24,10 +24,26 @@
 
 .column-filter__popper {
   padding: 0 !important;
+  min-width: 150px;
+  max-width: 200px;
+}
+
+.column-item__popper {
+  padding-right: @v-module-distance !important;
+  min-width: 150px;
+  max-width: 200px;
+  .ant-popover-arrow {
+    display: none;
+  }
+  .ant-popover-inner-content {
+    padding: 0;
+  }
+}
+
+.column-filter__popper,
+.column-item__popper {
   .column-filter--wrap {
     padding: 5px @v-module-distance;
-    min-width: 150px;
-    max-width: 200px;
     overflow-y: auto;
     .box-sizing-content();
     li.item {

package/lib/watermark/style/index.less

@@ -1,6 +1,6 @@
-/*
- * @Author: 焦质晔
- * @Date: 2023-12-14 13:24:17
- * @Last Modified by:   焦质晔
- * @Last Modified time: 2023-12-14 13:24:17
- */
+/*
+ * @Author: 焦质晔
+ * @Date: 2023-12-14 13:24:17
+ * @Last Modified by:   焦质晔
+ * @Last Modified time: 2023-12-14 13:24:17
+ */

package/package.json

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