@jiaozhiye/qm-design-react 1.11.25 → 1.12.0

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

@@ -18,6 +18,7 @@ export type ITableContext = {
     sorter: ITableState['sorter'];
     filters: ITableState['filters'];
     superFilters: ITableState['superFilters'];
+    pagerFilter: ITableState['pagerFilter'];
     activedCell: ITableState['activedCell'];
     mergedTdCells: IMergedCell[];
     derivedMergeCells: IMergeCellItem[];
@@ -46,12 +47,15 @@ export type ITableContext = {
     tableChange: () => void;
     getTableData: () => Promise<void>;
     setElementStore: (key: string, value: HTMLElement) => void;
-    createTableList: () => IRecord[];
     createTableFullData: (records: IRecord[]) => void;
+    createTableFlatData: () => void;
+    createWebPageData: () => IRecord[];
+    createAllExpandedKeys: () => IRowKey[];
     updateTableFlatData: () => void;
     setSorter: (value: ITableState['sorter']) => void;
     setFilters: (value: ITableState['filters']) => void;
     setSuperFilters: (options: ITableState['superFilters']) => void;
+    setPagerFilter: (value: ITableState['pagerFilter']) => void;
     setHighlightKey: (rowKey: IRowKey) => void;
     setRowExpandedKeys: (rowKeys: IRowKey[]) => void;
     setSelectionRows: (records: IRecord[]) => void;
@@ -77,6 +81,7 @@ export type ITableContext = {
     clearTableSorter: () => void;
     clearTableFilter: () => void;
     clearSuperFilters: () => void;
+    clearPagerFilter: () => void;
     clearRowSelection: () => void;
     clearRowHighlight: () => void;
 };

package/lib/table/src/filter/CheckboxPanel.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { IColumn } from '../table/types';
+type IProps = {
+    column: IColumn;
+};
+declare const CheckboxPanel: React.FC<IProps>;
+export default CheckboxPanel;

package/lib/table/src/filter/DatePanel.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import { type IColumn } from '../table/types';
+type IProps = {
+    column: IColumn;
+};
+declare const DatePanel: React.FC<IProps>;
+export default DatePanel;

package/lib/table/src/filter/FooterPanel.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+import type { ValueOf } from '../../../_utils/types';
+import type { IFilter } from '../table/types';
+type IProps = {
+    value?: ValueOf<IFilter> | null;
+    style?: React.CSSProperties;
+};
+export type FooterRef = {
+    doFinish: (value?: IProps[`value`], close?: boolean) => void;
+};
+declare const FooterPanel: React.ForwardRefExoticComponent<IProps & React.RefAttributes<FooterRef>>;
+export default FooterPanel;

package/lib/table/src/filter/ListPanel.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+import type { IColumn } from '../table/types';
+import type { IDict } from '../../../_utils/types';
+type IProps = {
+    column: IColumn;
+    isEnum?: boolean;
+    style?: React.CSSProperties;
+    onChange?: (values: Array<IDict[`value`]>, allSelected: boolean) => void;
+};
+declare const ListPanel: React.FC<IProps>;
+export default ListPanel;

package/lib/table/src/filter/NilPanel.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import type { ValueOf } from '../../../_utils/types';
+import type { IFilter } from '../table/types';
+type IProps = {
+    style?: React.CSSProperties;
+    onChange: (val: ValueOf<IFilter>) => void;
+};
+declare const NilPanel: React.FC<IProps>;
+export default NilPanel;

package/lib/table/src/filter/NumberPanel.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { IColumn } from '../table/types';
+type IProps = {
+    column: IColumn;
+};
+declare const NumberPanel: React.FC<IProps>;
+export default NumberPanel;

package/lib/table/src/filter/TextAreaPanel.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { IColumn } from '../table/types';
+type IProps = {
+    column: IColumn;
+};
+declare const TextAreaPanel: React.FC<IProps>;
+export default TextAreaPanel;

package/lib/table/src/filter/TextPanel.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { IColumn } from '../table/types';
+type IProps = {
+    column: IColumn;
+};
+declare const TextPanel: React.FC<IProps>;
+export default TextPanel;

package/lib/table/src/filter/TreePanel.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { IColumn } from '../table/types';
+type IProps = {
+    column: IColumn;
+};
+declare const TreePanel: React.FC<IProps>;
+export default TreePanel;

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

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const FilterContext: React.Context<Record<string, any>>;
+export default FilterContext;

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

@@ -1,5 +1,5 @@
 import type { IRecord } from '../table/types';
-export declare const stringify: (string: any, separator?: string) => any;
+export declare const stringify: (string: any, separator: any) => any;
 export declare const array_format: (array: any) => string;
 export declare const isBracketBalance: (str: any) => boolean;
 export declare const where: <T extends IRecord<any>>(array: T[], query: string, isTree?: boolean) => T[];

package/lib/table/src/filter-sql/lib/filter_string.d.ts

@@ -1,8 +1,6 @@
 declare const _default: {
-    operations: (string: any) => any[];
-    number_operations: (string: any) => any;
     string_format: (string: any) => any;
-    stringify: (string: any, separator?: string) => any;
+    stringify: (string: any, separator: any) => any;
     array_format: (array: any) => string;
     operation_format: (string: any) => any;
     find_replace: (string: any, find: any, replace: any) => any;

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

@@ -44,6 +44,7 @@ type IExtra = {
     clearTableSorter: () => void;
     clearTableFilter: () => void;
     clearSuperFilters: () => void;
+    clearPagerFilter: () => void;
     clearTableLog: () => void;
 };
 declare const useImperativeMethod: <T extends React.ForwardedRef<TableRef>>(ref: T, extra: IExtra) => void;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { ITableRef } from './useTableRef';
 import type { ITableState } from './useTableState';
-import type { getRowKeyType, IColumn, IFetchParams, IFieldAuthItem, IFilter, IPagination, IRecord, IRowKey, IRule, ISorter, ISuperFilter, ITableProps, IValidItem, TableBodyRef } from '../table/types';
+import type { getRowKeyType, IColumn, IFetchParams, IFieldAuthItem, IFilter, IPagination, IRecord, IRowKey, IRule, ISorter, ISuperFilter, ITableProps, IValidItem, TableBodyRef, IPageFilter } from '../table/types';
 import type { ComponentSize } from '../../../_utils/types';
 type IExtra = {
     getRowKey: getRowKeyType;
@@ -17,6 +17,7 @@ type IExtra = {
     filters: IFilter;
     sorter: ISorter;
     superFilters: ISuperFilter[];
+    pagerFilter: IPageFilter;
     fetchParams: IFetchParams;
     selectionKeys: IRowKey[];
     rowExpandedKeys: IRowKey[];
@@ -31,7 +32,7 @@ type IExtra = {
     setTableFullData: (records: IRecord[]) => void;
     setTableOriginData: (records: IRecord[]) => void;
     setTableFlatData: (records: IRecord[]) => void;
-    setAllTableData: (records: IRecord[]) => void;
+    setTableDataMaps: (records: IRecord[]) => void;
     setDeriveRowKeys: (records: IRecord[]) => void;
     setPagination: <T extends IPagination>(pagination: T | ((prev: T) => T)) => void;
     setPingRight: (value: boolean) => void;
@@ -40,29 +41,31 @@ type IExtra = {
     setSorter: (sorter: ITableState['sorter']) => void;
     setFilters: (sorter: ITableState['filters']) => void;
     setSuperFilters: (options: ITableState['superFilters']) => void;
+    setPagerFilter: (options: ITableState['pagerFilter']) => void;
     setSelectionKeys: (rowKeys: IRowKey[]) => void;
     setRowExpandedKeys: (rowKeys: IRowKey[]) => void;
     setHighlightKey: (rowKey: IRowKey) => void;
     setSelectionRows: (records: IRecord[]) => void;
+    setFilteredTreeData: (records: IRecord[]) => void;
     setScrollXLoad: (value: boolean) => void;
     setScrollYLoad: (value: boolean) => void;
     setFieldAuth: (key: string, value: IFieldAuthItem) => void;
     setResizeState: (option: ITableRef['resizeState']) => void;
     setSummaries: (option: ITableRef['summaries']) => void;
     setPermission: <T extends ITableState['permission']>(option: T | ((prev: T) => T)) => void;
-    setRecordsMap: (key: IRowKey, value: IRecord) => void;
     resetTableScroll: () => void;
     clearElementStore: () => void;
-    clearRecordsMap: () => void;
 };
 declare const useTableCore: <T extends ITableProps>(props: T, extra: IExtra) => {
     initialTable: () => void;
     checkDataIndex: () => void;
     createTableFullData: (list: IRecord[]) => void;
+    createWebPageData: () => IRecord<any>[];
     getTableData: () => Promise<void>;
-    createTableList: () => IRecord<any>[];
     createTableData: (list: IRecord[]) => void;
+    createTableFlatData: () => void;
     createGroupData: (list: IRecord[]) => IRecord<any>[];
+    createAllExpandedKeys: () => (string | number)[];
     setSelectionKeysEffect: (selectedKeys: IRowKey[]) => void;
     doFieldValidate: (rules: IRule[], val: unknown, rowKey: IRowKey, columnKey: string, columnTitle: string) => void;
     getTableLog: () => {
@@ -82,6 +85,7 @@ declare const useTableCore: <T extends ITableProps>(props: T, extra: IExtra) =>
     clearTableSorter: () => void;
     clearTableFilter: () => void;
     clearSuperFilters: () => void;
+    clearPagerFilter: () => void;
     clearRowSelection: () => void;
     clearRowHighlight: () => void;
     clearTableLog: () => void;

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

@@ -12,9 +12,6 @@ export type ITableRef = {
     originColumns: IColumn[];
     tableFullData: IRecord[];
     tableOriginData: IRecord[];
-    allTableData: IRecord[];
-    allRowKeys: IRowKey[];
-    allParentRowKeys: IRowKey[];
     deriveRowKeys: IDerivedRowKey[];
     invalidRowKeys: IRowKey[];
     fieldAuth: Record<string, IFieldAuthItem>;
@@ -37,6 +34,7 @@ export type ITableRef = {
     scrollYLoad: boolean;
     selectionRows: IRecord[];
     recordsMap: Map<IRowKey, IRecord>;
+    filteredTreeData: IRecord[];
     unMounted: boolean;
     isIE: boolean;
 };
@@ -49,7 +47,7 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     setOriginColumns: (columns: IColumn[]) => void;
     setTableFullData: (records: IRecord[]) => void;
     setTableOriginData: (records: IRecord[]) => void;
-    setAllTableData: (records: IRecord[]) => void;
+    setTableDataMaps: (records: IRecord[]) => void;
     setDeriveRowKeys: (records: IRecord[]) => void;
     setInvalidRowKeys: (rowKeys: IRowKey[]) => void;
     setFieldAuth: (key: string, value: IFieldAuthItem) => void;
@@ -60,10 +58,9 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     setScrollXLoad: (value: boolean) => void;
     setScrollYLoad: (value: boolean) => void;
     setSelectionRows: (selectKeys: IRecord[]) => void;
-    setRecordsMap: (key: IRowKey, value: IRecord) => void;
+    setFilteredTreeData: (records: IRecord[]) => void;
     setUnMounted: (value: boolean) => void;
     clearElementStore: () => void;
-    clearRecordsMap: () => void;
     props: ITableProps;
     uid: string;
     tableManager: typeof TableManager;
@@ -71,9 +68,6 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     originColumns: IColumn[];
     tableFullData: IRecord[];
     tableOriginData: IRecord[];
-    allTableData: IRecord[];
-    allRowKeys: IRowKey[];
-    allParentRowKeys: IRowKey[];
     deriveRowKeys: IDerivedRowKey[];
     invalidRowKeys: IRowKey[];
     fieldAuth: Record<string, IFieldAuthItem>;
@@ -96,6 +90,7 @@ declare const useTableRef: <T extends ITableProps>(props: T, { getRowKey, $size
     scrollYLoad: boolean;
     selectionRows: IRecord[];
     recordsMap: Map<IRowKey, IRecord>;
+    filteredTreeData: IRecord[];
     unMounted: boolean;
     isIE: boolean;
     tableRef: React.MutableRefObject<ITableRef>;

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

@@ -1,10 +1,11 @@
 import React from 'react';
-import type { IFilter, IMergedCell, IPagination, IRecord, IRowKey, ISearchResult, ISorter, ISuperFilter, ITableProps } from '../table/types';
+import type { IFilter, IMergedCell, IPageFilter, IPagination, IRecord, IRowKey, ISearchResult, ISorter, ISuperFilter, ITableProps } from '../table/types';
 export type ITableState = {
     tableFlatData: IRecord[];
     filters: IFilter;
     sorter: ISorter;
     superFilters: ISuperFilter[];
+    pagerFilter: IPageFilter;
     pagination: IPagination;
     selectionKeys: IRowKey[];
     rowExpandedKeys: IRowKey[];
@@ -42,6 +43,8 @@ declare const useTableState: <T extends ITableProps>(props: T) => {
     setSorter: React.Dispatch<ISorter>;
     superFilters: ISuperFilter[];
     setSuperFilters: React.Dispatch<ISuperFilter[]>;
+    pagerFilter: IPageFilter;
+    setPagerFilter: React.Dispatch<IPageFilter>;
     pagination: Required<Pick<import("../table/types").IPaginationConfig, "total" | "current" | "pageSize">>;
     setPagination: React.Dispatch<React.SetStateAction<Required<Pick<import("../table/types").IPaginationConfig, "total" | "current" | "pageSize">>>>;
     selectionKeys: (string | number)[];

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

@@ -184,6 +184,7 @@ export declare const propTypes: {
         virtual: PropTypes.Requireable<boolean>;
         overscan: PropTypes.Requireable<number>;
         doubleXScrollbar: PropTypes.Requireable<boolean>;
+        openFetchFilterList: PropTypes.Requireable<boolean>;
     }>>;
     treeConfig: PropTypes.Requireable<PropTypes.InferProps<{
         expandIconColumn: PropTypes.Requireable<string>;

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

@@ -76,6 +76,9 @@ export type IValidItem = {
 export type IFilter = {
     [key: string]: Record<string, any>;
 };
+export type IPageFilter = {
+    [key: string]: string[];
+};
 export type ISorter = {
     [key: string]: Nullable<string>;
 };
@@ -218,6 +221,7 @@ export type ITableConfig = {
     virtual?: boolean;
     overscan?: number;
     doubleXScrollbar?: boolean;
+    openFetchFilterList?: boolean;
 };
 export type ITreeConfig = {
     expandIconColumn?: string;
@@ -338,7 +342,8 @@ export type IDerivedRowKey = {
     level: number;
     rowKey: IRowKey;
     indexPath: string;
-    parentRowKey?: IRowKey;
+    parentRowKey: Nullable<IRowKey>;
+    isLeaf?: number;
     children?: IDerivedRowKey[];
 };
 export type ITableProps = {

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

@@ -11,13 +11,13 @@ export declare const findFirstColumn: (column: IColumn) => IColumn;
 export declare const findLastColumn: (column: IColumn) => IColumn;
 export declare const filterTableColumns: (columns: IColumn[], marks: string[]) => IColumn[];
 export declare const deepFindRowKey: (rowKeys: IDerivedRowKey[], mark: IRowKey) => Nullable<IDerivedRowKey>;
-export declare const tableDataFlatMap: (list: IRecord[]) => IRecord[];
 export declare const getAllTableData: (list: IRecord[]) => IRecord[];
 export declare const getAllParentKeys: (tree: IRecord[], fn: (data: IRecord) => IRowKey) => (string | number)[];
 export declare const getChildKeys: (node: IRecord, fn: (data: IRecord) => IRowKey) => (string | number)[];
 export declare const convertToRows: (columns: IColumn[]) => IColumn[][];
 export declare const deepGetTreeRows: (treeData: IRecord[], fn: (row: IRecord) => boolean) => IRecord<any>[];
 export declare const createPreventKeys: (rowKeys: IDerivedRowKeys) => IDerivedRowKeys;
+export declare const hasPreventKey: (rowKeys: IDerivedRowKeys) => boolean | undefined;
 export declare const deletePreventKey: (rowKeys: IDerivedRowKeys) => void;
 export declare const getNodeOffset: (el: Nullable<HTMLElement>, container: HTMLElement, rest?: {
     left: number;
@@ -40,6 +40,7 @@ export declare const getTextFromVNode: <T extends string | number>(node: React.R
 export declare const getTHeadTitle: (title: React.ReactNode | string) => string;
 export declare const getGroupValidData: (list: IRecord[]) => IRecord<any>[];
 export declare const createOrderBy: (sorter: ISorter) => string;
+export declare const SPACE_CHAR = "\u001F";
 export declare const createWhereSQL: (filters: any, showType?: boolean) => string;
 export declare const groupByProps: (array?: IRecord[], props?: string[]) => any[][];
 export declare const deepGetColumn: (arr: IColumn[], value: string) => IColumn[] | undefined;
@@ -59,3 +60,5 @@ export declare const sortableFormatter: <T>(items: T[]) => T[];
  */
 export declare const equalFn: <T = any>(obj1: T, obj2: T, shallow?: boolean) => boolean;
 export declare const calcMergedCells: (mergeCells: IMergeCellItem[], visibleRowIndices: number[]) => IMergeCellItem[];
+export declare const isNilType: (value: string) => boolean;
+export declare const filterTableData: (dataList: IRecord[], filter: Record<string, string[]>, isTree?: boolean) => IRecord<any>[];

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; // 解决列固定时，快读滚动非固定列上下留白卡顿问题
-  &-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

@@ -33,10 +33,11 @@
         display: flex;
         align-items: center;
         .label {
-          width: 100px;
+          width: 75px;
         }
       }
       .condition {
+        padding-left: 75px;
         margin-top: @v-module-distance;
         margin-bottom: @v-module-distance;
       }