-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2097 from VisActor/sync/develop-to-dev-1.9.0
Sync/develop to dev 1.9.0
- Loading branch information
Showing
66 changed files
with
8,993 additions
and
1,881 deletions.
There are no files selected for viewing
11 changes: 11 additions & 0 deletions
11
common/changes/@visactor/vchart/feat-align-inline-items_2024-01-21-08-03.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "comment": "feat: support `alignSelf` of layout `normal-inline` elements, fix #2072 \n\n", | ||
| "type": "none", | ||
| "packageName": "@visactor/vchart" | ||
| } | ||
| ], | ||
| "packageName": "@visactor/vchart", | ||
| "email": "[email protected]" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@visactor/vchart/fix-axis-sort-in-datazoom_2024-01-17-04-07.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "comment": "fix: fix sortDataByAxis not work after datazoom changed axis\n\n", | ||
| "type": "none", | ||
| "packageName": "@visactor/vchart" | ||
| } | ||
| ], | ||
| "packageName": "@visactor/vchart", | ||
| "email": "[email protected]" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@visactor/vchart/fix-crosshair-timer_2024-01-19-09-24.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "comment": "fix: fix bug of crosshair timer, fix #2088\n\n", | ||
| "type": "none", | ||
| "packageName": "@visactor/vchart" | ||
| } | ||
| ], | ||
| "packageName": "@visactor/vchart", | ||
| "email": "[email protected]" | ||
| } |
11 changes: 11 additions & 0 deletions
11
common/changes/@visactor/vchart/fix-multi-axis-layout_2024-01-17-11-27.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "comment": "feat: support new layout type region-relative-overlap\n\n", | ||
| "type": "none", | ||
| "packageName": "@visactor/vchart" | ||
| } | ||
| ], | ||
| "packageName": "@visactor/vchart", | ||
| "email": "[email protected]" | ||
| } |
10 changes: 10 additions & 0 deletions
10
...nges/@visactor/vchart/fix-update-animation-excludes-defined-channel_2024-01-19-08-04.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@visactor/vchart", | ||
| "comment": "fix: update animation should exludes `defined` channel", | ||
| "type": "none" | ||
| } | ||
| ], | ||
| "packageName": "@visactor/vchart" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| --- | ||
| category: examples | ||
| group: layout | ||
| title: 行内元素对齐配置 | ||
| order: 37-3 | ||
| cover: | ||
| option: pieChart#layout | ||
| --- | ||
|
|
||
| # 行内元素对齐配置 | ||
|
|
||
| 在图表中，行内布局的元素，可以通过`alignSelf`调整行内对齐方式。 | ||
|
|
||
| ## 关键配置 | ||
|
|
||
| - layoutType: 'normal-inline'，行内布局类型。 | ||
| - alignSelf: 'end'，调整行内对齐方式。 | ||
|
|
||
| ## 代码演示 | ||
|
|
||
| ```javascript livedemo | ||
| const spec = { | ||
| type: 'common', | ||
| data: [ | ||
| { | ||
| id: 'id0', | ||
| values: [ | ||
| { type: '0~29', value: '126.04' }, | ||
| { type: '30~59', value: '128.77' }, | ||
| { type: '60~', value: '77.09' } | ||
| ] | ||
| }, | ||
| { | ||
| id: 'id1', | ||
| values: [ | ||
| { type: '0~9', value: '39.12' }, | ||
| { type: '10~19', value: '43.01' }, | ||
| { type: '20~29', value: '43.91' }, | ||
| { type: '30~39', value: '45.4' }, | ||
| { type: '40~49', value: '40.89' }, | ||
| { type: '50~59', value: '42.48' }, | ||
| { type: '60~69', value: '39.63' }, | ||
| { type: '70~79', value: '25.17' }, | ||
| { type: '80 and over', value: '12.29' } | ||
| ] | ||
| } | ||
| ], | ||
| series: [ | ||
| { | ||
| type: 'pie', | ||
| dataIndex: 0, | ||
| outerRadius: 0.65, | ||
| innerRadius: 0, | ||
| valueField: 'value', | ||
| categoryField: 'type', | ||
| label: { | ||
| position: 'inside', | ||
| visible: true, | ||
| style: { | ||
| fill: 'white' | ||
| } | ||
| }, | ||
| pie: { | ||
| style: { | ||
| stroke: '#ffffff', | ||
| lineWidth: 2 | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| type: 'pie', | ||
| dataIndex: 1, | ||
| outerRadius: 0.8, | ||
| innerRadius: 0.67, | ||
| valueField: 'value', | ||
| categoryField: 'type', | ||
| label: { | ||
| visible: true | ||
| }, | ||
| pie: { | ||
| style: { | ||
| stroke: '#ffffff', | ||
| lineWidth: 2 | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| color: ['#98abc5', '#8a89a6', '#7b6888', '#6b486b', '#a05d56', '#d0743c', '#ff8c00'], | ||
| title: { | ||
| visible: true, | ||
| text: 'Population Distribution by Age in the United States, 2021 (in millions)', | ||
| textStyle: { | ||
| fontFamily: 'Times New Roman' | ||
| } | ||
| }, | ||
| legends: [ | ||
| { | ||
| visible: true, | ||
| title: { | ||
| visible: true, | ||
| text: 'Inner' | ||
| }, | ||
| orient: 'right', | ||
| layoutType: 'normal-inline', | ||
| position: 'middle', | ||
| alignSelf: 'end', | ||
| maxHeight: 100, | ||
| data: (data, colorScale, globalScale) => { | ||
| return data.slice(0, 3); | ||
| } | ||
| }, | ||
| { | ||
| visible: true, | ||
| orient: 'right', | ||
| layoutType: 'normal-inline', | ||
| position: 'middle', | ||
| alignSelf: 'end', | ||
| title: { | ||
| visible: true, | ||
| text: 'Outter' | ||
| }, | ||
| maxHeight: 100, | ||
| data: (data, colorScale, globalScale) => { | ||
| return data.slice(3); | ||
| } | ||
| } | ||
| ] | ||
| }; | ||
|
|
||
| const vchart = new VChart(spec, { dom: CONTAINER_ID }); | ||
| vchart.renderAsync(); | ||
|
|
||
| // Just for the convenience of console debugging, DO NOT COPY! | ||
| window['vchart'] = vchart; | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.