[双轴图] 更新配置项 & 拆分demo #1473

liuzhenying · 2020-08-20T12:12:38Z

0821 所做更改

geometryConfigs -> geometryOptions
Biax -> DualAxes
adaptor 中 field 合并
LineOptions, ColumnOptions 从各自 type 中引用
文档部分从 common 中引用

本次修改包括

更新配置项，从和 common/geometry 保持一致，到和 LineOption，ColumnOption 保持一致
拆分 demo，补充齐 v1 demo 示例（单柱线图的 color 配置项，因为折柱图实现方式原因，暂无法显示验收，先保留代码，等待折柱图修复）
从 adaptor 中拆出部分代码

examples/biax/dual-line/API.zh.md

src/plots/biax/adaptor.ts

src/plots/biax/types.ts

hustcc · 2020-08-20T13:26:34Z

geometryConfigs 要不要改成 geometryOptions？因为我们的概念中都是 Options，现在又有一个叫 config 的，不太好！最好我们代码中都搜不到 config 这个词

liuzhenying · 2020-08-20T13:30:11Z

geometryConfigs 要不要改成 geometryOptions？因为我们的概念中都是 Options，现在又有一个叫 config 的，不太好！最好我们代码中都搜不到 config 这个词

可以呀，我想的是跟随geometry 的，比如 lineOption，以及 color，label，都放在 geometryConfigs（geometryOptions）里。其他的组件配置，例如 yAixs，animate，放在BiaxOption 里

hustcc · 2020-08-21T13:43:46Z

src/plots/dual-axes/types.ts

+import { ColumnOptions } from '../column/types';
+
+export enum AxisType {
+  Left = 'Left',


这个也可以小写~后面再改！

hustcc · 2020-08-21T13:44:51Z

src/plots/dual-axes/types.ts

+
+  readonly geometryOptions?: GeometryConfig[];
+
+  readonly yAxis?: Options['yAxis'][];


对外暴露的 types，都要写清楚注释。后面分支改。

hustcc · 2020-08-21T13:45:53Z

还有两个小问题，代码风格的。分支合并了，后面再改！

* feat: add baseCombo & dualline * fix: 部分lint 错误 * fix: npm run fix * fix: 删除无用变量 * feat: push geogemtry 拆分方式 * feat: lint * fix: lint * fix: github test 失败 * feat: 双轴图打平 * feat: line * feat: 更改双轴图引用 * feat: test 用例 * fix: lint * feat: fix lint * fix: fix 不必要的提交 * fix: merge * fix: typescript * feat: 更改 cr 问题 * feat: 更新文档及柱线混合图 * feat: 同步部分测试用例 * fix: eslint * fix: 简化 demo * fix: tslint * fix: demo 链接 * feat: 1. 更新 Option 2. 拆分 Demo 3.拆分部分方法 * feat: 补充 label demo * feat: 更新 test * feat: 合并 field adaptor * feat: 更改 geometryConfigs 值 geometryOptions * feat: 更改双轴图命名 * feat: 更改双轴图命名 * feat: 更改双轴图名字 * feat: 引用 common 文档 Co-authored-by: aiyin.lzy <nadia.lzy@antfin.com>

aiyin.lzy added 30 commits July 24, 2020 10:56

feat: add baseCombo & dualline

5f9ba5f

fix: 部分lint 错误

237cfb4

fix: npm run fix

c68968e

fix: 删除无用变量

20484fc

Merge remote-tracking branch 'origin/v2' into v2_feat_combo

247ded2

feat: push geogemtry 拆分方式

08b15bb

feat: lint

af46c0d

fix: lint

441a781

fix: github test 失败

9b0ad56

feat: 双轴图打平

9650b55

feat: line

052303b

Merge remote-tracking branch 'origin/v2' into v2_feat_combo

fb18382

feat: 更改双轴图引用

f2b9460

feat: test 用例

4db1bbd

fix: lint

6b26b73

feat: fix lint

67920c7

fix: fix 不必要的提交

c26d114

Merge remote-tracking branch 'origin/v2' into v2_feat_combo

3996cb3

fix: merge

82f6396

fix: typescript

16e6533

feat: 更改 cr 问题

92d5a2b

Merge remote-tracking branch 'origin/v2' into v2_feat_combo

6080258

feat: 更新文档及柱线混合图

6e8e851

feat: 同步部分测试用例

84cfad1

Merge remote-tracking branch 'origin/master' into v2_feat_combo

8e3824f

fix: eslint

db42336

fix: 简化 demo

577546e

fix: tslint

62ee70d

fix: demo 链接

67fa8af

feat: 1. 更新 Option 2. 拆分 Demo 3.拆分部分方法

a192fc1

feat: 合并 field adaptor

b6be3f4

hustcc reviewed Aug 20, 2020

View reviewed changes

examples/biax/dual-line/API.zh.md Outdated Show resolved Hide resolved

hustcc reviewed Aug 20, 2020

View reviewed changes

src/plots/biax/adaptor.ts Show resolved Hide resolved

hustcc reviewed Aug 20, 2020

View reviewed changes

src/plots/biax/types.ts Outdated Show resolved Hide resolved

hustcc reviewed Aug 20, 2020

View reviewed changes

src/plots/biax/types.ts Outdated Show resolved Hide resolved

aiyin.lzy added 4 commits August 21, 2020 15:56

feat: 更改 geometryConfigs 值 geometryOptions

162d73d

feat: 更改双轴图命名

928e1fa

feat: 更改双轴图命名

1cd8453

feat: 更改双轴图名字

0a21e70

liuzhenying changed the title ~~[双轴图] 更新配置项 & 拆分demo~~ [WIP][双轴图] 更新配置项 & 拆分demo Aug 21, 2020

pr-triage bot removed the PR: unreviewed label Aug 21, 2020

feat: 引用 common 文档

aba3750

liuzhenying changed the title ~~[WIP][双轴图] 更新配置项 & 拆分demo~~ [双轴图] 更新配置项 & 拆分demo Aug 21, 2020

pr-triage bot added the PR: unreviewed label Aug 21, 2020

liuzhenying requested review from hustcc and visiky August 21, 2020 10:14

hustcc reviewed Aug 21, 2020

View reviewed changes

hustcc approved these changes Aug 21, 2020

View reviewed changes

pr-triage bot added PR: partially-approved and removed PR: unreviewed labels Aug 21, 2020

hustcc merged commit d3eb1a1 into master Aug 21, 2020

hustcc deleted the v2_feat_combo branch August 21, 2020 13:53

pr-triage bot added PR: merged and removed PR: partially-approved labels Aug 21, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[双轴图] 更新配置项 & 拆分demo #1473

[双轴图] 更新配置项 & 拆分demo #1473

liuzhenying commented Aug 20, 2020 •

edited

Loading

hustcc commented Aug 20, 2020

liuzhenying commented Aug 20, 2020

hustcc Aug 21, 2020 •

edited

Loading

hustcc Aug 21, 2020

hustcc commented Aug 21, 2020


		readonly geometryOptions?: GeometryConfig[];

		readonly yAxis?: Options['yAxis'][];

[双轴图] 更新配置项 & 拆分demo #1473

[双轴图] 更新配置项 & 拆分demo #1473

Conversation

liuzhenying commented Aug 20, 2020 • edited Loading

hustcc commented Aug 20, 2020

liuzhenying commented Aug 20, 2020

hustcc Aug 21, 2020 • edited Loading

Choose a reason for hiding this comment

hustcc Aug 21, 2020

Choose a reason for hiding this comment

hustcc commented Aug 21, 2020

liuzhenying commented Aug 20, 2020 •

edited

Loading

hustcc Aug 21, 2020 •

edited

Loading