Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 增加绘制透视组合图的能力 #2780

Merged
merged 66 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
14b3ceb
refactor: 修复部分 circular deps
wjgogogo Jun 13, 2024
01d9e16
Merge branch 'next' into feat-pivot-chart
wjgogogo Jun 17, 2024
4aa3836
chore: 更新 g2 依赖信息
wjgogogo Jun 17, 2024
0c41bc1
Merge branch 'next' into feat-pivot-chart
wjgogogo Jun 17, 2024
7c28713
feat: 完成 extends 开发时工程化配置
wjgogogo Jun 17, 2024
f4e91a4
refactor: 类型重构
wjgogogo Jun 18, 2024
27125ae
feat: 增加主题拓展的能力
wjgogogo Jun 19, 2024
79895a5
refactor: 简化 Node 创建时赋值逻辑
wjgogogo Jun 20, 2024
85e211f
feat: 初步完成分离 leafNodes 逻辑
wjgogogo Jun 20, 2024
03b8104
refactor: rename row header layers
wjgogogo Jun 21, 2024
9ea684a
feat: 初步搭建 rowAxisHeader 框架
wjgogogo Jun 21, 2024
63f3f18
Merge branch 'next' into feat-pivot-chart
wjgogogo Jun 24, 2024
c628e83
feat: 增加角头对竖轴单元格的支持
wjgogogo Jun 24, 2024
e8d5588
feat: 增加 colAxis, 搭建基础框架
wjgogogo Jun 24, 2024
ed6d06a
refactor: 增加 fieldValue 类型提示
wjgogogo Jun 25, 2024
815f678
feat: 完善维度拆分逻辑
wjgogogo Jun 26, 2024
51cb37b
WIP
wjgogogo Jun 26, 2024
c083c37
fix: 修复布局和 resize 问题
wjgogogo Jun 27, 2024
e5b038b
fix: 修复布局和 resize 问题
wjgogogo Jun 27, 2024
735bab0
feat: 完善 resize 逻辑
wjgogogo Jun 27, 2024
5fc40fd
feat: 完善行列头 resize 逻辑
wjgogogo Jun 28, 2024
0ef91a3
feat: 完善 axis header 冻结逻辑
wjgogogo Jun 28, 2024
483e317
feat: 增加 axis corner header
wjgogogo Jun 28, 2024
633f61d
feat: 增加极坐标系布局能力
wjgogogo Jul 3, 2024
384877e
fix: 修复维度拆分后,总计、小计分组 node 坐标缺失问题
wjgogogo Jul 3, 2024
5cb3243
fix: 修复列头 resize 区域冻结滚动位置偏移问题
wjgogogo Jul 3, 2024
08723d5
refactor: 抽离各个 cell 生成 theme 方法, 便于复用
wjgogogo Jul 4, 2024
8e8481c
feat: 增加 axis cell hover 交互
wjgogogo Jul 4, 2024
16c1e5c
feat: 增加 axis cell click 交互
wjgogogo Jul 4, 2024
deb247b
feat: 关闭透视组合图复制能力
wjgogogo Jul 5, 2024
f1bdb17
chore: 合并 next 代码
wjgogogo Jul 5, 2024
38c9b78
Merge branch 'next' into feat-pivot-chart
wjgogogo Jul 5, 2024
ca29567
fix: 修复极坐标场景下, axis header clip 问题
wjgogogo Jul 10, 2024
a54d60e
feat: 增加对 axis 样式的映射
wjgogogo Jul 10, 2024
f2be649
style: 样式更新
wjgogogo Jul 11, 2024
4db70e2
feat: 优化 chart options 配置
wjgogogo Jul 16, 2024
08ea4de
feat: 增加 PivotChartSheet 组件封装
wjgogogo Jul 16, 2024
f8601ac
test: 增加透视组合表单测
wjgogogo Jul 16, 2024
86d40b8
Merge branch 'next' into feat-pivot-chart
wjgogogo Jul 16, 2024
5b1232b
test: 单测修复
wjgogogo Jul 17, 2024
8a55479
style: lint fix
wjgogogo Jul 17, 2024
fc30303
chore: lock 文件更新
wjgogogo Jul 17, 2024
7be11ea
ci: 更新 vite dev 配置
wjgogogo Jul 17, 2024
294c9e9
test: 增加 copy 单测
wjgogogo Jul 17, 2024
4752640
feat: 导出可继承的产物
wjgogogo Jul 18, 2024
01140d1
docs: 分离绘制 g2 文档
wjgogogo Jul 18, 2024
e18a674
feat: 增加 exports 配置
wjgogogo Jul 18, 2024
66b336e
docs: 增加透视组合图文档
wjgogogo Jul 18, 2024
14647a7
ci: 更新 rollup 打包, 临时方案
wjgogogo Jul 18, 2024
bf2a66f
docs: 增加透视组合图文档
wjgogogo Jul 22, 2024
39bc1e1
Merge branch 'next' into feat-pivot-chart
wjgogogo Jul 29, 2024
4dd103c
chore: 合并代码,解决冲突
wjgogogo Aug 6, 2024
677a784
test: 单测修复
wjgogogo Aug 6, 2024
c2d2c37
Merge branch 'next' into feat-pivot-chart
wjgogogo Aug 6, 2024
3e5086e
Merge branch 'next' into feat-pivot-chart
wjgogogo Aug 15, 2024
cd99696
chore: 更新 lock 文件
wjgogogo Aug 15, 2024
edfb544
Merge branch 'next' into feat-pivot-chart
wjgogogo Aug 15, 2024
016bf47
Merge branch 'next' into feat-pivot-chart
wjgogogo Oct 8, 2024
43587cb
chore: 合并 next 代码
wjgogogo Nov 18, 2024
ac0f39c
refactor: 底部 frame border 兼容
wjgogogo Nov 18, 2024
42c8b84
test: 单测修复
wjgogogo Nov 18, 2024
30bad9e
build: 修复打包问题
wjgogogo Nov 18, 2024
5bb1ae0
fix: 类型修复
wjgogogo Nov 18, 2024
1f6e019
refactor: icon 位置迁移
wjgogogo Nov 19, 2024
e31c73e
Merge branch 'next' into feat-pivot-chart
wjgogogo Nov 19, 2024
008220f
test: 单测修复
wjgogogo Nov 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions build.config.base.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import path from 'path';
import peerDepsExternal from 'rollup-plugin-peer-deps-external';
import { visualizer } from 'rollup-plugin-visualizer';

export const getBaseConfig = () => {
export const getBaseConfig = ({
aliasReact = false,
aliasReactComponents = false,
} = {}) => {
const entry = './src/index.ts';

const OUT_DIR_NAME_MAP = {
Expand Down Expand Up @@ -45,7 +48,22 @@ export const getBaseConfig = () => {
find: /^@antv\/s2$/,
replacement: path.join(__dirname, './packages/s2-core/src'),
},
],
{
find: /^@antv\/s2\/extends$/,
replacement: path.join(__dirname, './packages/s2-core/src/extends'),
},
aliasReact && {
find: /^@antv\/s2-react$/,
replacement: path.join(__dirname, './packages/s2-react/src'),
},
aliasReactComponents && {
find: /^@antv\/s2-react-components$/,
replacement: path.join(
__dirname,
'./packages/s2-react-components/src',
),
},
].filter(Boolean),
);
}

Expand Down
1 change: 1 addition & 0 deletions jest.config.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ module.exports = {
'^tests/(.*)': '<rootDir>/__tests__/$1',
'^@antv/s2$': path.join(__dirname, 'packages/s2-core/src'),
'^@antv/s2/esm/(.*)$': path.join(__dirname, 'packages/s2-core/src/$1'),
'^@antv/s2/extends$': path.join(__dirname, 'packages/s2-core/src/extends'),
'^@antv/s2-react$': path.join(__dirname, 'packages/s2-react/src'),
'^@antv/s2-react-components$': path.join(
__dirname,
Expand Down
Loading
Loading