@jiaozhiye/qm-design-react 1.11.18 → 1.11.20

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

@@ -360,6 +360,7 @@ declare const _default: {
                 title: string;
                 cell: string;
                 row: string;
+                col: string;
             };
             filter: {
                 text: string;

package/lib/locale/lang/en.js

@@ -365,7 +365,8 @@ export default {
         add: 'Add condition',
         title: 'Set fill color conditions',
         cell: 'Cell',
-        row: 'Row'
+        row: 'Row',
+        col: 'Col'
       },
       filter: {
         text: 'Filter',

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

@@ -360,6 +360,7 @@ declare const _default: {
                 title: string;
                 cell: string;
                 row: string;
+                col: string;
             };
             filter: {
                 text: string;

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

@@ -365,7 +365,8 @@ export default {
         add: '添加条件',
         title: '设置填色条件',
         cell: '单元格',
-        row: '整行'
+        row: '整行',
+        col: '整列'
       },
       filter: {
         text: '筛选',

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

@@ -1,16 +1,23 @@
 import React from 'react';
+import type { Virtualizer } from '../../../virtual-list/src/useVirtual';
 import type { IRowKey } from '../../../table/src/table/types';
 import type { ScrollbarRef } from '../../../scrollbar';
+import type { Nullable, ValueOf } from '../../../_utils/types';
+type GridRef = {
+    bodyEl: Nullable<HTMLElement>;
+    rowVirtualizer: Virtualizer<HTMLElement, Element> | null;
+};
 export type IGridLayoutContext = {
     scrollbarRef: React.RefObject<ScrollbarRef>;
+    gridRef: React.MutableRefObject<GridRef>;
     indentDepth: number;
     selectionKeys: IRowKey[];
     treeExpandKeys: IRowKey[];
     highlightKey: IRowKey;
     checkedColumnKey: string;
-    hoverRowKey: IRowKey;
     updateLayout: number;
     clicked: [IRowKey, string] | [];
+    isPingLeft: boolean;
 };
 type IProps = {
     scrollbar: React.RefObject<ScrollbarRef>;
@@ -19,14 +26,15 @@ type IProps = {
 export declare const GridLayoutProvider: React.FC<IProps>;
 export declare const useGridLayoutContext: () => (IGridLayoutContext & {
     setContext: (data: Partial<IGridLayoutContext>) => void;
+    setGridLayoutRef: (key: string, value: ValueOf<GridRef>) => void;
     setSelectionKeys: (rowKeys: IRowKey[]) => void;
     setTreeExpandKeys: (rowKeys: IRowKey[]) => void;
     setHighlightKey: (value: IRowKey) => void;
     setCheckColumnKey: (value: string) => void;
-    setHoverRowKey: (value: IRowKey) => void;
     forceUpdateLayout: () => void;
     updateColumnsWidth: () => void;
     setClicked: (value: [IRowKey, string] | [
     ]) => void;
+    setPingLeft: (value: boolean) => void;
 }) | undefined;
 export {};

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

@@ -7,6 +7,7 @@ type IProps = {
     layout: GroupLayout[];
     displayList: IRecord[];
     virtualRows: VirtualItem[];
+    notGroup: boolean;
 };
 declare const LeftPanel: React.FC<IProps>;
 export default LeftPanel;

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

@@ -7,6 +7,7 @@ type IProps = {
     layout: GroupLayout[];
     displayList: IRecord[];
     virtualRows: VirtualItem[];
+    notGroup: boolean;
 };
 declare const MainPanel: React.FC<IProps>;
 export default MainPanel;

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

@@ -13,7 +13,7 @@ export type SorterItem = {
 };
 export type FillColorItem = ISuperFilter & {
     color: string;
-    mode: 'cell' | 'row';
+    mode: 'cell' | 'row' | 'col';
 };
 export type SearchResult = {
     value: string;

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

@@ -29,7 +29,7 @@ export declare const calculations: {
     empty: (arr: number[]) => number;
     notEmpty: (arr: number[]) => number;
 };
-export declare const flattenGroupedData: (groupData: Record<string, any> | Record<string, any>[]) => IRecord[];
+export declare const flattenGroupedData: (groupData: Record<string, any> | Record<string, any>[], groupKeys?: Record<string, IOrderBy>[]) => IRecord[];
 export type GroupLayout = {
     key: IRowKey;
     top: number;

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

@@ -9,6 +9,26 @@
 .@{prefix-pivot-grid}__layout {
   .reset-container();
   width: 100%;
+
+  // =========== 变量 ===========
+  @header-bg-color: #d7f0ff;
+  @border-radius: 8px;
+  .bor-radius-left() {
+    border-top-left-radius: @border-radius;
+    border-bottom-left-radius: @border-radius;
+  }
+  .bor-radius-right() {
+    border-top-right-radius: @border-radius;
+    border-bottom-right-radius: @border-radius;
+  }
+  .bor-left-shadow() {
+    box-shadow: -5px 0px 0 0px @--background-color-light;
+  }
+  .bor-right-shadow() {
+    box-shadow: 5px 0px 0 0px @--background-color-light;
+  }
+  // =========== 变量 END ===========
+
   .@{qm-prefix}-scrollbar__wrap {
     // 调整为 flex 布局
     display: flex;
@@ -28,11 +48,21 @@
       display: flex;
       border-left: 1px solid @--border-color-secondary;
       border-bottom: 1px solid @--border-color-secondary;
+      .bor-left-shadow();
+      &,
+      .table-cell:first-child {
+        .bor-radius-left();
+      }
     }
     .no-fixed {
       flex: 1 0;
       display: flex;
       border-bottom: 1px solid @--border-color-secondary;
+      .bor-right-shadow();
+      &,
+      .table-cell:last-child {
+        .bor-radius-right();
+      }
     }
   }
   .header {
@@ -41,7 +71,7 @@
     z-index: 2;
     .table-cell {
       position: relative;
-      background-color: #d6f2ff !important;
+      background-color: @header-bg-color !important;
       cursor: pointer;
     }
     .resize-bar {
@@ -129,9 +159,6 @@
       .cell {
         .text-overflow-cut();
         padding: 0 @--padding-sm;
-        &.indent {
-          padding-left: 16px;
-        }
       }
     }
     .label-cell,
@@ -185,6 +212,22 @@
     border-left: 1px solid @--primary-3;
     z-index: 2;
     pointer-events: none;
+    &::after {
+      content: '';
+      position: absolute;
+      top: 0;
+      right: 0;
+      bottom: -1px;
+      width: 20px;
+      transform: translateX(100%);
+      transition: box-shadow 0.3s, -webkit-box-shadow 0.3s;
+      pointer-events: none;
+    }
+    &.active {
+      &::after {
+        box-shadow: inset 10px 0 8px -8px rgba(0, 0, 0, 0.15);
+      }
+    }
   }
   // 左侧面板
   .left-panel {
@@ -193,6 +236,30 @@
     z-index: 1;
     .group-label {
       border-right: 0 !important;
+      .bor-radius-left();
+      &.level0 {
+        .bor-left-shadow();
+      }
+    }
+    .row-item {
+      &:nth-of-type(1) {
+        border-top-left-radius: @border-radius;
+        .bor-left-shadow();
+        .table-cell:first-child {
+          border-top-left-radius: @border-radius;
+        }
+      }
+      &.last {
+        border-bottom-left-radius: @border-radius;
+        .table-cell:first-child {
+          border-bottom-left-radius: @border-radius;
+        }
+      }
+    }
+    .no-group {
+      .row-item:last-child {
+        .bor-left-shadow();
+      }
     }
   }
   .main-panel {
@@ -202,6 +269,23 @@
     .row-item {
       border-left: 0 !important;
     }
+    .group-label {
+      .bor-radius-right();
+    }
+    .row-item {
+      &:nth-of-type(1) {
+        border-top-right-radius: @border-radius;
+        .table-cell:last-child {
+          border-top-right-radius: @border-radius;
+        }
+      }
+      &.last {
+        border-bottom-right-radius: @border-radius;
+        .table-cell:last-child {
+          border-bottom-right-radius: @border-radius;
+        }
+      }
+    }
   }
   .container {
     position: relative;
@@ -237,7 +321,11 @@
         .title {
           flex-shrink: 0;
           margin-right: 20px;
-          font-weight: 700;
+          font-weight: 600;
+          .empty {
+            color: @--text-color-placeholder;
+            font-weight: 400;
+          }
         }
       }
     }

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

@@ -14,7 +14,7 @@
   }
   &:not(.is-from-table) {
     border: 1px solid @--border-color-secondary;
-    border-radius: @--border-radius-lg;
+    border-radius: @--border-radius-lg + 2px;
   }
   .top-bar {
     display: flex;

package/lib/print/src/setting.d.ts

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import ConfigContext from '../../config-provider/context';
-import { QmForm, QmFormItem } from '../../index';
+import type { IFormItem } from '../../form';
+import Form from '../../form';
 type IProps = {
     setting: {
         distance: {
@@ -19,13 +20,13 @@ type IProps = {
     onClose: () => void;
 };
 type IState = {
-    formList: QmFormItem[];
+    formList: IFormItem[];
 };
 declare class Setting extends Component<IProps, IState> {
     static contextType: React.Context<import("../../config-provider/context").IConfig>;
     context: React.ContextType<typeof ConfigContext>;
-    formRef: React.RefObject<QmForm>;
-    createFormList: () => QmFormItem[];
+    formRef: React.RefObject<Form>;
+    createFormList: () => IFormItem[];
     getInitialvalue: () => {
         disleft: number;
         disright: number;

package/lib/search-helper/src/search-helper.d.ts

@@ -8,6 +8,7 @@ type ITableConfig = {
     rowKey?: ((row: IRecord, index: number) => IRowKey) | IRowKey;
     webPagination?: boolean;
     paginationConfig?: IPaginationConfig;
+    topBarExtra?: React.ReactNode;
 };
 type IProps = {
     size?: ComponentSize;

package/lib/search-tree/style/index.less

@@ -1,34 +1,35 @@
-/*
- * @Author: 焦质晔
- * @Date: 2022-01-11 18:01:20
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2022-09-04 16:40:18
- */
-@import '../../style/common';
-
-@prefix-search-tree: ~'@{qm-prefix}-search-tree';
-
-.@{prefix-search-tree} {
-  .reset-container();
-  height: 100%;
-  .topper {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .ant-input-search {
-      flex: 1 0;
-      margin-bottom: 8px;
-    }
-    .trigger {
-      margin-left: 8px;
-      margin-bottom: 8px;
-    }
-  }
-  .ant-tree {
-    .filter-node {
-      & > span:last-of-type {
-        color: @--primary-color;
-      }
-    }
-  }
-}
+/*
+ * @Author: 焦质晔
+ * @Date: 2022-01-11 18:01:20
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2022-09-04 16:40:18
+ */
+@import '../../style/common';
+
+@prefix-search-tree: ~'@{qm-prefix}-search-tree';
+
+.@{prefix-search-tree} {
+  .reset-container();
+  height: 100%;
+  .topper {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .ant-input-search {
+      flex: 1 0;
+      margin-bottom: 8px;
+    }
+    .trigger {
+      flex-shrink: 0;
+      margin-left: 8px;
+      margin-bottom: 8px;
+    }
+  }
+  .ant-tree {
+    .filter-node {
+      & > span:last-of-type {
+        color: @--primary-color;
+      }
+    }
+  }
+}

package/lib/style/index.css

@@ -30276,6 +30276,7 @@ body {
   margin-bottom: 8px;
 }
 .qm-search-tree .topper .trigger {
+  flex-shrink: 0;
   margin-left: 8px;
   margin-bottom: 8px;
 }
@@ -31035,7 +31036,7 @@ body {
 }
 .qm-pivot-grid:not(.is-from-table) {
   border: 1px solid #e8e8e8;
-  border-radius: 4px;
+  border-radius: 6px;
 }
 .qm-pivot-grid .top-bar {
   display: flex;
@@ -31259,12 +31260,28 @@ body {
   display: flex;
   border-left: 1px solid #e8e8e8;
   border-bottom: 1px solid #e8e8e8;
+  box-shadow: -5px 0px 0 0px #f5f5f5;
+}
+.qm-pivot-grid__layout .header .fixed-left,
+.qm-pivot-grid__layout .footer .fixed-left,
+.qm-pivot-grid__layout .header .fixed-left .table-cell:first-child,
+.qm-pivot-grid__layout .footer .fixed-left .table-cell:first-child {
+  border-top-left-radius: 8px;
+  border-bottom-left-radius: 8px;
 }
 .qm-pivot-grid__layout .header .no-fixed,
 .qm-pivot-grid__layout .footer .no-fixed {
   flex: 1 0;
   display: flex;
   border-bottom: 1px solid #e8e8e8;
+  box-shadow: 5px 0px 0 0px #f5f5f5;
+}
+.qm-pivot-grid__layout .header .no-fixed,
+.qm-pivot-grid__layout .footer .no-fixed,
+.qm-pivot-grid__layout .header .no-fixed .table-cell:last-child,
+.qm-pivot-grid__layout .footer .no-fixed .table-cell:last-child {
+  border-top-right-radius: 8px;
+  border-bottom-right-radius: 8px;
 }
 .qm-pivot-grid__layout .header {
   position: sticky;
@@ -31273,7 +31290,7 @@ body {
 }
 .qm-pivot-grid__layout .header .table-cell {
   position: relative;
-  background-color: #d6f2ff !important;
+  background-color: #d7f0ff !important;
   cursor: pointer;
 }
 .qm-pivot-grid__layout .header .resize-bar {
@@ -31392,11 +31409,6 @@ body {
   white-space: nowrap;
   padding: 0 8px;
 }
-.qm-pivot-grid__layout .header .table-cell .cell.indent,
-.qm-pivot-grid__layout .body .table-cell .cell.indent,
-.qm-pivot-grid__layout .footer .table-cell .cell.indent {
-  padding-left: 16px;
-}
 .qm-pivot-grid__layout .header .label-cell:hover .count-select,
 .qm-pivot-grid__layout .body .label-cell:hover .count-select,
 .qm-pivot-grid__layout .footer .label-cell:hover .count-select,
@@ -31460,6 +31472,20 @@ body {
   z-index: 2;
   pointer-events: none;
 }
+.qm-pivot-grid__layout .fixed-line::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: -1px;
+  width: 20px;
+  transform: translateX(100%);
+  transition: box-shadow 0.3s;
+  pointer-events: none;
+}
+.qm-pivot-grid__layout .fixed-line.active::after {
+  box-shadow: inset 10px 0 8px -8px rgba(0, 0, 0, 0.15);
+}
 .qm-pivot-grid__layout .left-panel {
   position: sticky;
   left: 0;
@@ -31467,6 +31493,27 @@ body {
 }
 .qm-pivot-grid__layout .left-panel .group-label {
   border-right: 0 !important;
+  border-top-left-radius: 8px;
+  border-bottom-left-radius: 8px;
+}
+.qm-pivot-grid__layout .left-panel .group-label.level0 {
+  box-shadow: -5px 0px 0 0px #f5f5f5;
+}
+.qm-pivot-grid__layout .left-panel .row-item:nth-of-type(1) {
+  border-top-left-radius: 8px;
+  box-shadow: -5px 0px 0 0px #f5f5f5;
+}
+.qm-pivot-grid__layout .left-panel .row-item:nth-of-type(1) .table-cell:first-child {
+  border-top-left-radius: 8px;
+}
+.qm-pivot-grid__layout .left-panel .row-item.last {
+  border-bottom-left-radius: 8px;
+}
+.qm-pivot-grid__layout .left-panel .row-item.last .table-cell:first-child {
+  border-bottom-left-radius: 8px;
+}
+.qm-pivot-grid__layout .left-panel .no-group .row-item:last-child {
+  box-shadow: -5px 0px 0 0px #f5f5f5;
 }
 .qm-pivot-grid__layout .main-panel {
   flex: 1 0;
@@ -31476,6 +31523,22 @@ body {
 .qm-pivot-grid__layout .main-panel .row-item {
   border-left: 0 !important;
 }
+.qm-pivot-grid__layout .main-panel .group-label {
+  border-top-right-radius: 8px;
+  border-bottom-right-radius: 8px;
+}
+.qm-pivot-grid__layout .main-panel .row-item:nth-of-type(1) {
+  border-top-right-radius: 8px;
+}
+.qm-pivot-grid__layout .main-panel .row-item:nth-of-type(1) .table-cell:last-child {
+  border-top-right-radius: 8px;
+}
+.qm-pivot-grid__layout .main-panel .row-item.last {
+  border-bottom-right-radius: 8px;
+}
+.qm-pivot-grid__layout .main-panel .row-item.last .table-cell:last-child {
+  border-bottom-right-radius: 8px;
+}
 .qm-pivot-grid__layout .container {
   position: relative;
   left: 0;
@@ -31511,7 +31574,11 @@ body {
 .qm-pivot-grid__layout .container .group-label .label-cell .title {
   flex-shrink: 0;
   margin-right: 20px;
-  font-weight: 700;
+  font-weight: 600;
+}
+.qm-pivot-grid__layout .container .group-label .label-cell .title .empty {
+  color: rgba(0, 0, 0, 0.45);
+  font-weight: 400;
 }
 .qm-pivot-grid__layout .container .row-item {
   position: absolute;