Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions site/examples/component/legend/demo/layoutMode.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/** @jsx jsx */
import { Canvas, Chart, Interval, jsx, Legend } from '@antv/f2';

const context = document.getElementById('container').getContext('2d');

const multiLineData = [
{ genre: '债券基金', sold: 275, a: '1' },
{ genre: '申万宏源固守+基金指数', sold: 115, a: '1' },
{ genre: '基金指数', sold: 120, a: '1' },
{ genre: '股票基金', sold: 300, a: '1' },
{ genre: '混合基金', sold: 180, a: '1' },
{ genre: '货币基金', sold: 90, a: '1' },
{ genre: 'QDII基金', sold: 60, a: '1' },
Comment on lines +7 to +13
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

示例数据 multiLineData 中的 a: '1' 属性在 <Interval /> 组件中并未使用。为了保持示例代码的简洁和清晰,建议移除这个未使用的属性。

Suggested change
{ genre: '债券基金', sold: 275, a: '1' },
{ genre: '申万宏源固守+基金指数', sold: 115, a: '1' },
{ genre: '基金指数', sold: 120, a: '1' },
{ genre: '股票基金', sold: 300, a: '1' },
{ genre: '混合基金', sold: 180, a: '1' },
{ genre: '货币基金', sold: 90, a: '1' },
{ genre: 'QDII基金', sold: 60, a: '1' },
{ genre: '债券基金', sold: 275 },
{ genre: '申万宏源固守+基金指数', sold: 115 },
{ genre: '基金指数', sold: 120 },
{ genre: '股票基金', sold: 300 },
{ genre: '混合基金', sold: 180 },
{ genre: '货币基金', sold: 90 },
{ genre: 'QDII基金', sold: 60 },

];

const { props } = (
<Canvas context={context} pixelRatio={window.devicePixelRatio}>
<Chart data={multiLineData}>
<Legend layoutMode="adaptive" />
<Interval x="genre" y="sold" color="genre" />
</Chart>
</Canvas>
);

const canvas = new Canvas(props);
canvas.render();
5 changes: 5 additions & 0 deletions site/examples/component/legend/demo/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
"en": "Category"
},
"demos": [
{
"filename": "layoutMode.jsx",
"title": "图例布局",
"screenshot": "https://gw.alipayobjects.com/zos/finxbff/compress-tinypng/f2904dad-1828-45a9-aacd-d1a3f623cddd.png"
},
{
"filename": "custom.jsx",
"title": "自定义图例",
Expand Down
20 changes: 18 additions & 2 deletions site/examples/component/legend/index.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ order: 1

### 基础示例

- [基础图例](./demo/legend.jsx):展示基本的图例组件。
- 基础图例:展示基本的图例组件。

```jsx
import { jsx, Canvas, Chart, Legend } from '@antv/f2';
Expand All @@ -29,10 +29,26 @@ const { props } = (
);
```

### 布局方式

- [基础图例](./demo/legend.jsx):展示基本的图例组件。
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

此处的列表项内容看起来是复制粘贴错误。它位于“布局方式”章节下,但链接和描述都是关于“基础图例”。这会给用户带来困惑。建议更新此处的链接和描述,使其与本章节内容(图例布局)和下方的代码示例(layoutMode="adaptive")保持一致。

Suggested change
- [基础图例](./demo/legend.jsx)展示基本的图例组件
- [图例布局](./demo/layoutMode.jsx)展示图例的自适应布局方式


```jsx
import { jsx, Canvas, Chart, Legend } from '@antv/f2';

const { props } = (
<Canvas context={context}>
<Chart data={data}>
<Legend position="bottom" layoutMode="adaptive" />
</Chart>
</Canvas>
);
```

### 进阶用法

- [自定义图例](./demo/custom.jsx):自定义样式和布局的图例。
- [可交互图例](./demo/interactive.jsx):支持点击交互的图例组件
- [可交互图例](./demo/layoutMode.jsx):两种布局方式
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

描述“两种布局方式”不准确。链接的 layoutMode.jsx 示例仅演示了 adaptive 一种布局方式。为了避免误导,建议将描述修改为更能反映示例内容。例如,可以强调其交互性和自适应布局的特点。

Suggested change
- [可交互图例](./demo/layoutMode.jsx)两种布局方式
- [可交互图例](./demo/layoutMode.jsx)支持交互和自适应布局的图例


## 使用场景

Expand Down
2 changes: 1 addition & 1 deletion site/examples/component/shape/index.zh.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Shape 组件与图形标签
title: 图形标签
order: 2
---

Expand Down
7 changes: 4 additions & 3 deletions site/examples/pie/pie/demo/labelline-pie.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** @jsx jsx */
import { jsx, Canvas, Chart, Interval, PieLabel } from '@antv/f2';
import { Canvas, Chart, Interval, jsx, PieLabel } from '@antv/f2';

const data = [
{
Expand Down Expand Up @@ -37,7 +37,7 @@ const { props } = (
coord={{
transposed: true,
type: 'polar',
radius: 0.75,
radius: 0.7,
}}
>
<Interval
Expand All @@ -50,7 +50,8 @@ const { props } = (
}}
/>
<PieLabel
sidePadding={40}
type="spider"
sidePadding={10}
label1={(data, record) => {
return {
text: data.name,
Expand Down
3 changes: 2 additions & 1 deletion site/examples/pie/pie/demo/pie-with-label.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** @jsx jsx */
import { jsx, Canvas, Chart, Interval, PieLabel, Legend } from '@antv/f2';
import { Canvas, Chart, Interval, jsx, Legend, PieLabel } from '@antv/f2';

const data = [
{
Expand Down Expand Up @@ -78,6 +78,7 @@ const { props } = (
/>
<Legend position="top" />
<PieLabel
type="spider"
label1={(data) => {
return {
text: data.memo,
Expand Down
25 changes: 13 additions & 12 deletions site/examples/pie/pie/demo/selection.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** @jsx jsx */
import { jsx, Canvas, Chart, Interval, Legend } from '@antv/f2';
import { Canvas, Chart, Interval, jsx, Legend, PieLabel } from '@antv/f2';

const data = [
{
Expand All @@ -22,16 +22,6 @@ const data = [
percent: 0.15,
a: '1',
},
{
name: '峰爆',
percent: 0.05,
a: '1',
},
{
name: '其他',
percent: 0.02,
a: '1',
},
];

const context = document.getElementById('container').getContext('2d');
Expand All @@ -40,7 +30,7 @@ const { props } = (
<Chart
data={data}
coord={{
radius: 0.8,
radius: 0.6,
transposed: true,
type: 'polar',
}}
Expand All @@ -60,6 +50,17 @@ const { props } = (
},
}}
/>
<PieLabel
type="spider"
label1={(data, record) => {
return {
text: data.name,
fill: record.color,
};
}}
label2=""
/>
<Legend position="top" />
</Chart>
</Canvas>
);
Expand Down
Loading