refactor: 移除 todo 代码

antvis · Oct 25, 2024 · 99bbd46 · 99bbd46
1 parent 7f74920
commit 99bbd46
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/packages/s2-core/src/cell/header-cell.ts b/packages/s2-core/src/cell/header-cell.ts
@@ -182,14 +182,6 @@ export abstract class HeaderCell<
     const { options, dataCfg } = this.spreadsheet;
     const isEmptyValues = isEmpty(dataCfg.fields.values);
 
-    /**
-     * TODO: 自定义行列头支持组内排序
-     * https://github.com/antvis/S2/issues/2898
-     */
-    if (this.meta.extra?.isCustomNode) {
-      return false;
-    }
-
     if (options.showDefaultHeaderActionIcon && !isEmptyValues) {
       const { sortParam } = this.getHeaderConfig();
       const query = this.meta.query;

diff --git a/packages/s2-core/src/facet/layout/build-gird-hierarchy.ts b/packages/s2-core/src/facet/layout/build-gird-hierarchy.ts
@@ -114,16 +114,13 @@ const buildNormalGridHierarchy = (params: GridHeaderParams) => {
     }
   }
 
-  // https://github.com/antvis/S2/issues/2893
-  if (!spreadsheet.isCustomHeaderFields()) {
-    addTotals({
-      currentField,
-      lastField: fields[index - 1],
-      isFirstField: index === 0,
-      fieldValues,
-      spreadsheet,
-    });
-  }
+  addTotals({
+    currentField,
+    lastField: fields[index - 1],
+    isFirstField: index === 0,
+    fieldValues,
+    spreadsheet,
+  });
 
   const displayFieldValues = filterOutDetail(fieldValues as string[]);
 

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
@@ -61,7 +61,7 @@ export const buildRowTreeHierarchy = (params: TreeHeaderParams) => {
     fieldValues = fieldValues.slice(0, drillItemsNum);
   }
 
-  if (level === 0 && !spreadsheet.isCustomHeaderFields()) {
+  if (level === 0) {
     addTotals(spreadsheet, currentField, fieldValues);
   }