fix: revert

antvis · Nov 29, 2023 · 6f361c8 · 6f361c8
1 parent 158750a
commit 6f361c8
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 42 deletions.
diff --git a/packages/s2-core/__tests__/spreadsheet/miss-dimension-values-spec.ts b/packages/s2-core/__tests__/spreadsheet/miss-dimension-values-spec.ts
@@ -1,5 +1,4 @@
 import { getContainer } from 'tests/util/helpers';
-import type { RowCell } from '../../src';
 import { EMPTY_FIELD_VALUE, type S2DataConfig, type S2Options } from '@/common';
 import { PivotSheet, SpreadSheet } from '@/sheet-type';
 
@@ -244,16 +243,4 @@ describe('Miss Dimension Values Tests', () => {
       ]
     `);
   });
-
-  test('should not render tree icon if only have root dimension values', () => {
-    s2.setOptions({
-      hierarchyType: 'tree',
-    });
-    s2.render(false);
-
-    const emptyDimensionValueNode = s2.getRowLeafNodes()[0];
-    expect(
-      (emptyDimensionValueNode.belongsCell as RowCell).getTreeIcon(),
-    ).toBeFalsy();
-  });
 });
diff --git a/packages/s2-core/src/cell/row-cell.ts b/packages/s2-core/src/cell/row-cell.ts
@@ -111,11 +111,7 @@ export class RowCell extends HeaderCell {
   }
 
   protected showTreeIcon() {
-    const { isLeaf, children } = this.meta;
-
-    return (
-      this.spreadsheet.isHierarchyTreeType() && !isLeaf && !isEmpty(children)
-    );
+    return this.spreadsheet.isHierarchyTreeType() && !this.meta.isLeaf;
   }
 
   protected showTreeLeafNodeAlignDot() {
@@ -134,6 +130,7 @@ export class RowCell extends HeaderCell {
     ) {
       return;
     }
+
     return get(this.meta, 'parent.belongsCell.treeIcon.cfg');
   }
 

diff --git a/packages/s2-react/playground/config.ts b/packages/s2-react/playground/config.ts
@@ -80,36 +80,71 @@ export const s2Options: SheetComponentOptions = {
   debug: true,
   width: 600,
   height: 400,
-  hierarchyType: 'grid',
-  totals: {
-    row: {
-      showGrandTotals: false,
-      showSubTotals: {
-        always: false,
-      },
-      reverseLayout: false,
-      reverseSubLayout: false,
-      subTotalsDimensions: [
-        '2d7feabd-76a2-4c11-8f24-79764af936b4',
-        '30b4b32d-d69a-4772-b7f9-84cd54cf0cec',
-      ],
-    },
-    col: {
-      showGrandTotals: false,
-      showSubTotals: false,
-      reverseLayout: false,
-      reverseSubLayout: false,
-      subTotalsDimensions: [],
+  showSeriesNumber: false,
+  interaction: {
+    enableCopy: true,
+    copyWithHeader: true,
+    copyWithFormat: true,
+    // 防止 mac 触摸板横向滚动触发浏览器返回, 和移动端下拉刷新
+    overscrollBehavior: 'none',
+    brushSelection: {
+      data: true,
+      col: true,
+      row: true,
     },
   },
+  tooltip: {
+    operation: {
+      trend: true,
+    },
+  },
+  conditions: {
+    text: [],
+    interval: [
+      {
+        field: 'number',
+        mapping() {
+          return {
+            fill: '#80BFFF',
+            // 自定义柱状图范围
+            isCompare: true,
+            maxValue: 8000,
+            minValue: 300,
+          };
+        },
+      },
+    ],
+  },
+  headerActionIcons: [
+    {
+      iconNames: ['SortDown'],
+      belongsCell: 'colCell',
+      defaultHide: true,
+    },
+    {
+      iconNames: ['SortDown'],
+      belongsCell: 'rowCell',
+      defaultHide: true,
+    },
+    {
+      iconNames: ['SortDown'],
+      belongsCell: 'cornerCell',
+      defaultHide: true,
+    },
+  ],
+  hierarchyType: 'grid',
   style: {
-    layoutWidthType: 'adaptive',
+    colCfg: {
+      hideMeasureColumn: false,
+    },
+    rowCfg: {
+      width: 100,
+    },
     cellCfg: {
-      height: 30,
+      height: 50,
+      width: 200,
     },
   },
-  showDefaultHeaderActionIcon: false,
-  colCell: null,
 };
 
 export const s2ThemeConfig: ThemeCfg = {