feat: 趋势分析表支持配置图标条件 (#1683)

* feat: 当前只能复制数值可带表头复制 (#1590) * feat: 添加通过 cellMetas 获取单元格对应的列头文本的方法 * feat: 添加通过 cellMetas 获取单元格对应的行头文本的方法 * feat: 只复制数据单元格时可以携带行列头 * feat: 选择某X行/列数据时可以携带行列头 * feat: 提取矩阵转换为字符串的方法 * test: 添加带行列头复制的单测 * test: 明细表添加带行列头复制的单测 * docs: 复制数据是否带表头信息 * feat(interaction): 行列宽高支持控制拖拽范围 (#1583) * feat(interaction): 行列宽高支持控制拖拽范围 * feat(interaction): 增加测试和文档 * feat(interaction): 增加主题色 * Update row-column-resize-spec.ts * Update packages/s2-core/src/interaction/row-column-resize.ts Co-authored-by: Wenjun Xu <[email protected]> * fix: rename Co-authored-by: Wenjun Xu <[email protected]> * docs: 复制数据是否带表头信息 * refactor: 评审细节修改 Co-authored-by: zishang <[email protected]> Co-authored-by: Jinke Li <[email protected]> Co-authored-by: Wenjun Xu <[email protected]> * fix(layout): 修复 Firefox 浏览器部分 icon 渲染失败 close #1571 (#1599) * fix: 有冻结行且有垂直scrollWidth时冻结行无法 resize (#1594) * fix: 有冻结行且有垂直scrollWidth时冻结航无法resize * fix: 有冻结行且有垂直scrollWidth时冻结航无法resize Co-authored-by: owen.wjh <[email protected]> * chore: 🤖 更新 lock 和 changelog 文件 (#1601) * fix: sortByFunc 排序后行列维度节点丢失 (#1606) * fix(interaction): 向左移动到不完全可见cell的时候，没有滚动过去 (#1607) * fix: 明细表复制时无需使用formatter格式化列头label (#1610) * fix: 明细表复制时无需使用formatter格式化列头label * test: 完善明细表导出case * feat: 支持resize最右侧column (#1611) * feat: 支持resize最右侧column * fix: 添加testing-library/dom dep * fix: npm源 * fix: npm源 * fix: 切换成dispatchEvent * fix: testcase fix Co-authored-by: owen.wjh <[email protected]> * docs: 将 S2Event 提取到 API 文档中, 方便查看 (#1618) * fix(strategysheet): 修复趋势分析表列头格式化不生效 (#1616) * fix(strategysheet): 修复趋势分析表列头格式化不生效 * fix: update * test: 增加测试 * fix: test * docs: 优化文档说法和校正有误的内容 (#1640) * docs: 让 demo 展示符合主题 * docs: 排序文档优化 * docs: 合并单元格文档更新 * docs: getAllCells()获取数据说明问题 * fix: 修复存在 0 时，数值为 number 时，排序错误的问题 (#1644) * fix: 修复存在 0 时，排序错误的问题 * test: 补充存在 0 时，排序错误的单测 * fix: 修复单测字典序排序错误 Co-authored-by: zishang <[email protected]> * fix(pagination): 分页配置未传 current 参数时表格渲染空白 (#1633) * feat: 复制支持html格式 (#1647) * feat: 复制支持html格式 * fix: 修复复制测试用例 * fix: 添加复制格式测试用例 * Update packages/s2-core/src/utils/export/copy.ts Co-authored-by: stone <[email protected]> * fix: moved mimetype as enum * chore: generic type narrowing * fix: html escaping special chars Co-authored-by: owen.wjh <[email protected]> Co-authored-by: stone <[email protected]> * feat(interaction): 宽高调整事件透出 resizedWidth/resizedHeight, 修复错误类型定义 (#1638) * feat(interaction): 宽高调整事件透出 resizedWidth/resizedHeight, 修复错误类型定义 * docs: 优化文档 * chore: 更新 reviewer * fix: 修复pivot模式 cell点击事件无法触发BUG (#1623) fix: 修复pivot-table cell事件无法触发BUG * chore: 发布成功后自动部署官网 (#1649) * fix(layout): 修复 treeRowsWidth 配置不生效 close #1622 (#1646) * fix(layout): 修复 treeRowsWidth 配置不生效 close #1622 * test: 修复测试 * chore: 🤖 更新 lock 和 changelog 文件 (#1650) * fix: 修复选中态的描边宽度样式问题 (#1654) * fix: 链接字段高亮下划线过长 (#1652) * refactor: measureTextWidth移动为spreadsheet实例方法 * test: 调整 text 测试用例 * feat: 明细表行头单元格支持拖拽 (#1655) * feat: 明细表行头单元格支持拖拽 * feat: 明细表行头单元格支持拖拽 * test: 添加单测 * fix(interaction): 优化resetSheetStyle性能 (#1653) * fix: 优化reset性能 * fix: icon draw * docs: 官网文档优化 (#1661) * fix(scroll): 修复滚动边界判断错误导致无法滚动 (#1664) Co-authored-by: 卿珂 <[email protected]> * chore: update the reviewers (#1673) * fix(resize): 修复总计列存在子节点时无法调整宽度 (#1675) * fix: 修复明细表 onRaneSort 失效问题 (#1678) * docs: 修改排序API文档 (#1677) * refactor: 重构多指标绘制文本布局逻辑 * feat: 趋势分析表支持icon字段标记 Co-authored-by: stone <[email protected]> Co-authored-by: zishang <[email protected]> Co-authored-by: Jinke Li <[email protected]> Co-authored-by: Wenjun Xu <[email protected]> Co-authored-by: serializedowen <[email protected]> Co-authored-by: owen.wjh <[email protected]> Co-authored-by: 刘嘉一 <[email protected]> Co-authored-by: YardWill <[email protected]> Co-authored-by: xiaochong44 <[email protected]> Co-authored-by: 卿珂 <[email protected]>
antvis · Aug 12, 2022 · 2137372 · 2137372
1 parent 5088034
commit 2137372
Show file tree

Hide file tree

Showing 103 changed files with 2,401 additions and 738 deletions.
diff --git a/.github/workflows/pr-auto-assign-reviewer.yml b/.github/workflows/pr-auto-assign-reviewer.yml
@@ -21,5 +21,5 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           pr-emoji: '+1, rocket'
-          reviewers: 'xingwanying,qubaomingg,lcx-seima,YardWill,lijinke666,wjgogogo,zxc0328,stone-lyl,'
+          reviewers: 'xingwanying,serializedowen,lcx-seima,YardWill,lijinke666,wjgogogo,stone-lyl,GaoFuhong'
           review-creator: false
diff --git a/...lows/sync-site-lock-changelog-with-pr.yml → .github/workflows/release-success.yml b/...lows/sync-site-lock-changelog-with-pr.yml → .github/workflows/release-success.yml
@@ -1,4 +1,4 @@
-name: 🔁 Sync Site S2 Lock And Changelog With PR
+name: 🚀 After the release is successful
 
 # 自动发布 action 执行完成后再执行 (无论成功失败都会执行)
 on:
@@ -59,3 +59,7 @@ jobs:
           gh pr create --title "chore: 🤖 更新 lock 和 changelog 文件" --body "🤖 由 [[Sync Site S2 Lock And Changelog With PR](https://github.com/antvis/S2/blob/master/.github/workflows/sync-site-lock-changelog-with-pr.yml)] action 自动创建."
         env:
           GITHUB_TOKEN: ${{ secrets.JINKE_GITHUB_TOKEN }}
+
+      # 部署官网
+      - name: Delpoy Site
+        run: yarn site:deploy
diff --git a/packages/s2-core/CHANGELOG.md b/packages/s2-core/CHANGELOG.md
@@ -1,6 +1,5 @@
 # [@antv/s2-v1.24.0-alpha.4](https://github.com/antvis/S2/compare/@antv/s2-v1.24.0-alpha.3...@antv/s2-v1.24.0-alpha.4) (2022-07-21)
 
-
 ### Bug Fixes
 
 * **strategysheet:** 修复子弹图颜色显示错误 & 百分比精度问题 ([#1588](https://github.com/antvis/S2/issues/1588)) ([c4bb48c](https://github.com/antvis/S2/commit/c4bb48cbe128b47e3574af903142934fd7452846))

diff --git a/packages/s2-core/__tests__/bugs/issue-1587-spec.ts b/packages/s2-core/__tests__/bugs/issue-1587-spec.ts
@@ -0,0 +1,28 @@
+/**
+ * @description spec for issue #1587
+ * https://github.com/antvis/S2/issues/1587
+ */
+
+import { getContainer } from '../util/helpers';
+import * as mockDataConfig from '../data/simple-data.json';
+import type { S2Options } from '../../src';
+import { PivotSheet } from '@/sheet-type';
+
+const s2Options: S2Options = {
+  width: 800,
+  height: 600,
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
+  pagination: {
+    pageSize: 2,
+  },
+};
+
+describe('Pagination Tests', () => {
+  const s2 = new PivotSheet(getContainer(), mockDataConfig, s2Options);
+  s2.render();
+
+  test('should get correctly pagination scroll y if pagination.current is empty', () => {
+    expect(s2.facet.getPaginationScrollY()).toEqual(0);
+  });
+});
diff --git a/packages/s2-core/__tests__/bugs/issue-1624-spec.ts b/packages/s2-core/__tests__/bugs/issue-1624-spec.ts
@@ -0,0 +1,48 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+/**
+ * @description spec for issue #1624
+ * https://github.com/antvis/S2/issues/1624
+ */
+
+import { getContainer, sleep } from '../util/helpers';
+import * as mockDataConfig from '../data/simple-data.json';
+import { S2Event, type S2Options, DataCell } from '@/index';
+import { PivotSheet } from '@/sheet-type';
+
+const s2Options: S2Options = {
+  width: 800,
+  height: 600,
+};
+
+describe('Data Cell Border Tests', () => {
+  const borderWidth = 4;
+  const s2 = new PivotSheet(getContainer(), mockDataConfig, s2Options);
+  s2.setTheme({
+    dataCell: {
+      cell: {
+        verticalBorderWidth: borderWidth,
+        horizontalBorderWidth: borderWidth,
+      },
+    },
+  });
+  s2.render();
+
+  test('should draw correct data cell border when hover focus', async () => {
+    const dataCell = s2.panelScrollGroup.getChildren()[0] as DataCell;
+
+    s2.emit(S2Event.DATA_CELL_HOVER, {
+      target: dataCell,
+    } as any);
+
+    await sleep(40);
+
+    // @ts-ignore
+    const meta = dataCell.getCellArea();
+    const borderBbox = dataCell.getChildByIndex(2).getBBox();
+
+    expect(meta.x).toEqual(borderBbox.x - borderWidth / 2);
+    expect(meta.y).toEqual(borderBbox.y - borderWidth / 2);
+    expect(meta.width).toEqual(borderBbox.width + borderWidth);
+    expect(meta.height).toEqual(borderBbox.height + borderWidth);
+  });
+});
diff --git a/packages/s2-core/__tests__/bugs/issue-1668-spec.ts b/packages/s2-core/__tests__/bugs/issue-1668-spec.ts
@@ -0,0 +1,49 @@
+/**
+ * @description spec for issue #1668
+ * https://github.com/antvis/S2/issues/1668
+ */
+
+import type { IGroup } from '@antv/g-canvas';
+import { getContainer } from '../util/helpers';
+import * as mockDataConfig from '../data/data-issue-1668.json';
+import { type S2Options, KEY_GROUP_COL_RESIZE_AREA } from '@/index';
+import { PivotSheet } from '@/sheet-type';
+
+const s2Options: S2Options = {
+  width: 800,
+  height: 400,
+  totals: {
+    row: {
+      showGrandTotals: true,
+      showSubTotals: true,
+      reverseLayout: true,
+      reverseSubLayout: true,
+      subTotalsDimensions: ['province'],
+    },
+    col: {
+      showGrandTotals: true,
+      showSubTotals: true,
+      reverseLayout: true,
+      reverseSubLayout: true,
+      subTotalsDimensions: ['type'],
+    },
+  },
+};
+
+describe('Totals Cell Resize Tests', () => {
+  const s2 = new PivotSheet(getContainer(), mockDataConfig, s2Options);
+  s2.render();
+
+  test('should render extra resize id for resize area handler', () => {
+    const resizeArea = s2.foregroundGroup.findById(
+      KEY_GROUP_COL_RESIZE_AREA,
+    ) as IGroup;
+    const resizeAreaList = resizeArea.getChildren();
+
+    expect(resizeAreaList).not.toHaveLength(0);
+
+    resizeAreaList.forEach((shape) => {
+      expect(shape.attr('appendInfo').id).toBeTruthy();
+    });
+  });
+});