Merge remote-tracking branch 'origin/master' into release-v1.7.0

YardWill · YardWill · commit e67bcff21685 · 2022-01-24T14:20:19.000+08:00
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "react:playground": "yarn workspace @antv/s2-react start",
     "react:build": "yarn workspace @antv/s2-react build",
     "react:test": "yarn workspace @antv/s2-react test",
+    "react:watch": " yarn workspace @antv/s2-react watch",
     "build": "lerna run build --include-dependencies --stream --concurrency 1",
     "build:umd": "lerna run build:umd --include-dependencies --stream --concurrency 1",
     "bundle:size": "lerna run bundle:size --stream",
diff --git a/packages/s2-core/src/cell/row-cell.ts b/packages/s2-core/src/cell/row-cell.ts
@@ -116,7 +116,8 @@ export class RowCell extends HeaderCell {
         if (!isCollapsed) {
           const oldScrollY = this.spreadsheet.store.get('scrollY');
           // 可视窗口高度
-          const viewportHeight = this.spreadsheet.facet.panelBBox.height || 0;
+          const viewportHeight =
+            this.spreadsheet.facet.panelBBox.viewportHeight || 0;
           // 被折叠项的高度
           const deleteHeight = getAllChildrenNodeHeight(this.meta);
           // 折叠后真实高度
@@ -213,7 +214,7 @@ export class RowCell extends HeaderCell {
       position,
       seriesNumberWidth,
       width: headerWidth,
-      height: headerHeight,
+      viewportHeight: headerHeight,
       scrollX,
       scrollY,
     } = this.headerConfig;
@@ -343,7 +344,7 @@ export class RowCell extends HeaderCell {
 
   protected getTextPosition(): Point {
     const { y, height: contentHeight } = this.getContentArea();
-    const { scrollY, height } = this.headerConfig;
+    const { scrollY, viewportHeight: height } = this.headerConfig;
 
     const { fontSize } = this.getTextStyle();
     const textIndent = this.getTextIndent();
diff --git a/packages/s2-core/src/facet/base-facet.ts b/packages/s2-core/src/facet/base-facet.ts
@@ -1052,16 +1052,18 @@ export abstract class BaseFacet {
 
     this.rowHeader = this.getRowHeader();
     this.columnHeader = this.getColHeader();
-    if (seriesNumberWidth > 0 && this.rowIndexHeader) {
+    if (seriesNumberWidth > 0 && !this.rowIndexHeader) {
       this.rowIndexHeader = this.getSeriesNumberHeader();
-      this.foregroundGroup.add(this.rowIndexHeader);
     }
     this.cornerHeader = this.getCornerHeader();
     this.centerFrame = this.getCenterFrame();
 
     if (this.rowHeader) {
       this.foregroundGroup.add(this.rowHeader);
     }
+    if (this.rowIndexHeader) {
+      this.foregroundGroup.add(this.rowIndexHeader);
+    }
     this.foregroundGroup.add(this.columnHeader);
     this.foregroundGroup.add(this.cornerHeader);
     this.foregroundGroup.add(this.centerFrame);
diff --git a/packages/s2-core/src/facet/header/row.ts b/packages/s2-core/src/facet/header/row.ts
@@ -38,7 +38,7 @@ export class RowHeader extends BaseHeader<RowHeaderConfig> {
       data,
       spreadsheet,
       width,
-      height,
+      viewportHeight,
       seriesNumberWidth,
       scrollY,
       scrollX,
@@ -48,7 +48,7 @@ export class RowHeader extends BaseHeader<RowHeaderConfig> {
     // row'cell only show when visible
     const rowCellInRect = (item: Node): boolean => {
       return (
-        height + scrollY > item.y && // bottom
+        viewportHeight + scrollY > item.y && // bottom
         scrollY < item.y + item.height && // top
         width - seriesNumberWidth + scrollX > item.x && // left
         scrollX - seriesNumberWidth < item.x + item.width
@@ -84,7 +84,7 @@ export class RowHeader extends BaseHeader<RowHeaderConfig> {
   }
 
   protected clip(): void {
-    const { width, height, scrollX, scrollY, seriesNumberWidth } =
+    const { width, viewportHeight, scrollX, scrollY, seriesNumberWidth } =
       this.headerConfig;
     this.setClip({
       type: 'rect',
@@ -93,7 +93,7 @@ export class RowHeader extends BaseHeader<RowHeaderConfig> {
         x: scrollX - seriesNumberWidth,
         y: scrollY,
         width,
-        height,
+        height: viewportHeight,
       },
     });
   }
diff --git a/packages/s2-core/src/facet/header/series-number.ts b/packages/s2-core/src/facet/header/series-number.ts
@@ -1,7 +1,8 @@
-import { BBox, Group, IGroup, IShape } from '@antv/g-canvas';
+import { Group, IGroup, IShape } from '@antv/g-canvas';
 import { each } from 'lodash';
 import { getBorderPositionAndStyle } from 'src/utils/cell/cell';
 import { translateGroup } from '../utils';
+import { PanelBBox } from '../bbox/panelBBox';
 import { BaseHeader, BaseHeaderConfig } from './base';
 import { Node } from '@/facet/layout/node';
 import { SpreadSheet } from '@/sheet-type/index';
@@ -25,13 +26,13 @@ export class SeriesNumberHeader extends BaseHeader<BaseHeaderConfig> {
    */
 
   public static getSeriesNumberHeader(
-    viewportBBox: BBox,
+    viewportBBox: PanelBBox,
     seriesNumberWidth: number,
     leafNodes: Node[],
     spreadsheet: SpreadSheet,
     cornerWidth: number,
   ): SeriesNumberHeader {
-    const { width, height } = viewportBBox;
+    const { height, viewportHeight } = viewportBBox;
     const seriesNodes: Node[] = [];
     const isHierarchyTreeType = spreadsheet.isHierarchyTreeType();
     leafNodes.forEach((node: Node): void => {
@@ -53,8 +54,8 @@ export class SeriesNumberHeader extends BaseHeader<BaseHeaderConfig> {
     return new SeriesNumberHeader({
       width: cornerWidth,
       height,
-      viewportWidth: width,
-      viewportHeight: height,
+      viewportWidth: cornerWidth,
+      viewportHeight: viewportHeight,
       position: { x: 0, y: viewportBBox.y },
       data: seriesNodes,
       spreadsheet,
@@ -65,10 +66,21 @@ export class SeriesNumberHeader extends BaseHeader<BaseHeaderConfig> {
     super(cfg);
   }
 
-  public clip(): void {}
+  public clip(): void {
+    const { width, viewportHeight, scrollY } = this.headerConfig;
+    this.setClip({
+      type: 'rect',
+      attrs: {
+        x: 0,
+        y: scrollY,
+        width,
+        height: viewportHeight,
+      },
+    });
+  }
 
   public layout() {
-    const { data, scrollY, height, spreadsheet } = this.headerConfig;
+    const { data, scrollY, viewportHeight, spreadsheet } = this.headerConfig;
     if (spreadsheet.isPivotMode) {
       //  添加矩形背景
       this.addBackGround();
@@ -81,7 +93,7 @@ export class SeriesNumberHeader extends BaseHeader<BaseHeaderConfig> {
         y,
         cellHeight,
         scrollY,
-        height,
+        viewportHeight,
       );
       if (isHeaderCellInViewport) {
         // 按需渲染：视窗内的才渲染
@@ -113,13 +125,13 @@ export class SeriesNumberHeader extends BaseHeader<BaseHeaderConfig> {
 
   private addBackGround() {
     const rowCellTheme = this.headerConfig.spreadsheet.theme.rowCell.cell;
-    const { position, width, height } = this.headerConfig;
+    const { position, width, viewportHeight } = this.headerConfig;
 
     this.backgroundShape = renderRect(this, {
       x: position.x,
       y: -position.y,
       width,
-      height,
+      height: viewportHeight,
       fill: rowCellTheme.backgroundColor,
       stroke: 'transparent',
       opacity: rowCellTheme.backgroundColorOpacity,
@@ -132,7 +144,7 @@ export class SeriesNumberHeader extends BaseHeader<BaseHeaderConfig> {
           x: position.x,
           y: -position.y,
           width,
-          height,
+          height: viewportHeight,
         },
         rowCellTheme,
       );
@@ -150,7 +162,7 @@ export class SeriesNumberHeader extends BaseHeader<BaseHeaderConfig> {
   }
 
   private addText(group: IGroup, cellData: ViewMeta) {
-    const { scrollY, height } = this.headerConfig;
+    const { scrollY, viewportHeight: height } = this.headerConfig;
     const rowCellTheme = this.headerConfig.spreadsheet.theme.rowCell;
     const {
       label,
diff --git a/packages/s2-core/src/facet/pivot-facet.ts b/packages/s2-core/src/facet/pivot-facet.ts
@@ -786,7 +786,8 @@ export class PivotFacet extends BaseFacet {
       },
 
       getTotalLength: () => {
-        return heights.length;
+        // 多了一个数据 [0]
+        return heights.length - 1;
       },
 
       getIndexRange: (minHeight: number, maxHeight: number) => {
diff --git a/packages/s2-core/src/utils/facet.ts b/packages/s2-core/src/utils/facet.ts
@@ -12,6 +12,14 @@ export const getSubTotalNodeWidthOrHeightByLevel = (
     .reduce((sum, current) => sum + current, 0);
 };
 
+/**
+ * 根据视窗高度计算需要展示的数据数组下标
+ * 如有2个节点，每个高度30
+ * @param heights 所有单元格的高度偏移量数组 [0, 30, 60]
+ * @param minHeight 视窗高度起点
+ * @param maxHeight 视窗高度终点
+ * @returns
+ */
 export const getIndexRangeWithOffsets = (
   heights: number[],
   minHeight: number,
@@ -32,7 +40,7 @@ export const getIndexRangeWithOffsets = (
     heights,
     (height: number, idx: number) => {
       const y = maxHeight;
-      return y >= height && y < heights[idx + 1];
+      return y > height && y <= heights[idx + 1];
     },
     yMin,
   );
diff --git a/packages/s2-react/package.json b/packages/s2-react/package.json
@@ -44,6 +44,7 @@
     "build:analysis": "cross-env FORMAT=es ANALYSIS=true vite build",
     "build:declaration": "ttsc -p tsconfig-declaration.json",
     "bundle:size": "bundlesize",
+    "watch": "rimraf esm && concurrently \"yarn build:esm -w\" \"yarn build:declaration -w\"",
     "test": "jest",
     "test:live": "node ./scripts/test-live.mjs",
     "test:coverage": "yarn test --coverage",
@@ -65,6 +66,7 @@
   "devDependencies": {
     "@types/react-beautiful-dnd": "^13.1.2",
     "antd": "^4.16.13",
+    "concurrently": "^7.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
diff --git a/packages/s2-react/src/components/sheets/base-sheet/index.tsx b/packages/s2-react/src/components/sheets/base-sheet/index.tsx
@@ -292,6 +292,10 @@ export const BaseSheet: React.FC<BaseSheetProps> = memo((props) => {
     setLoading(false);
     setOwnSpreadsheet(baseSpreadsheet.current);
     getSpreadSheet?.(baseSpreadsheet.current);
+    setTotal(
+      options?.pagination?.total ??
+        baseSpreadsheet.current.facet.viewCellHeights.getTotalLength(),
+    );
   };
 
   useEffect(() => {
diff --git a/yarn.lock b/yarn.lock
@@ -4146,6 +4146,20 @@ concat-with-sourcemaps@^1.1.0:
   dependencies:
     source-map "^0.6.1"
 
+concurrently@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.0.0.tgz#78d31b441cec338dab03316c221a2f9a67c529b0"
+  integrity sha512-WKM7PUsI8wyXpF80H+zjHP32fsgsHNQfPLw/e70Z5dYkV7hF+rf8q3D+ScWJIEr57CpkO3OWBko6hwhQLPR8Pw==
+  dependencies:
+    chalk "^4.1.0"
+    date-fns "^2.16.1"
+    lodash "^4.17.21"
+    rxjs "^6.6.3"
+    spawn-command "^0.0.2-1"
+    supports-color "^8.1.0"
+    tree-kill "^1.2.2"
+    yargs "^16.2.0"
+
 config-chain@^1.1.11, config-chain@^1.1.12:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
@@ -4663,6 +4677,11 @@ date-fns@2.x:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.26.0.tgz#fa45305543c392c4f914e50775fd2a4461e60fbd"
   integrity sha512-VQI812dRi3cusdY/fhoBKvc6l2W8BPWU1FNVnFH9Nttjx4AFBRzfSVb/Eyc7jBT6e9sg1XtAGsYpBQ6c/jygbg==
 
+date-fns@^2.16.1:
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
+  integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==
+
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
@@ -12304,7 +12323,7 @@ rw@1:
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
   integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
 
-rxjs@^6.6.0, rxjs@^6.6.2:
+rxjs@^6.6.0, rxjs@^6.6.2, rxjs@^6.6.3:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
@@ -12747,6 +12766,11 @@ sourcemap-codec@^1.4.4:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
+spawn-command@^0.0.2-1:
+  version "0.0.2-1"
+  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
+  integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=
+
 spawn-error-forwarder@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spawn-error-forwarder/-/spawn-error-forwarder-1.0.0.tgz#1afd94738e999b0346d7b9fc373be55e07577029"
@@ -13211,7 +13235,7 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
-supports-color@8.1.1:
+supports-color@8.1.1, supports-color@^8.1.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -13565,6 +13589,11 @@ traverse@~0.6.6:
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
   integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
 
+tree-kill@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+
 treeverse@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
