@jiaozhiye/qm-design-react 1.11.9 → 1.11.10

package/lib/locale/lang/en.d.ts

@@ -291,6 +291,7 @@ declare const _default: {
                 inText: string;
                 ninText: string;
                 likeText: string;
+                nullText: string;
                 configText: string;
                 saveButton: string;
                 savedSetting: string;

package/lib/locale/lang/en.js

@@ -1,8 +1,8 @@
-/*
- * @Author: 焦质晔
- * @Date: 2021-06-19 08:46:00
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-11-28 20:28:15
+/*
+ * @Author: 焦质晔
+ * @Date: 2021-06-19 08:46:00
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2024-12-27 09:49:21
  */
 export default {
   name: 'en',
@@ -297,6 +297,7 @@ export default {
         inText: 'include',
         ninText: 'not include',
         likeText: 'fuzzy matching',
+        nullText: 'null value',
         configText: 'Configuration name',
         saveButton: 'Save',
         savedSetting: 'Saved configuration',

package/lib/locale/lang/zh-cn.d.ts

@@ -291,6 +291,7 @@ declare const _default: {
                 inText: string;
                 ninText: string;
                 likeText: string;
+                nullText: string;
                 configText: string;
                 saveButton: string;
                 savedSetting: string;

package/lib/locale/lang/zh-cn.js

@@ -1,8 +1,8 @@
-/*
- * @Author: 焦质晔
- * @Date: 2021-06-19 08:45:54
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-11-28 20:28:06
+/*
+ * @Author: 焦质晔
+ * @Date: 2021-06-19 08:45:54
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2024-12-27 09:49:04
  */
 export default {
   name: 'zh-cn',
@@ -297,6 +297,7 @@ export default {
         inText: '包含',
         ninText: '不包含',
         likeText: '模糊匹配',
+        nullText: '空值',
         configText: '配置名称',
         saveButton: '保 存',
         savedSetting: '保存的高级检索设置',

package/lib/pivot-grid/src/grid-layout/Context.d.ts

@@ -11,6 +11,7 @@ export type IGridLayoutContext = {
     summationData: Summary;
     checkedColumnKey: string;
     hoverRowKey: IRowKey;
+    updateLayout: number;
 };
 type IProps = {
     scrollbar: React.RefObject<ScrollbarRef>;
@@ -25,5 +26,7 @@ export declare const useGridLayoutContext: () => (IGridLayoutContext & {
     setSummationData: (value: Summary) => void;
     setCheckColumnKey: (value: string) => void;
     setHoverRowKey: (value: IRowKey) => void;
+    forceUpdateLayout: () => void;
+    updateColumnsWidth: () => void;
 }) | undefined;
 export {};

package/lib/pivot-grid/src/hooks/use-export.d.ts

@@ -0,0 +1,11 @@
+import type { IColumn, IRecord } from '../../../table/src/table/types';
+type IParamsFn1 = (columns: IColumn[], records: IRecord[]) => Record<string, number>[];
+type IParamsFn2 = (row: IRecord, rowIndex: number, column: IColumn, columnIndex: number) => string | number;
+declare const useExport: () => {
+    exportXLSX: (options: any, dataList: IRecord[], calcSummationValues: IParamsFn1, renderCell: IParamsFn2) => Promise<Blob>;
+    importXLSX: (options: {
+        columns: IColumn[];
+        file: Blob;
+    }, callback?: ((records: IRecord[]) => void) | undefined) => void;
+};
+export default useExport;

package/lib/pivot-grid/src/main/Context.d.ts

@@ -2,7 +2,8 @@ import React from 'react';
 import type { IColumn, IOrderBy, IRecord, IRowKey, ISuperFilter } from '../../../table/src/table/types';
 import type { ComponentSize, ValueOf } from '../../../_utils/types';
 import type { IGridLayoutContext } from '../grid-layout/Context';
-export type IPivotMode = 'table' | 'gantt' | 'card' | 'chart';
+import type { PivotGridProps } from './types';
+export type IPivotMode = 'table' | 'gantt' | 'card';
 export type GroupItem = {
     fieldName: string;
     order: IOrderBy;
@@ -11,16 +12,26 @@ export type SorterItem = {
     fieldName: string;
     order: IOrderBy;
 };
+export type FillColorItem = ISuperFilter & {
+    color: string;
+    mode: 'cell' | 'row';
+};
 export type SearchResult = {
     value: string;
     rowKey: IRowKey;
     dataIndex: string;
 };
+export type FillColorCell = {
+    color: string;
+    rowKey: IRowKey;
+    dataIndex: string;
+};
 export type PivotRef = {
+    props: Partial<PivotGridProps>;
     originGridData: IRecord[];
     flatGroupData: IRecord[];
-    keyRecordMap: Map<IRowKey, IRecord>;
     isTree: boolean;
+    keyRecordMap: Map<IRowKey, IRecord>;
     gridLayoutContext: Partial<IGridLayoutContext>;
 };
 export type IPivotGridContext = {
@@ -34,12 +45,17 @@ export type IPivotGridContext = {
     groupList: GroupItem[];
     filterList: ISuperFilter[];
     sorterList: SorterItem[];
+    colorList: FillColorItem[];
     expandedKeys: string[];
     searchResults: SearchResult[];
     switchIndex: number;
+    fillColorCells: Map<string, string>;
 };
 type IProps = {
     prefixCls: string;
+    size: ComponentSize;
+    pivotProps: Partial<PivotGridProps>;
+    getRowKey: (row: IRecord, index: number) => IRowKey;
     tableData: IRecord[];
     flatColumns: IColumn[];
     children?: React.ReactNode;
@@ -55,8 +71,10 @@ export declare const usePivotGridContext: () => (IPivotGridContext & {
     setGroupList: (items: GroupItem[]) => void;
     setFilterList: (items: ISuperFilter[]) => void;
     setSorterList: (items: SorterItem[]) => void;
+    setColorList: (items: FillColorItem[]) => void;
     setExpandedKeys: (keys: string[]) => void;
     setSearchResults: (value: SearchResult[]) => void;
     setSwitchIndex: (value: number) => void;
+    setFillColor: (items: FillColorCell[]) => void;
 }) | undefined;
 export {};

package/lib/pivot-grid/src/main/Main.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const Main: React.FC;
+export default Main;

package/lib/pivot-grid/src/main/types.d.ts

@@ -1,8 +1,24 @@
-import { IColumn, IRecord } from '../../../table/src/table/types';
+/// <reference types="react" />
+import type { IColumn, IRecord, IRowKey, ISuperFilter } from '../../../table/src/table/types';
+import type { ComponentSize } from '../../../_utils/types';
+import type { GroupItem, SorterItem } from './Context';
 export type PivotGridRef = {};
 export type PivotGridProps = {
+    fromTable?: boolean;
     columns?: IColumn[];
-    tableColumns?: IColumn[];
     dataSource?: IRecord[];
-    tableDataSource?: IRecord[];
+    rowKey: ((row: IRecord, index: number) => IRowKey) | IRowKey;
+    uniqueKey?: string;
+    size?: ComponentSize;
+    height?: number;
+    maxHeight?: number;
+    className?: string;
+    style?: React.CSSProperties;
+    onChange?: (group: GroupItem[], filter: ISuperFilter[], sorter: SorterItem[], extra: {
+        currentDataSource: IRecord[];
+    }) => void;
+    onColumnsChange?: (columns: IColumn[]) => void;
+    onGroupChange?: (group: GroupItem[]) => void;
+    onFilterChange?: (filter: ISuperFilter[]) => void;
+    onSorterChange?: (sorter: SorterItem[]) => void;
 };

package/lib/pivot-grid/src/top-bar/AlertInfo.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const AlertInfo: React.FC;
+export default AlertInfo;

package/lib/pivot-grid/src/top-bar/ConfigInfo.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const ConfigInfo: React.FC;
+export default ConfigInfo;

package/lib/pivot-grid/src/top-bar/FillColor.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const FillColor: React.FC;
+export default FillColor;

package/lib/pivot-grid/src/utils/index.d.ts

@@ -1,11 +1,13 @@
 import type { IRecord, IOrderBy, IColumn, IRowKey } from '../../../table/src/table/types';
 export declare const createGridColumns: (columns: IColumn[]) => IColumn[];
 export declare const filterGridColumns: (columns: IColumn[]) => IColumn[];
+export declare const isTreeGrid: (rows: IRecord[]) => boolean;
 export declare const isGroupRecord: (row: IRecord) => boolean;
 export declare const getValByPath: (obj: any, path: string) => any;
+export declare const getDepth: (data: Record<string, any> | Record<string, any>[]) => number;
 export declare const getStickyLeft: (flattenColumns: IColumn[], fieldName: string) => number;
-export declare const groupMultiData: (records: IRecord[], groupKeys: Record<string, IOrderBy>[] | undefined, fn: (row: IRecord, key: string) => string | number) => Record<string, any> | Record<string, any>[];
 export declare const getAllExpandKeys: (data: Record<string, any> | Record<string, any>[], parentKey?: string) => string[];
+export declare const groupMultiData: (records: IRecord[], groupKeys: Record<string, IOrderBy>[] | undefined, fn: (row: IRecord, key: string) => string | number) => Record<string, any> | Record<string, any>[];
 export type Subtotal = {
     [key: string]: number;
 };
@@ -16,11 +18,6 @@ export type Summary = {
     [key: string]: GroupSummary | Subtotal;
 };
 export type FieldCalculations = Record<string, (dataList: number[]) => number>;
-/**
- * 递归计算分组数据
- * @param {Object} group - 当前分组数据
- * @returns {Object} - 计算后的结果
- */
 export declare const calculateSummary: (groupData: Record<string, any> | Record<string, any>[], fieldCalculations: Record<string, (data: number[]) => number>) => Summary;
 export declare const calculations: {
     sum: (arr: number[]) => string;

package/lib/pivot-grid/style/grid-layout.less

@@ -2,15 +2,15 @@
  * @Author: 焦质晔
  * @Date: 2022-03-16 19:05:30
  * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-12-21 19:46:45
+ * @Last Modified time: 2024-12-25 11:07:14
  */
 @import '../../style/common';
 
 .@{prefix-pivot-grid}__layout {
   .reset-container();
+  width: 100%;
   display: flex;
   flex-wrap: nowrap;
-  height: 100%;
   .header,
   .footer {
     display: flex;

package/lib/pivot-grid/style/main.less

@@ -1,43 +1,33 @@
-/*
- * @Author: 焦质晔
- * @Date: 2022-03-16 19:05:30
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-11-29 10:33:42
- */
-@import '../../style/common';
-
-.@{prefix-pivot-grid}__main {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  .top-bar {
-    padding: @--padding-sm;
-    border-bottom: 1px solid @--border-color-secondary;
-    .action-btn {
-      display: inline-flex;
-      align-items: center;
-      padding: 5px 12px;
-      border-radius: @--border-radius-lg;
-      cursor: pointer;
-      transition: all 0.3s ease;
-      &:hover,
-      &.active,
-      &.ant-dropdown-open {
-        background-color: @--background-color;
-      }
-      .icon {
-        margin-right: 6px;
-      }
-    }
-    .ant-divider-vertical {
-      margin: 0;
-      height: 1.25em;
-    }
-  }
-  .wrapper {
-    flex: auto;
-    height: 0;
-    padding: @--padding-md;
-    background-color: @--background-color-light;
-  }
-}
+/*
+ * @Author: 焦质晔
+ * @Date: 2022-03-16 19:05:30
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2024-12-25 14:25:58
+ */
+@import '../../style/common';
+
+.@{prefix-pivot-grid} {
+  display: flex;
+  flex-direction: column;
+  &.is-from-table {
+    height: 100%;
+  }
+  &:not(.is-from-table) {
+    border: 1px solid @--border-color-secondary;
+    border-radius: @--border-radius-lg;
+  }
+  .top-bar {
+    display: flex;
+    justify-content: space-between;
+    padding: @--padding-sm;
+    border-bottom: 1px solid @--border-color-secondary;
+  }
+  .wrapper {
+    display: flex;
+    flex: auto;
+    // height: 0;
+    min-height: 0;
+    padding: @--padding-md;
+    background-color: @--background-color-light;
+  }
+}

package/lib/pivot-grid/style/top-bar.less

@@ -2,7 +2,7 @@
  * @Author: 焦质晔
  * @Date: 2022-03-16 19:05:30
  * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-12-13 14:07:07
+ * @Last Modified time: 2024-12-25 18:46:15
  */
 @import '../../style/common';
 
@@ -28,6 +28,43 @@
   }
 }
 
+.@{prefix-pivot-grid} {
+  .top-bar {
+    .alert-info {
+      background-color: rgba(0, 0, 0, 0.045);
+      border-radius: @--border-radius-base;
+      display: flex;
+      align-items: center;
+      margin-right: 4px;
+      padding: 5px @--padding-sm;
+      .icon {
+        margin-right: 5px;
+        color: @--primary-color;
+      }
+    }
+    .action-btn {
+      display: inline-flex;
+      align-items: center;
+      padding: 5px 12px;
+      border-radius: @--border-radius-lg;
+      cursor: pointer;
+      transition: all 0.3s ease;
+      &:hover,
+      &.active,
+      &.ant-dropdown-open {
+        background-color: @--background-color;
+      }
+      .icon {
+        margin-right: 6px;
+      }
+    }
+    .ant-divider-vertical {
+      margin: 0;
+      height: 1.25em;
+    }
+  }
+}
+
 .@{prefix-pivot-grid}__popper {
   .container {
     padding: 6px 15px;
@@ -80,8 +117,12 @@
       li.sort-item {
         display: flex;
         align-items: center;
+        padding-right: 6px;
         border-radius: @--border-radius-lg;
         transition: none;
+        &.active {
+          background-color: @--background-color-light;
+        }
         .handle {
           padding: 5px 6px 5px 2px;
           color: @--text-color-placeholder;
@@ -95,6 +136,9 @@
             flex: 1 0;
           }
         }
+        .button-icon:hover {
+          background-color: #ddd;
+        }
       }
       li.divider {
         padding: 6px;