@jiaozhiye/qm-design-react 1.11.2 → 1.11.4

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

@@ -319,10 +319,10 @@ declare const _default: {
                 queryPrev: string;
                 queryNext: string;
             };
-        };
-        pivotGrid: {
-            text: string;
-            settingTitle: string;
+            pivotGrid: {
+                text: string;
+                settingTitle: string;
+            };
         };
     };
 };

package/lib/locale/lang/en.js

@@ -324,11 +324,11 @@ export default {
         clear: 'Clear condition',
         queryPrev: 'Find previous',
         queryNext: 'Find next'
+      },
+      pivotGrid: {
+        text: 'Pivot Grid',
+        settingTitle: 'Pivot Grid Dashboard'
       }
-    },
-    pivotGrid: {
-      text: 'Pivot Grid',
-      settingTitle: 'Pivot Grid Dashboard'
     }
   }
 };

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

@@ -319,10 +319,10 @@ declare const _default: {
                 queryPrev: string;
                 queryNext: string;
             };
-        };
-        pivotGrid: {
-            text: string;
-            settingTitle: string;
+            pivotGrid: {
+                text: string;
+                settingTitle: string;
+            };
         };
     };
 };

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

@@ -324,11 +324,11 @@ export default {
         clear: '清空条件',
         queryPrev: '查找上一个',
         queryNext: '查找下一个'
+      },
+      pivotGrid: {
+        text: '透视表',
+        settingTitle: '透视表看板'
       }
-    },
-    pivotGrid: {
-      text: '透视表',
-      settingTitle: '透视表看板'
     }
   }
 };

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

@@ -15,7 +15,9 @@ export type IPivotGridContext = {
     viewMode: IPivotMode;
     size: ComponentSize;
     columns: IColumn[];
-    tableData: IRecord[];
+    gridData: IRecord[];
+    originGridData: IRecord[];
+    groupGridData: Record<string, any> | Record<string, any>[];
     groupList: GroupItem[];
     filterList: ISuperFilter[];
     sorterList: SorterItem[];
@@ -23,6 +25,7 @@ export type IPivotGridContext = {
 };
 type IProps = {
     prefixCls: string;
+    tableData: IRecord[];
     flatColumns: IColumn[];
     children?: React.ReactNode;
 };
@@ -30,7 +33,8 @@ export declare const PivotGridProvider: React.FC<IProps>;
 export declare const usePivotGridContext: () => (IPivotGridContext & {
     setContext: (data: Partial<IPivotGridContext>) => void;
     setColumns: (items: IColumn[]) => void;
-    setTableData: (records: IRecord[]) => void;
+    setGridData: (items: IRecord[]) => void;
+    setGroupGridData: (data: Record<string, any> | Record<string, any>[]) => void;
     setGroupList: (items: GroupItem[]) => void;
     setFilterList: (items: ISuperFilter[]) => void;
     setSorterList: (items: SorterItem[]) => void;

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

@@ -1,5 +1,8 @@
 import type { IRecord, IOrderBy, IColumn } from '../../../table/src/table/types';
+export declare const createGridColumns: (columns: IColumn[]) => IColumn[];
+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) => any;
+export declare const getAllKeys: (data: Record<string, any> | Record<string, any>[], parentKey?: string) => string[];
 export type Subtotal = {
     [key: string]: number;
 };
@@ -18,7 +21,7 @@ export type FieldCalculations = Record<string, (dataList: number[]) => number>;
 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[]) => number;
-    avg: (arr: number[]) => number;
+    avg: (arr: number[]) => string | 0;
     max: (arr: number[]) => number | undefined;
     min: (arr: number[]) => number | undefined;
     count: (arr: number[]) => number;
@@ -26,4 +29,3 @@ export declare const calculations: {
     empty: (arr: number[]) => number;
     notEmpty: (arr: number[]) => number;
 };
-export declare const getStickyLeft: (flattenColumns: IColumn[], fieldName: string) => number;

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

@@ -82,6 +82,7 @@
           .title {
             flex-shrink: 0;
             margin-right: 20px;
+            font-weight: 700;
           }
         }
       }

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

@@ -2,19 +2,19 @@
  * @Author: 焦质晔
  * @Date: 2022-03-16 19:05:30
  * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-11-29 10:34:35
+ * @Last Modified time: 2024-12-04 09:17:17
  */
 @import '../../style/common';
 
 .button-icon {
-  display: inline-block;
+  display: inline-flex;
   text-align: center;
   text-transform: none;
   text-decoration: none;
   background: transparent;
   border: 0;
   outline: 0;
-  line-height: 0;
+  line-height: 1;
   padding: 5px;
   color: @--text-color-placeholder;
   border-radius: @--border-radius-lg;
@@ -28,6 +28,10 @@
 .@{prefix-pivot-grid}__popper {
   .container {
     padding: 6px 15px;
+    &.scroll-y {
+      overflow-y: auto;
+      max-height: calc(100vh - 10px);
+    }
     & > .label {
       display: flex;
       justify-content: space-between;
@@ -70,6 +74,33 @@
           display: none;
         }
       }
+      li.sort-item {
+        display: flex;
+        align-items: center;
+        border-radius: @--border-radius-lg;
+        transition: none;
+        .handle {
+          padding: 5px 6px 5px 2px;
+          color: @--text-color-placeholder;
+          cursor: s-resize;
+        }
+        .label {
+          flex: 1 0;
+          display: inline-flex;
+          align-items: center;
+          .title {
+            flex: 1 0;
+          }
+        }
+      }
+      li.divider {
+        padding: 6px;
+        &::after {
+          content: '';
+          display: block;
+          border-top: 1px solid @--border-color-secondary;
+        }
+      }
     }
     & > .add-record {
       display: flex;

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

@@ -1,7 +1,7 @@
-/*
- * @Author: 焦质晔
- * @Date: 2020-02-28 21:58:58
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-11-28 20:04:56
- */
-@prefix-pivot-grid: ~'@{qm-prefix}-pivot-grid';
+/*
+ * @Author: 焦质晔
+ * @Date: 2020-02-28 21:58:58
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2024-11-28 20:04:56
+ */
+@prefix-pivot-grid: ~'@{qm-prefix}-pivot-grid';

package/lib/scrollbar/src/scrollbar.d.ts

@@ -9,6 +9,7 @@ type IProps = {
     style?: CSSProperties;
     wrapClassName?: string;
     wrapStyle?: CSSProperties;
+    innerStyle?: CSSProperties;
     barWidth?: number;
     showTopScrollbar?: boolean;
     always?: boolean;

package/lib/scrollbar/style/index.less

@@ -13,6 +13,7 @@
   &__wrap {
     display: grid;
     height: 100%;
+    max-height: inherit;
     overflow: auto;
     &--hidden {
       scrollbar-width: none;

package/lib/style/index.css

@@ -27492,6 +27492,7 @@ body {
 .qm-scrollbar__wrap {
   display: grid;
   height: 100%;
+  max-height: inherit;
   overflow: auto;
 }
 .qm-scrollbar__wrap--hidden {
@@ -28143,6 +28144,10 @@ body {
 .qm-form-region-select--sm {
   padding: 15px 10px 5px !important;
 }
+.qm-form-fields-filter {
+  min-width: 160px;
+  max-width: 220px;
+}
 .qm-form-fields-filter .reset {
   padding-bottom: 2px;
   margin-bottom: 4px;
@@ -28159,7 +28164,7 @@ body {
   margin: 0;
 }
 .qm-form-fields-filter .fields-list ul li.item {
-  line-height: 1.75;
+  line-height: 1.85;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -29193,13 +29198,13 @@ body {
 }
 .column-filter__popper {
   padding: 0 !important;
-  min-width: 150px;
-  max-width: 200px;
+  min-width: 160px;
+  max-width: 220px;
 }
 .column-item__popper {
   padding-right: 10px !important;
-  min-width: 150px;
-  max-width: 200px;
+  min-width: 160px;
+  max-width: 220px;
 }
 .column-item__popper .ant-popover-arrow {
   display: none;
@@ -29216,7 +29221,7 @@ body {
 .column-filter__popper .column-filter--wrap li.item,
 .column-item__popper .column-filter--wrap li.item {
   position: relative;
-  line-height: 1.75;
+  line-height: 1.85;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -31009,17 +31014,17 @@ body {
  * @Author: 焦质晔
  * @Date: 2022-03-16 19:05:30
  * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-11-29 10:34:35
+ * @Last Modified time: 2024-12-04 09:17:17
  */
 .button-icon {
-  display: inline-block;
+  display: inline-flex;
   text-align: center;
   text-transform: none;
   text-decoration: none;
   background: transparent;
   border: 0;
   outline: 0;
-  line-height: 0;
+  line-height: 1;
   padding: 5px;
   color: rgba(0, 0, 0, 0.45);
   border-radius: 4px;
@@ -31032,6 +31037,10 @@ body {
 .qm-pivot-grid__popper .container {
   padding: 6px 15px;
 }
+.qm-pivot-grid__popper .container.scroll-y {
+  overflow-y: auto;
+  max-height: calc(100vh - 10px);
+}
 .qm-pivot-grid__popper .container > .label {
   display: flex;
   justify-content: space-between;
@@ -31071,6 +31080,33 @@ body {
   color: #1890ff;
   display: none;
 }
+.qm-pivot-grid__popper .container > .list li.sort-item {
+  display: flex;
+  align-items: center;
+  border-radius: 4px;
+  transition: none;
+}
+.qm-pivot-grid__popper .container > .list li.sort-item .handle {
+  padding: 5px 6px 5px 2px;
+  color: rgba(0, 0, 0, 0.45);
+  cursor: s-resize;
+}
+.qm-pivot-grid__popper .container > .list li.sort-item .label {
+  flex: 1 0;
+  display: inline-flex;
+  align-items: center;
+}
+.qm-pivot-grid__popper .container > .list li.sort-item .label .title {
+  flex: 1 0;
+}
+.qm-pivot-grid__popper .container > .list li.divider {
+  padding: 6px;
+}
+.qm-pivot-grid__popper .container > .list li.divider::after {
+  content: '';
+  display: block;
+  border-top: 1px solid #e8e8e8;
+}
 .qm-pivot-grid__popper .container > .add-record {
   display: flex;
   justify-content: space-between;
@@ -31196,6 +31232,7 @@ body {
 .qm-pivot-grid__layout .body .group-card .label-row .label-cell .title {
   flex-shrink: 0;
   margin-right: 20px;
+  font-weight: 700;
 }
 .qm-pivot-grid__layout .body .group-card .grid-list {
   margin: 0;
@@ -31379,6 +31416,9 @@ body {
   list-style: none;
   font-feature-settings: 'tnum';
 }
-.qm-virtual-list .list-item {
+.qm-virtual-list .container {
+  display: block;
+}
+.qm-virtual-list .container ul li.list-item {
   list-style: none;
 }

package/lib/style/index.less

@@ -1,43 +1,43 @@
-/*
- * @Author: 焦质晔
- * @Date: 2021-07-23 18:23:59
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2024-12-02 09:06:40
- */
-@import '../antd/index.less';
-@import './var.less';
-@import './reset.less';
-
-/* QmDesign */
-@import '../button/style/index.less';
-@import '../space/style/index.less';
-@import '../divider/style/index.less';
-@import '../split/style/index.less';
-@import '../countup/style/index.less';
-@import '../empty/style/index.less';
-@import '../spin/style/index.less';
-@import '../scrollbar/style/index.less';
-@import '../download/style/index.less';
-@import '../anchor/style/index.less';
-@import '../tabs/style/index.less';
-@import '../drawer/style/index.less';
-@import '../modal/style/index.less';
-@import '../form/style/index.less';
-@import '../tinymce/style/index.less';
-@import '../cropper/style/index.less';
-@import '../collapse/style/index.less';
-@import '../upload-file/style/index.less';
-@import '../upload-img/style/index.less';
-@import '../table/style/index.less';
-@import '../search-helper/style/index.less';
-@import '../tree-helper/style/index.less';
-@import '../tree-table-helper/style/index.less';
-@import '../range-table-helper/style/index.less';
-@import '../search-tree/style/index.less';
-@import '../tour/style/index.less';
-@import '../guide-tracker/style/index.less';
-@import '../print/style/index.less';
-@import '../lazy-load/style/index.less';
-@import '../signature/style/index.less';
-@import '../pivot-grid/style/index.less';
-@import '../virtual-list/style/index.less';
+/*
+ * @Author: 焦质晔
+ * @Date: 2021-07-23 18:23:59
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2024-12-02 09:06:40
+ */
+@import '../antd/index.less';
+@import './var.less';
+@import './reset.less';
+
+/* QmDesign */
+@import '../button/style/index.less';
+@import '../space/style/index.less';
+@import '../divider/style/index.less';
+@import '../split/style/index.less';
+@import '../countup/style/index.less';
+@import '../empty/style/index.less';
+@import '../spin/style/index.less';
+@import '../scrollbar/style/index.less';
+@import '../download/style/index.less';
+@import '../anchor/style/index.less';
+@import '../tabs/style/index.less';
+@import '../drawer/style/index.less';
+@import '../modal/style/index.less';
+@import '../form/style/index.less';
+@import '../tinymce/style/index.less';
+@import '../cropper/style/index.less';
+@import '../collapse/style/index.less';
+@import '../upload-file/style/index.less';
+@import '../upload-img/style/index.less';
+@import '../table/style/index.less';
+@import '../search-helper/style/index.less';
+@import '../tree-helper/style/index.less';
+@import '../tree-table-helper/style/index.less';
+@import '../range-table-helper/style/index.less';
+@import '../search-tree/style/index.less';
+@import '../tour/style/index.less';
+@import '../guide-tracker/style/index.less';
+@import '../print/style/index.less';
+@import '../lazy-load/style/index.less';
+@import '../signature/style/index.less';
+@import '../pivot-grid/style/index.less';
+@import '../virtual-list/style/index.less';