Merge branch 'alpha' of github.com:antvis/S2 into fix_tests

yingying.xwy · yingying.xwy · commit ca3d314fa564 · 2022-02-11T10:30:02.000+08:00
diff --git a/packages/s2-core/CHANGELOG.md b/packages/s2-core/CHANGELOG.md
@@ -1,3 +1,16 @@
+# [@antv/s2-v1.8.0-alpha.6](https://github.com/antvis/S2/compare/@antv/s2-v1.8.0-alpha.5...@antv/s2-v1.8.0-alpha.6) (2022-02-10)
+
+
+### Bug Fixes
+
+* 修复子节点收起后角头全部展开收起不生效 close [#1072](https://github.com/antvis/S2/issues/1072) ([#1074](https://github.com/antvis/S2/issues/1074)) ([6f70f38](https://github.com/antvis/S2/commit/6f70f389fe8a0825dfc80cac871e25adc45280ad))
+* 重命名 scrollReachNodeField ([a46a9ff](https://github.com/antvis/S2/commit/a46a9ff4b41040d4d43a64d92468a943cefe632b))
+
+
+### Features
+
+* **interaction:** interaction增加点击行列头方法供外部调用 ([#1073](https://github.com/antvis/S2/issues/1073)) ([b5d6712](https://github.com/antvis/S2/commit/b5d6712255e0851cd67c3c2346e12125910cbc13))
+
 # [@antv/s2-v1.8.0-alpha.5](https://github.com/antvis/S2/compare/@antv/s2-v1.8.0-alpha.4...@antv/s2-v1.8.0-alpha.5) (2022-02-10)
 
 
diff --git a/packages/s2-core/__tests__/unit/utils/merge-spec.ts b/packages/s2-core/__tests__/unit/utils/merge-spec.ts
@@ -139,7 +139,6 @@ describe('merge test', () => {
       },
       frozenRowHeader: true,
       showSeriesNumber: false,
-      scrollReachNodeField: {},
       customSVGIcons: [],
       showDefaultHeaderActionIcon: false,
       headerActionIcons: [],
diff --git a/packages/s2-core/package.json b/packages/s2-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/s2",
-  "version": "1.8.0-alpha.5",
+  "version": "1.8.0-alpha.6",
   "main": "lib/index.js",
   "module": "esm/index.js",
   "unpkg": "dist/index.min.js",
diff --git a/packages/s2-core/src/common/constant/events/basic.ts b/packages/s2-core/src/common/constant/events/basic.ts
@@ -52,8 +52,6 @@ export enum S2Event {
 
   /** ================ Table Layout ================  */
   LAYOUT_AFTER_HEADER_LAYOUT = 'layout:after-header-layout',
-  LAYOUT_COL_NODE_BORDER_REACHED = 'layout:col-node-border-reached',
-  LAYOUT_ROW_NODE_BORDER_REACHED = 'layout:row-node-border-reached',
   LAYOUT_CELL_SCROLL = 'layout:cell-scroll',
   LAYOUT_PAGINATION = 'layout:pagination',
   LAYOUT_COLLAPSE_ROWS = 'layout:collapsed-rows',
diff --git a/packages/s2-core/src/common/constant/options.ts b/packages/s2-core/src/common/constant/options.ts
@@ -75,7 +75,6 @@ export const DEFAULT_OPTIONS: Readonly<S2Options> = {
     },
   },
   showSeriesNumber: false,
-  scrollReachNodeField: {},
   customSVGIcons: [],
   showDefaultHeaderActionIcon: false,
   headerActionIcons: [],
diff --git a/packages/s2-core/src/common/interface/basic.ts b/packages/s2-core/src/common/interface/basic.ts
@@ -193,11 +193,11 @@ export type Pagination = {
   total?: number;
 };
 
-export interface NodeField {
+export interface ScrollReachNodeField {
   // 行头中需要监听滚动吸顶的度量id
-  rowField?: string[];
+  rowFields?: string[];
   // 列头中需要监听滚动吸「左」的度量id
-  colField?: string[];
+  colFields?: string[];
 }
 
 export interface CustomSVGIcon {
diff --git a/packages/s2-core/src/common/interface/emitter.ts b/packages/s2-core/src/common/interface/emitter.ts
@@ -130,8 +130,6 @@ export interface EmitterType {
   }) => void;
   [S2Event.LAYOUT_AFTER_HEADER_LAYOUT]: (data: LayoutResult) => void;
   [S2Event.LAYOUT_CELL_SCROLL]: (data: CellScrollPosition) => void;
-  [S2Event.LAYOUT_COL_NODE_BORDER_REACHED]: (data: Node) => void;
-  [S2Event.LAYOUT_ROW_NODE_BORDER_REACHED]: (data: Node) => void;
   [S2Event.LAYOUT_TABLE_COL_EXPANDED]: (expandedNode: Node) => void;
   [S2Event.LAYOUT_TABLE_COL_HIDDEN]: (
     currentHiddenColumnsInfo: HiddenColumnsInfo,
diff --git a/packages/s2-core/src/common/interface/events.ts b/packages/s2-core/src/common/interface/events.ts
@@ -9,9 +9,6 @@ export interface CellScrollPosition {
   scrollY: number;
   thumbOffset?: number;
 }
-
-export type TargetLayoutNode = Node;
-
 export interface ListSortParams {
   sortFieldId: string;
   sortMethod: string;
diff --git a/packages/s2-core/src/common/interface/s2Options.ts b/packages/s2-core/src/common/interface/s2Options.ts
@@ -16,7 +16,7 @@ import {
   FrameCallback,
   MappingDataItemCallback,
   MergedCellInfo,
-  NodeField,
+  ScrollReachNodeField,
   Pagination,
   Style,
   Totals,
@@ -29,7 +29,6 @@ import {
 } from '@/common/interface/hooks';
 import { BaseDataSet } from '@/data-set';
 import { SpreadSheet } from '@/sheet-type';
-import { Node } from '@/facet/layout/node';
 
 export interface S2BasicOptions<T = Element | string> {
   // canvas's width
@@ -54,8 +53,6 @@ export interface S2BasicOptions<T = Element | string> {
   readonly frozenRowHeader?: boolean;
   // show Series Number
   readonly showSeriesNumber?: boolean;
-  // scroll reach node border(which field node belongs to) event config
-  readonly scrollReachNodeField?: NodeField;
   // if show the default header actionIcons
   readonly showDefaultHeaderActionIcon?: boolean;
   // header cells including ColCell, RowCell, CornerCell action icon's config
@@ -107,13 +104,6 @@ export interface S2BasicOptions<T = Element | string> {
   // determine data mapping when shows in tooltip
   mappingDisplayDataItem?: MappingDataItemCallback;
   /** ***********CUSTOM LIFECYCLE HOOKS**************** */
-
-  /** ***********CUSTOM LAYOUT HOOKS**************** */
-  otterLayout?: (
-    spreadsheet: SpreadSheet,
-    rowNode: Node,
-    colNode: Node,
-  ) => void;
 }
 
 // Table sheet options
diff --git a/packages/s2-core/src/common/interface/store.ts b/packages/s2-core/src/common/interface/store.ts
@@ -51,8 +51,6 @@ export interface StoreKey {
   hRowScrollX: number;
   // column cell click sort params
   sortParam: SortParam;
-  // last reached border node id
-  lastReachedBorderId: ReachedBorderId;
   // 下钻节点id和对应生成的 path寻址路径
   drillDownIdPathMap: Map<string, number[][]>;
   // 当前下钻节点
diff --git a/packages/s2-core/src/facet/pivot-facet.ts b/packages/s2-core/src/facet/pivot-facet.ts
@@ -2,7 +2,6 @@ import {
   find,
   forEach,
   get,
-  includes,
   isEmpty,
   last,
   maxBy,
@@ -147,48 +146,6 @@ export class PivotFacet extends BaseFacet {
     return layoutDataPosition(this.cfg, layoutResult);
   }
 
-  // TODO cell sticky border event
-  protected fireReachBorderEvent(scrollX: number, scrollY: number) {
-    const colNode = this.spreadsheet
-      .getColumnNodes()
-      .find(
-        (value) =>
-          includes(this.getScrollColField(), value.field) &&
-          scrollX > value.x &&
-          scrollX < value.x + value.width,
-      );
-    const rowNode = this.spreadsheet
-      .getRowNodes()
-      .find(
-        (value) =>
-          includes(this.getScrollRowField(), value.field) &&
-          scrollY > value.y &&
-          scrollY < value.y + value.height,
-      );
-    const reachedBorderId = this.spreadsheet.store.get('lastReachedBorderId', {
-      rowId: '',
-      colId: '',
-    });
-    if (colNode && reachedBorderId.colId !== colNode.id) {
-      this.spreadsheet.store.set(
-        'lastReachedBorderId',
-        merge({}, reachedBorderId, {
-          colId: colNode.id,
-        }),
-      );
-      this.spreadsheet.emit(S2Event.LAYOUT_COL_NODE_BORDER_REACHED, colNode);
-    }
-    if (rowNode && reachedBorderId.rowId !== rowNode.id) {
-      this.spreadsheet.store.set(
-        'lastReachedBorderId',
-        merge({}, reachedBorderId, {
-          rowId: rowNode.id,
-        }),
-      );
-      this.spreadsheet.emit(S2Event.LAYOUT_ROW_NODE_BORDER_REACHED, rowNode);
-    }
-  }
-
   private calculateNodesCoordinate(
     rowLeafNodes: Node[],
     rowsHierarchy: Hierarchy,
@@ -769,14 +726,6 @@ export class PivotFacet extends BaseFacet {
     return Math.max(rowNodeWidth, fieldNameNodeWidth);
   }
 
-  private getScrollColField(): string[] {
-    return get(this.spreadsheet, 'options.scrollReachNodeField.colField', []);
-  }
-
-  private getScrollRowField(): string[] {
-    return get(this.spreadsheet, 'options.scrollReachNodeField.rowField', []);
-  }
-
   public getViewCellHeights(layoutResult: LayoutResult) {
     const { rowLeafNodes } = layoutResult;
 
diff --git a/packages/s2-core/src/sheet-type/spread-sheet.ts b/packages/s2-core/src/sheet-type/spread-sheet.ts
@@ -307,7 +307,9 @@ export abstract class SpreadSheet extends EE {
 
   public registerIcons() {
     const customSVGIcons = this.options.customSVGIcons;
-    if (isEmpty(customSVGIcons)) return;
+    if (isEmpty(customSVGIcons)) {
+      return;
+    }
 
     forEach(customSVGIcons, (customSVGIcon: CustomSVGIcon) => {
       if (isEmpty(getIcon(customSVGIcon.name))) {
diff --git a/packages/s2-react/CHANGELOG.md b/packages/s2-react/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [@antv/s2-react-v1.8.0-alpha.7](https://github.com/antvis/S2/compare/@antv/s2-react-v1.8.0-alpha.6...@antv/s2-react-v1.8.0-alpha.7) (2022-02-10)
+
+
+### Bug Fixes
+
+* 修复子节点收起后角头全部展开收起不生效 close [#1072](https://github.com/antvis/S2/issues/1072) ([#1074](https://github.com/antvis/S2/issues/1074)) ([6f70f38](https://github.com/antvis/S2/commit/6f70f389fe8a0825dfc80cac871e25adc45280ad))
+
 # [@antv/s2-react-v1.8.0-alpha.6](https://github.com/antvis/S2/compare/@antv/s2-react-v1.8.0-alpha.5...@antv/s2-react-v1.8.0-alpha.6) (2022-02-10)
 
 
diff --git a/packages/s2-react/__tests__/unit/utils/options-spec.ts b/packages/s2-react/__tests__/unit/utils/options-spec.ts
@@ -44,7 +44,6 @@ describe('Options Tests', () => {
         },
       },
       showSeriesNumber: false,
-      scrollReachNodeField: {},
       customSVGIcons: [],
       showDefaultHeaderActionIcon: true,
       headerActionIcons: [],
diff --git a/packages/s2-react/package.json b/packages/s2-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/s2-react",
-  "version": "1.8.0-alpha.5",
+  "version": "1.8.0-alpha.7",
   "main": "lib/index.js",
   "module": "esm/index.js",
   "unpkg": "dist/index.min.js",
diff --git a/packages/s2-react/src/components/sheets/interface.ts b/packages/s2-react/src/components/sheets/interface.ts
@@ -6,7 +6,6 @@ import {
   LayoutCol,
   LayoutRow,
   ListSortParams,
-  TargetLayoutNode,
   S2Constructor,
   Node,
   SpreadSheet,
@@ -103,8 +102,6 @@ export interface BaseSheetComponentProps {
   onAfterHeaderLayout?: (layoutResult: LayoutResult) => void;
   onCollapseRows?: (collapsedRows: Record<string, boolean>) => void;
   onCollapseRowsAll?: (hierarchyCollapse: boolean) => void;
-  onRowCellScroll?: (reachedRow: TargetLayoutNode) => void;
-  onColCellScroll?: (reachedCol: TargetLayoutNode) => void;
   onCellScroll?: (position: CellScrollPosition) => void;
   onRowCellClick?: (data: TargetCellInfo) => void;
   onRowCellDoubleClick?: (data: TargetCellInfo) => void;
diff --git a/packages/s2-react/src/hooks/useEvents.ts b/packages/s2-react/src/hooks/useEvents.ts
@@ -2,7 +2,6 @@ import {
   SpreadSheet,
   S2Event,
   getBaseCellData,
-  TargetLayoutNode,
   CellScrollPosition,
   ListSortParams,
   EmitterType,
@@ -96,17 +95,6 @@ export function useEvents(props: BaseSheetComponentProps) {
         ) => {
           props.onCollapseRowsAll?.(hierarchyCollapse);
         },
-
-        [S2Event.LAYOUT_ROW_NODE_BORDER_REACHED]: (
-          reachedRow: TargetLayoutNode,
-        ) => {
-          props.onRowCellScroll?.(reachedRow);
-        },
-        [S2Event.LAYOUT_COL_NODE_BORDER_REACHED]: (
-          reachedCol: TargetLayoutNode,
-        ) => {
-          props.onColCellScroll?.(reachedCol);
-        },
         [S2Event.LAYOUT_CELL_SCROLL]: (value: CellScrollPosition) => {
           props.onCellScroll?.(value);
         },
diff --git a/s2-site/docs/api/basic-class/store.zh.md b/s2-site/docs/api/basic-class/store.zh.md
@@ -16,7 +16,6 @@ this.spreadsheet.store.set('key', value) // 存储
 | scrollX | 垂直滚动偏移 | `number` |
 | hRowScrollX | 垂直行头滚动偏移 | `number` |
 | sortParam | 列头排序配置 | [SortParam](#SortParam) |
-| lastReachedBorderId | ? | `{rowId: string, colId: string}` |
 | drillDownIdPathMap | 下钻节点 id 和对应生成的 path 寻址路径 | `Map<string, number[][]>` |
 | drillDownNode | 当前下钻节点 | [Node](/zh/docs/api/base-class/node) |
 | drillItemsNum | 下钻数据的个数控制 | `number` |
diff --git a/s2-site/docs/api/general/S2Options.zh.md b/s2-site/docs/api/general/S2Options.zh.md
@@ -11,12 +11,11 @@ order: 1
 | hierarchyType | `grid` \| `tree` \| `customTree` |    | `grid` | 行头的展示方式，grid：平铺网格结构， tree： 树状结构。 customTree: 自定义树状结构 |
 | conditions | [Conditions](#conditions) |  |    | 条件模式配置 |
 | totals | [Totals](#totals) |  |    | 小计总计配置 |
-| tooltip | [Tooltip](#tooltip) |    |  |  tooltip 总配置 |
+| tooltip | [Tooltip](#tooltip) |    |  |  tooltip 配置 |
 | interaction | [Interaction](#interaction) |    |  |  表格交互配置 |
 | pagination | [Pagination](#pagination) |  |    | 分页配置 |
 | frozenRowHeader | `boolean` |  |   `true` | 冻结行头 （透视表有效） |
 | showSeriesNumber | `boolean` |  |  `false` | 是否显示行序号 |
-| scrollReachNodeField | [NodeField](#nodefield) |  |  | 滚动监听的节点度量 |
 | showDefaultHeaderActionIcon |`boolean` |  |   `true` | 是否展示默认行列头操作图标 |
 | headerActionIcons | [HeaderActionIcon[]](#headeractionicon) |  |   `false` | 自定义行列头操作图标（需要将 `showDefaultHeaderActionIcon` 置为 `false`） |
 | customSVGIcons | [CustomSVGIcon[]](#customsvgicon) |  |   `false` | 自定义 svg 图标 |
@@ -41,7 +40,6 @@ order: 1
 | layoutDataPosition | [layoutDataPosition](#layoutdataposition)   |  |  | 自定义数据 |
 | filterDisplayDataItem | [FilterDataItemCallback](#filterdataitemcallback) |  |    | 过滤数据 |
 | mappingDisplayDataItem | [MappingDataItemCallback](#mappingdataitemcallback) |  |    | 转换数据，用于 tooltip 显示 |
-| otterLayout | [OtterLayout](#otterlayout) |  |  |   自定义 layout |
 | dataSet | [DataSet](#dataset) |  |  |   自定义数据集 |
 | supportCSSTransform | `boolean` |  |   `false` | 开启后支持 CSS transform, 解决父元素设置 `transform` 后，鼠标坐标响应不正确的问题  |
 | devicePixelRatio | `number` |  |   `window.devicePixelRatio` | 自定义设备像素比  |
@@ -66,15 +64,6 @@ boolean ｜ object **必选**,_default: null_ 功能描述： 分页配置
 
 `markdown:docs/common/style.zh.md`
 
-## NodeField
-
-object 可选，_default：{}_ 功能描述：滚动监听的节点度量
-
-| 参数 | 说明 | 类型 | 默认值 | 必选  |
-| --- | --- | --- | --- | :-:  |
-| rowField | 行头中需要监听滚动吸顶的度量 id | `string[]` | - |  |
-| colField | 列头中需要监听滚动吸「左」的度量 id | `string[]` | - |  |
-
 ## DataCellCallback
 
 ```js
@@ -176,20 +165,6 @@ export type SimpleDataItem = string | number;
 export type DataItem = SimpleDataItem | MultiData;
 ```
 
-## OtterLayout
-
-```js
-OtterLayout = (spreadsheet: SpreadSheet, rowNode: Node, colNode: Node) => void;
-```
-
-功能描述：自定义布局
-
-| 参数 | 说明      | 类型 | 默认值 | 必选  |
-| --- | --- | --- | --- | :-:  |
-| spreadsheet |   表类实例，可以访问任意的配置信息 | [SpreadSheet](#spreadsheet) |  | ✓ |
-| rowNode |   行节点 | [Node](#node) |  | ✓ |
-| colNode |   列节点 | [Node](#node) |  | ✓ |
-
 ## LayoutResult
 
 | 参数 | 说明                             | 类型 | 默认值 | 必选  |

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@antv/s2",`
`3`		`- "version": "1.8.0-alpha.5",`
	`3`	`+ "version": "1.8.0-alpha.6",`
`4`	`4`	`"main": "lib/index.js",`
`5`	`5`	`"module": "esm/index.js",`
`6`	`6`	`"unpkg": "dist/index.min.js",`