fix(s2-react): 修复 hierarchyType 切换导致的渲染问题

yingying.xwy · yingying.xwy · commit ae5de6c0418d · 2022-01-11T05:43:10.000+08:00
diff --git a/packages/s2-core/src/facet/layout/build-row-tree-hierarchy.ts b/packages/s2-core/src/facet/layout/build-row-tree-hierarchy.ts
@@ -1,4 +1,4 @@
-import { isEmpty, merge, isBoolean, keys } from 'lodash';
+import { isEmpty, merge, isBoolean } from 'lodash';
 import { FieldValue, TreeHeaderParams } from '@/facet/layout/interface';
 import { layoutArrange, layoutHierarchy } from '@/facet/layout/layout-hooks';
 import { TotalClass } from '@/facet/layout/total-class';
diff --git a/packages/s2-react/src/components/sheets/strategy-sheet/index.tsx b/packages/s2-react/src/components/sheets/strategy-sheet/index.tsx
@@ -37,6 +37,17 @@ export const StrategySheet: React.FC<SheetComponentsProps> = React.memo(
         return {};
       }
       let hideMeasureColumn = false;
+      let hierarchyType = 'tree';
+
+      // 根据 dataConfig 切换 hierarchyType
+      if (
+        isEmpty(dataCfg?.fields?.rows) &&
+        !isEmpty(dataCfg?.fields?.customTreeItems)
+      ) {
+        hierarchyType = 'customTree';
+      }
+
+      // 单指标非自定义树结构隐藏指标列
       if (
         size(dataCfg?.fields?.values) === 1 &&
         options.hierarchyType !== 'customTree'
@@ -52,7 +63,7 @@ export const StrategySheet: React.FC<SheetComponentsProps> = React.memo(
           headerConfig: ColHeaderConfig,
         ) => new CustomColCell(node, spreadsheet, headerConfig),
         showDefaultHeaderActionIcon: false,
-        hierarchyType: isEmpty(dataCfg?.fields?.rows) ? 'customTree' : 'tree',
+        hierarchyType,
 
         style: {
           colCfg: {
@@ -97,7 +108,7 @@ export const StrategySheet: React.FC<SheetComponentsProps> = React.memo(
           },
         },
       };
-    }, [dataCfg]);
+    }, [dataCfg, options.hierarchyType]);
 
     const s2DataCfg = React.useMemo(() => {
       const defaultFields = {
diff --git a/packages/s2-react/src/hooks/useSpreadSheet.ts b/packages/s2-react/src/hooks/useSpreadSheet.ts
@@ -78,10 +78,7 @@ export function useSpreadSheet(
     }
 
     if (!Object.is(prevOptions, options)) {
-      if (
-        !Object.is(prevOptions?.hierarchyType, options?.hierarchyType) &&
-        Object.is(options?.hierarchyType, 'customTree')
-      ) {
+      if (!Object.is(prevOptions?.hierarchyType, options?.hierarchyType)) {
         // 自定义树目录需要重新构建 CustomTreePivotDataSet
         reBuildDataSet = true;
         reloadData = true;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { isEmpty, merge, isBoolean, keys } from 'lodash';`
	`1`	`+import { isEmpty, merge, isBoolean } from 'lodash';`
`2`	`2`	`import { FieldValue, TreeHeaderParams } from '@/facet/layout/interface';`
`3`	`3`	`import { layoutArrange, layoutHierarchy } from '@/facet/layout/layout-hooks';`
`4`	`4`	`import { TotalClass } from '@/facet/layout/total-class';`