[echarts-doc] 01/01: doc: changelog of 5.3.1
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 3dbdaee528fb2dc2fc7a1ed8b90fcb8bfa00c96e Author: Ovilia AuthorDate: Tue Mar 1 17:25:40 2022 +0800 doc: changelog of 5.3.1 --- en/changelog.md | 18 ++ zh/changelog.md | 18 ++ 2 files changed, 36 insertions(+) diff --git a/en/changelog.md b/en/changelog.md index 9f2ad1e..e7500e1 100644 --- a/en/changelog.md +++ b/en/changelog.md @@ -1,4 +1,22 @@ ## v5.3.0 +2022-03-01 + ++ [Feature] [i18n] Add korean translation [#16582](https://github.com/apache/echarts/issues/16582) ([hijae](https://github.com/hijae)) ++ [Feature] [heatMap] Add `borderRadius` option to heatmap. [#16493](https://github.com/apache/echarts/issues/16493) ([Rain120](https://github.com/Rain120)) ++ [Fix] [lines] Fix potential memory leak in the effect line when `setOption` with `notMerge`. [#16525](https://github.com/apache/echarts/issues/16525) ([pissang](https://github.com/pissang)) ++ [Fix] [line] Fix stepped line charts with empty data. [#16435](https://github.com/apache/echarts/issues/16435) ([Gyyi](https://github.com/Gyyi)) ++ [Fix] [line] Fix empty data in lttb sampling. [#16431](https://github.com/apache/echarts/issues/16431) ([fuchunhui](https://github.com/fuchunhui)) ++ [Fix] [tooltip] Changing default time formatter to be in 24-hour format. [#16421](https://github.com/apache/echarts/issues/16421) ([Comee](https://github.com/Comee)) ++ [Fix] [graphic] Fix `cursor` doesn't work in `graphic` component. [#16513](https://github.com/apache/echarts/issues/16513) ([plainheart](https://github.com/plainheart)) ++ [Fix] [pictorialBar] Fix pictorialBar data with value of 0. [#16469](https://github.com/apache/echarts/issues/16469) ([fuchunhui](https://github.com/fuchunhui)) ++ [Fix] [svg] Fix shared vnode in pattern brings render issue. [#889](https://github.com/ecomfe/zrender/issues/889) ([pissang](https://github.com/pissang)) ++ [Fix] [tooltip] Fix `legend.tooltip.enterable` and `tooltip.enterable`. [#16463](https://github.com/apache/echarts/issues/16463) ([fuchunhui](https://github.com/fuchunhui)) ++ [Feature] [event] Provide label index in axis events [#16187](https://github.com/apache/echarts/issues/16187) ([Ovilia](https://github.com/Ovilia)) ++ [Fix] [sunburst] Centering labels of sunburst at the first level. [#16425](https://github.com/apache/echarts/issues/16425) ([FrankChencc](https://github.com/FrankChencc)) ++ [Fix] [tooltip] Hide tooltip when data view is open. [#16321](https://github.com/apache/echarts/issues/16321) ([plainheart](https://github.com/plainheart)) ++ [Fix] Fix sampling with zero width charts. [#16372](https://github.com/apache/echarts/issues/16372) ([Cuiyansong](https://github.com/Cuiyansong)) + +## v5.3.0 2022-01-27 + [Feature] Introduce new keyframe based animation to graphic component and custom series. [#16225](https://github.com/apache/echarts/issues/16225) ([pissang](https://github.com/pissang)) diff --git a/zh/changelog.md b/zh/changelog.md index f86827e..212ef55 100644 --- a/zh/changelog.md +++ b/zh/changelog.md @@ -1,4 +1,22 @@ ## v5.3.0 +2022-03-01 + ++ [Feature] [i18n] 新增韩语翻译。 [#16582](https://github.com/apache/echarts/issues/16582) ([hijae](https://github.com/hijae)) ++ [Feature] [heatMap] 热力图支持 `borderRadius` 配置项。 [#16493](https://github.com/apache/echarts/issues/16493) ([Rain120](https://github.com/Rain120)) ++ [Fix] [lines] 修复 `setOption` 且 `notMerge` 时 effectLine 的潜在内存泄漏。 [#16525](https://github.com/apache/echarts/issues/16525) ([pissang](https://github.com/pissang)) ++ [Fix] [line] 修复阶梯折线图空数据引起的斜线。 [#16435](https://github.com/apache/echarts/issues/16435) ([Gyyi](https://github.com/Gyyi)) ++ [Fix] [line] 修复 lttb 采样中空数据的问题。 [#16431](https://github.com/apache/echarts/issues/16431) ([fuchunhui](https://github.com/fuchunhui)) ++ [Fix] [tooltip] 时间 formatter 默认采用 24 小时制。 [#16421](https://github.com/apache/echarts/issues/16421) ([Comee](https://github.com/Comee)) ++ [Fix] [graphic] 修复 `graphic` 组件中 `cursor` 无效的问题。 [#16513](https://github.com/apache/echarts/issues/16513) ([plainheart](https://github.com/plainheart)) ++ [Fix] [pictorialBar] 修复象形柱图数据为 0 时的问题。 [#16469](https://github.com/apache/echarts/issues/16469) ([fuchunhui](https://github.com/fuchunhui)) ++ [Fix] [svg] 修复图案中由于共享 vnode 引起的渲染问题。 [#889](https://github.com/ecomfe/zrender/issues/889) ([pissang](https://github.com/pissang)) ++ [Fix] [tooltip] 修复 `legend.tooltip.enterable` 和 `tooltip.enterable` 无效的问题。 [#16463](https://github.com/apache/echarts/issues/16463) ([fuchunhui](https://github.com/fuchunhui)) ++ [Feature] [event] 在坐标轴事件中提供标签 index 信息。 [#16187](https://github.com/apache/echarts/issues/16187) ([Ovilia](https://github.com/Ovilia)) ++ [Fix] [sunburst] 修复旭日图首层数据文本居中的问题。 [#16425](https://github.com/apache/echarts/issues/16425) ([FrankChencc](https://github.com
[echarts] 01/01: Merge pull request #16589 from apache/master
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch release in repository https://gitbox.apache.org/repos/asf/echarts.git commit d2b73b9c8e58a16df05d51f492d826682d9406f7 Merge: 0878d30 fdf5490 Author: Wenli Zhang AuthorDate: Mon Feb 28 15:18:37 2022 +0800 Merge pull request #16589 from apache/master Merge master into release for 5.3.1 src/chart/bar/BarSeries.ts| 4 +- src/chart/bar/PictorialBarView.ts | 2 +- src/chart/funnel/FunnelSeries.ts | 4 +- src/chart/gauge/GaugeSeries.ts| 4 +- src/chart/heatmap/HeatmapSeries.ts| 8 +- src/chart/heatmap/HeatmapView.ts | 13 +- src/chart/helper/EffectLine.ts| 64 +++--- src/chart/helper/Symbol.ts| 10 +- src/chart/helper/SymbolDraw.ts| 7 +- src/chart/line/LineView.ts| 39 ++-- src/chart/lines/LinesSeries.ts| 4 +- src/chart/parallel/ParallelSeries.ts | 6 +- src/chart/pie/PieView.ts | 6 - src/chart/radar/RadarSeries.ts| 4 +- src/chart/sunburst/SunburstPiece.ts | 8 +- src/chart/themeRiver/ThemeRiverSeries.ts | 4 +- src/chart/tree/TreeView.ts| 2 +- src/component/axis/AxisBuilder.ts | 6 + src/component/graphic/GraphicView.ts | 14 +- src/component/toolbox/feature/DataView.ts | 34 ++-- src/component/tooltip/TooltipView.ts | 1 + src/data/DataStore.ts | 16 +- src/i18n/langKO.ts| 142 + src/processor/dataSample.ts | 2 +- src/util/format.ts| 2 +- src/util/types.ts | 2 +- test/axisLabel.html | 13 +- test/graphic-cases.html | 57 +- test/heatmap-borderRadius.html| 328 ++ test/lib/testHelper.js| 4 +- test/line-sampling.html | 294 ++ test/line-step.html | 110 ++ test/node/ssr.js | 20 +- test/runTest/actions/__meta__.json| 1 + test/runTest/actions/line-sampling.json | 1 + test/sunburst-label.html | 118 +++ test/tooltip-setOption.html | 51 + 37 files changed, 1241 insertions(+), 164 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch release updated (0878d30 -> d2b73b9)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/echarts.git. from 0878d30 Merge pull request #16414 from apache/release-dev add 1c03aa3 fix(dtatsample): fix rate infinity cause range error add 847c48e refactor(datasample): use globale function to replace type check which include special values add 4fe9cb0 Merge pull request #16372 from Cuiyansong/master add a5041f6 tooltip中time类型的字段默认使用的12小时制展示，容易产生困惑，改成24小时制展示 add ddc57f4 Merge pull request #16421 from Comee/master add 7189ddf Merge pull request #16441 from apache/release add 1bb1028 fix(pie): remove unused code. add 9b6bb68 Merge pull request #16444 from apache/remove-unused-code add ee2d85a fix(tooltip): set content tooltip.enterable along with render tooltip.enterable. close #16440 add b683f03 Merge pull request #16463 from fuchunhui/fix-16440 add 406c11f fix(pictorialBar): set valueLineWidth NaN value to zero. close #16423 add fece30a Merge pull request #16469 from fuchunhui/fix-16423 add 66290cc [Feature] add borderRadius option to heatmap (#16493) add 8ad3b74 fix(dataview): hide tooltip when data view is open, use padding instead of inset 5px to avoid click the below layers. add ba4d92e fix(dataview): still set `overflow` as `auto`. add 08d010a Merge pull request #16321 from apache/fix-dataview add 112d725 Merge pull request #16509 from apache/next add 2317a9a fix(graphic): fix `cursor` doesn't work in `graphic` component. add 52e8ad3 fix(graphic): use default cursor if no cursor option is provided. add e4bdd30 Merge pull request #16513 from apache/fix-graphic-cursor add c3726e1 perf(symbol): fix potential memory leak in effect symbol with notMerge add d6f07f1 fix code style add 949d160 Merge pull request #16525 from apache/fix-memory-leak add 1661f9b fix(line): using sampling with lttb, NaN point should not be filtered. close #14689 add 071ffc2 fix(line): using sampling with lttb, use a variable instead of an array. close #14689 add 1640cae test(line): add sampling lttb action, test connectNulls. close #14689 add 6b40654 fix(line): optimize sampling lttb, resize newIndices count. close 4689 add e258370 fix(line): optimize sampling lttb, remove _newIndice. close #14689 add 6ba672d fix(line): ensure the correct order of indices, add test case. close #14689 add fdfb46c Merge pull request #16431 from fuchunhui/fix-14689 add 2483a4b fix(line): 过滤空节点, 避免阶梯线条变为斜线 add 9615566 fix(line): fix syntax errors add becb00f fix(line): filter null points only when using connetNull:true add 1149be5 test: add line-step.html add f4e1864 Merge pull request #16435 from Gyyi/master add 6dfbaf0 fix(sunburst) set the position of label in center when angle is 2π. close #16296 add 98819a6 fix(sunburst) set the position of label in center when angle is 2π and r0 is 0. close #16296 add 40246ae fix(sunburst) set the position of label in center when angle is 2π and r0 is 0. close #16296 add 3ac0562 fix(sunburst) set the position of label in center when angle is 2π and r0 is 0. close #16296 add 1c27d45 add test case add 194f23e change comment add 6a42c39 Merge pull request #16425 from FrankChencc/fix-16296 add 1762a32 add korean translation add 95ad522 Merge pull request #16582 from hijae/korean-translation add e6490e6 fix(event): provide label index in axis events add 4f52057 Merge branch 'master' into fix-15798 add 37b4286 feat: provide tickIndex and dataIndex add 66c5c22 fix: dataIndex add fdf5490 Merge pull request #16187 from apache/fix-15798 new d2b73b9 Merge pull request #16589 from apache/master The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/chart/bar/BarSeries.ts | 4 +- src/chart/bar/PictorialBarView.ts | 2 +- src/chart/funnel/FunnelSeries.ts | 4 +- src/chart/gauge/GaugeSeries.ts | 4 +- src/chart/heatmap/HeatmapSeries.ts | 8 +- src/chart/heatmap/HeatmapView.ts | 13 +- src/chart/helper/EffectLine.ts | 64 ++-- src/chart/helper/Symbol.ts | 10 +- src/chart/helper/SymbolDraw.ts | 7 +- src/chart/line/LineView.ts | 39 ++- src/chart/lines/LinesSeries.ts | 4 +- src/chart/parallel/ParallelSeries.ts | 6 +- src/chart/pie/PieView.ts |
[echarts] 01/01: Merge pull request #16187 from apache/fix-15798
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit fdf54901508c31002ca768471b4b311c3cef6b6a Merge: 95ad522 66c5c22 Author: Wenli Zhang AuthorDate: Mon Feb 28 11:47:02 2022 +0800 Merge pull request #16187 from apache/fix-15798 feat(event): provide label index in axis events src/component/axis/AxisBuilder.ts | 6 ++ test/axisLabel.html | 13 +++-- 2 files changed, 13 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (95ad522 -> fdf5490)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git. from 95ad522 Merge pull request #16582 from hijae/korean-translation add e6490e6 fix(event): provide label index in axis events add 4f52057 Merge branch 'master' into fix-15798 add 37b4286 feat: provide tickIndex and dataIndex add 66c5c22 fix: dataIndex new fdf5490 Merge pull request #16187 from apache/fix-15798 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/component/axis/AxisBuilder.ts | 6 ++ test/axisLabel.html | 13 +++-- 2 files changed, 13 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-15798 updated (37b4286 -> 66c5c22)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-15798 in repository https://gitbox.apache.org/repos/asf/echarts.git. from 37b4286 feat: provide tickIndex and dataIndex add 66c5c22 fix: dataIndex No new revisions were added by this update. Summary of changes: src/component/axis/AxisBuilder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-15798 updated (e6490e6 -> 37b4286)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-15798 in repository https://gitbox.apache.org/repos/asf/echarts.git. from e6490e6 fix(event): provide label index in axis events add 812dac2 Feat(line): click event on whole line add 9226bab Merge pull request #15535 from susiwen8/line-click add d534395 Merge pull request #15662 from apache/master add 4d55a6a Merge pull request #15727 from apache/master add 47f7741 Merge pull request #15746 from apache/release add 0292e76 revert(line): revert the default design "make line bolder in the empahsis state". add b5d315c Merge pull request #15767 from apache/revert-default-line-bolder add ead64f7 style: optimize symbol visual code add 703086e Merge pull request #15846 from apache/optimize-code add 27b2398 Revert "Feat(line): event on whole line" add 3484439 Merge pull request #15848 from apache/revert-15535-line-click add 3b191a1 fix(progressive): only update status on the new rendered elements add 36ecdd1 perf(progressive): optimize performance for chart with progressive add f76464c fix(large): fix event and tooltip on large symbol and lines add d594782 fix(progressive): use separate zlevel for each progressive series. add 6a91af3 fix: remove used default zlevel add 3cae99e fix(zlevel): optimize zlevel allocate for effect series add 9f6f32c fix ut in graphics component add 44e26a8 wip(ssr): integrate ssr svg output. upgrade ts add 116b245 fix(class): optimize native class mixed with legacy class extend. add f8a0090 wip(ssr): fix tooltip when no dom given in ssr mode add 3bd240c refact: remove code that for ancient browsers add dec7082 chore: add process env define in dev add 54ddfa2 wip(ssr): optimize pie animation in ssr add 332afce Merge branch 'next' into svg-ssr add d51777e chore: upgrade zrender to latest nightly version add 708da07 chore: optimize esbuild output add 01568b3 feat: provide new setPlatformAPI add 9e6fb8d feat: add renderToString. use reanderToCanvas to replace getRenderedCanvas add b14b885 feat(ssr): rename renderToString to renderToSVGString add 06d90a7 remove usage of deprecated getRenderedCanvas add e5c8c15 Merge pull request #15880 from apache/svg-ssr add 28d6cea Merge branch 'next' into optimize-progressive add 1a0492d Merge pull request #15870 from apache/optimize-progressive add 7e05fa5 fix: show tooltip when all val are null add e7daf0c Merge pull request #16001 from kongmoumou/fix-tooltip add 02eea12 Merge pull request #16104 from apache/master add 1916e1d chore(core): remove `ssr` limit for `renderToSVGString` add bdcc024 type(core): remove unnecessary `as any` add c709e42 chore: update zrender to latest nightly version. add 2a84ce6 chore: tweak the wording on the error message add 515c724 chore: revert package-lock.json. (c709e425dd5f9b724187fa02e9b6cc7e9bd634f5) add 69e6917 Update package-lock.json add 2115f55 Merge pull request #16113 from apache/ssr add e546f19 fix(tooltip): only throttle `updatePosition` function when transition is enabled, resolves #16101. add de2cdea fix(tooltip): simplify throttle logic. add f670da7 Merge pull request #16212 from apache/fix-tooltip-lag add 4c62b1e fix: use common helper `createFloat32Array` to simplify the large arrray creation. add 5dea867 Merge pull request #16210 from apache/simplify-large-arr-creation add 3d7bf24 refact(graphic): seperate view and model add 6199529 refact(custom): extract common helpers for transition add fb3daa2 feat(graphic): add transition api add 4501552 refact(transition): rename modules add cca2206 fix(transition): not do strict checking. some code cleanup add a3eedb3 feat(transition): support transition to be configured all. add 37c4b1b feat(transition): fix transition in layout params add 24a9984 feat(transition): fix style transition all add 2eea25e fix wrong import from lib add b30b63f feat(transition) optimize enterFrom and leaveTo. fix style loose in custom add e449a87 feat(animation): add keyframe based animation add 1c9e3dc feat(animation):fix null property access add c021861 Merge branch 'next' into graphic-animation add 459377a feat(animation): rename to keyframeAnimation add 4566b94 feat(transition): optimize types add 393eb30 feat(transition): add animation config per element add dc5bc85 feat(animation): fix during in enter and leave animation add 7e96d4c feat(animation): improve validation logs add b5b2185 feat(animation): fix some animation abort bug add 6eb6cd9 fix(graphic): fix textConfig not work add 48ba921 feat(animation): restore props afte
[echarts-bar-racing] branch master updated (0eaff8c -> 5fdd6de)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git. from 0eaff8c feat: use mocked faq new 30d380f feat: use WebM new 5fdd6de fix: update i18n The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: package-lock.json | 47 +++ package.json | 4 ++-- src/components/BBody.vue | 22 +--- src/components/BChart.vue | 51 +++ src/helper/timeline.ts| 13 ++-- src/i18n/en-US.ts | 9 - src/i18n/zh-CN.ts | 9 - 7 files changed, 99 insertions(+), 56 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-bar-racing] 02/02: fix: update i18n
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git
commit 5fdd6de1fa8d85164d679fc808bc0de0eeb968ca
Author: Ovilia
AuthorDate: Mon Feb 21 18:05:50 2022 +0800
fix: update i18n
---
src/components/BBody.vue | 16 ++--
src/components/BChart.vue | 2 +-
src/i18n/en-US.ts | 7 +++
src/i18n/zh-CN.ts | 7 +++
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/components/BBody.vue b/src/components/BBody.vue
index 9ba94c7..fc549af 100644
--- a/src/components/BBody.vue
+++ b/src/components/BBody.vue
@@ -153,10 +153,13 @@
-
+
{{$t('generateVideo')}}
+
+{{$t('videoSupported')}}
+
@@ -204,6 +207,7 @@ export default defineComponent({
data() {
const i18n = this.$i18n as any;
return {
+isChrome: /Chrome/.test(navigator.userAgent) && /Google
Inc/.test(navigator.vendor),
selectedDemo: 'complicated',
demoData: expectancy,
title: i18n.t('titleComplicated'),
@@ -298,8 +302,8 @@ export default defineComponent({
async downloadVideo() {
if (!this.width || !this.height) {
this.$notify.error({
-title: '视频高度宽度错误！',
-message: '高度宽度不能为 0',
+title: this.$i18n.t('videSizeError'),
+message: this.$i18n.t('videSizeErrorHint'),
duration: 0,
position: 'bottom-left'
});
@@ -311,7 +315,7 @@ export default defineComponent({
this.isExportingVideo = false;
if (isSuccess) {
this.$notify({
-title: '导出成功！',
+title: this.$i18n.t('videoSuccess'),
type: 'success',
duration: 3000,
position: 'bottom-left'
@@ -319,8 +323,8 @@ export default defineComponent({
}
else {
this.$notify.error({
-title: '导出失败！',
-message: '建议使用最新版 Chrome 或 Firefox',
+title: this.$i18n.t('videoFail'),
+message: this.$i18n.t('videoFailHint'),
duration: 0,
position: 'bottom-left'
});
diff --git a/src/components/BChart.vue b/src/components/BChart.vue
index 9cc2dae..a5c080c 100644
--- a/src/components/BChart.vue
+++ b/src/components/BChart.vue
@@ -10,7 +10,7 @@
{{$t('exporting')}}
-取消
+{{$t('cancel')}}
[echarts-bar-racing] 01/02: feat: use WebM
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git
commit 30d380f895182751f1244764f547743cb76689a6
Author: Ovilia
AuthorDate: Mon Feb 21 17:50:55 2022 +0800
feat: use WebM
---
package-lock.json | 47 +++
package.json | 4 ++--
src/components/BBody.vue | 6 +-
src/components/BChart.vue | 51 +++
src/helper/timeline.ts| 13 ++--
src/i18n/en-US.ts | 2 +-
src/i18n/zh-CN.ts | 2 +-
7 files changed, 75 insertions(+), 50 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 34a6788..3ffdac8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,6 @@
"name": "echarts-www-spa-boilerplate",
"version": "0.0.1",
"dependencies": {
-"canvas-record": "^3.0.0",
"color": "^3.1.3",
"echarts": "^5.3.0",
"element-plus": "^1.0.2-beta.44",
@@ -16,7 +15,8 @@
"jquery": "^3.6.0",
"lodash": "^4.17.21",
"vue": "^3.0.11",
-"vue-i18n": "^9.1.6"
+"vue-i18n": "^9.1.6",
+"webm-writer": "^1.0.0"
},
"devDependencies": {
"@babel/polyfill": "^7.12.1",
@@ -1290,18 +1290,6 @@
"integrity":
"sha512-BmkbxLfStqiPA7IEzQpIk0UFZFf3A4E6fzjPJ6OR+bFC2L8ES9J8zGA/asoi47p8XDVkev+WJo2I2Nc8c/34Yg==",
"dev": true
},
-"node_modules/canvas-record": {
-"version": "3.0.0",
-"resolved":
"https://registry.nlark.com/canvas-record/download/canvas-record-3.0.0.tgz;,
-"integrity": "sha1-FQAe83heyQaBsiE2h2SoMsbN9ig=",
-"dependencies": {
-"file-extension": "^4.0.5"
-},
-"engines": {
-"node": ">=15.0.0",
-"npm": ">=7.0.0"
-}
-},
"node_modules/ccount": {
"version": "1.1.0",
"resolved":
"https://registry.npm.taobao.org/ccount/download/ccount-1.1.0.tgz;,
@@ -2056,14 +2044,6 @@
"format": "^0.2.0"
}
},
-"node_modules/file-extension": {
-"version": "4.0.5",
-"resolved":
"https://registry.nlark.com/file-extension/download/file-extension-4.0.5.tgz;,
-"integrity": "sha1-rmzvNMKOcxOpK6pKqVV1XKzfDOM=",
-"engines": {
-"node": ">=4"
-}
-},
"node_modules/fill-range": {
"version": "7.0.1",
"resolved":
"https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz;,
@@ -5758,6 +5738,11 @@
"vue-tsc": "typescript/bin/tsc"
}
},
+"node_modules/webm-writer": {
+"version": "1.0.0",
+"resolved":
"https://registry.npmmirror.com/webm-writer/-/webm-writer-1.0.0.tgz;,
+"integrity":
"sha512-xafP4mzUqht03HBXP0Ov2YGsxfD08uncad9fQeshYwQXrcP6Z/4uxd1IUaGKqKigFPAgaD9xb6JEKA8SXLQMLA=="
+},
"node_modules/which": {
"version": "1.3.1",
"resolved":
"https://registry.npm.taobao.org/which/download/which-1.3.1.tgz?cache=0_timestamp=1605134855909_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwhich%2Fdownload%2Fwhich-1.3.1.tgz;,
@@ -7219,14 +7204,6 @@
"integrity":
"sha512-BmkbxLfStqiPA7IEzQpIk0UFZFf3A4E6fzjPJ6OR+bFC2L8ES9J8zGA/asoi47p8XDVkev+WJo2I2Nc8c/34Yg==",
"dev": true
},
-"canvas-record": {
-"version": "3.0.0",
-"resolved":
"https://registry.nlark.com/canvas-record/download/canvas-record-3.0.0.tgz;,
-"integrity": "sha1-FQAe83heyQaBsiE2h2SoMsbN9ig=",
-"requires": {
-"file-extension": "^4.0.5"
-}
-},
[echarts-bar-racing] branch master updated: feat: use mocked faq
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git
The following commit(s) were added to refs/heads/master by this push:
new 0eaff8c feat: use mocked faq
0eaff8c is described below
commit 0eaff8ca51c914c575c29e88fb92b8d7eb82e6ca
Author: Ovilia
AuthorDate: Mon Feb 21 16:00:15 2022 +0800
feat: use mocked faq
---
_body.html| 1 +
index.html| 1 +
src/components/BBody.vue | 13 +++--
src/components/BChart.vue | 8 +---
src/components/BTable.vue | 4 ++--
src/helper/timeline.ts| 33 ++---
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/_body.html b/_body.html
index b207dca..6c1dd8c 100644
--- a/_body.html
+++ b/_body.html
@@ -4,4 +4,5 @@
https://cdn.jsdelivr.net/npm/handsontable@6.2.2/dist/handsontable.min.js"</a>;>
+https://buttons.github.io/buttons.js"</a>;>
diff --git a/index.html b/index.html
index 118b727..8b8b543 100644
--- a/index.html
+++ b/index.html
@@ -73,6 +73,7 @@
})();
https://cdn.jsdelivr.net/npm/handsontable@6.2.2/dist/handsontable.min.js"</a>;>
+https://buttons.github.io/buttons.js"</a>;>
diff --git a/src/components/BBody.vue b/src/components/BBody.vue
index 6b69e45..96ef07e 100644
--- a/src/components/BBody.vue
+++ b/src/components/BBody.vue
@@ -4,10 +4,15 @@
{{$t('toolName')}}
+
+https://github.com/apache/echarts-bar-racing; data-size="large"
data-show-count="true" aria-label="Star apache/echarts-bar-racing on
GitHub">Star
+
-{{$t('chartConfigs')}}
+
+{{$t('chartConfigs')}}
+
[echarts-bar-racing] branch master updated: WIP: stoppable raq mocking
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git
The following commit(s) were added to refs/heads/master by this push:
new 25c2aee WIP: stoppable raq mocking
25c2aee is described below
commit 25c2aeed9ad5dce5df20ef02232ea912187f7aba
Author: Ovilia
AuthorDate: Mon Feb 21 15:33:31 2022 +0800
WIP: stoppable raq mocking
---
src/components/BBody.vue | 11 +--
src/components/BChart.vue | 2 +-
src/helper/timeline.ts| 28
3 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/components/BBody.vue b/src/components/BBody.vue
index 8a60a1f..6b69e45 100644
--- a/src/components/BBody.vue
+++ b/src/components/BBody.vue
@@ -245,16 +245,15 @@ export default defineComponent({
});
},
-onTitleChanged(event) {
-console.log(event.target.value)
-if (this.selectedDemo === 'simple') {
+onTitleChanged(demoName) {
+if (demoName === 'simple') {
this.demoData = fruit;
-this.title = this.titleComplicated;
+this.title = this.titleSimple;
this.maxDataCnt = null;
}
-else if (this.selectedDemo === 'complicated') {
+else if (demoName === 'complicated') {
this.demoData = expectancy;
-this.title = this.titleSimple;
+this.title = this.titleComplicated;
this.maxDataCnt = 10;
}
else {
diff --git a/src/components/BChart.vue b/src/components/BChart.vue
index b1e9d41..5f683fd 100644
--- a/src/components/BChart.vue
+++ b/src/components/BChart.vue
@@ -21,9 +21,9 @@
[echarts-bar-racing] branch master updated: WIP: use timeline
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git
The following commit(s) were added to refs/heads/master by this push:
new ebc588c WIP: use timeline
ebc588c is described below
commit ebc588c6430df7f598af0ebf25af0312dd02c98f
Author: Ovilia
AuthorDate: Mon Feb 21 14:53:16 2022 +0800
WIP: use timeline
---
_body.html| 1 -
index.html| 3 +
src/App.vue | 13 ++-
src/components/BBody.vue | 8 +-
src/components/BChart.vue | 5 +-
src/components/BTable.vue | 2 +-
src/helper/timeline.ts| 226 ++
7 files changed, 249 insertions(+), 9 deletions(-)
diff --git a/_body.html b/_body.html
index 6587141..b207dca 100644
--- a/_body.html
+++ b/_body.html
@@ -1,5 +1,4 @@
-https://cdn.jsdelivr.net/npm/handsontable@6.2.2/dist/handsontable.min.css;
rel="stylesheet" media="screen">
diff --git a/index.html b/index.html
index fb9c74f..118b727 100644
--- a/index.html
+++ b/index.html
@@ -6,6 +6,9 @@
ECharts WWW SPA Boilerplate
+html {
+font-size: 10px;
+}
body {
padding: 0;
margin: 0;
diff --git a/src/App.vue b/src/App.vue
index 7402473..e6f0df3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,12 +12,11 @@ import BBody from './components/BBody.vue';
</script>
-<style scoped lang="scss">
+<style>
#echarts-spa-app {
font-family: Avenir, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-text-align: center;
color: #2c3e50;
position: absolute;
@@ -29,10 +28,18 @@ import BBody from './components/BBody.vue';
.el-container {
height: 100%;
-margin-top: -50px;
}
.el-main {
padding: 5px;
}
+
+.text-base {
+font-size: 1.5rem;
+font-weight: bold;
+}
+
+.text-sm {
+font-size: 1.4rem;
+}
\ No newline at end of file
diff --git a/src/components/BBody.vue b/src/components/BBody.vue
index 4033af5..8a60a1f 100644
--- a/src/components/BBody.vue
+++ b/src/components/BBody.vue
@@ -10,7 +10,7 @@
{{$t('chartConfigs')}}
@@ -23,6 +23,7 @@
import {defineComponent} from 'vue';
import * as echarts from 'echarts';
import canvasRecord from 'canvas-record';
+import * as timeline from '../helper/timeline';
const headerLength = 2;
let chart: echarts.ECharts;
@@ -71,6 +72,7 @@ export default defineComponent({
},
captureVideo(width: number, height: number, fps: number):
Promise {
+timeline.startMock();
return new Promise(resolve => {
try {
this.isExportingVideo = true;
@@ -105,6 +107,7 @@ export default defineComponent({
hasError = true;
}
+timeline.stopMock();
this.isExportingVideo = false;
setTimeout(() => {
this.run();
diff --git a/src/components/BTable.vue b/src/components/BTable.vue
index 7c85ca5..9361d3c 100644
--- a/src/components/BTable.vue
+++ b/src/components/BTable.vue
@@ -3,7 +3,7 @@
{{$t('data')}}
-
+
diff --git a/src/helper/timeline.ts b/src/helper/timeline.ts
new file mode 100644
index 000..57a23f8
--- /dev/null
+++ b/src/helper/timeline.ts
@@ -0,0 +1,226 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+declare const window, __VRT_PLAYBACK_SPEED__, __VRT_LOG_ERRORS__,
__VRT_TIMELINE_PAUSED__;
+
+let mockedRaf = null;
+let mockedTimeout = null;
+let mockedTimeoutClear = null;
+let mockedInterval = null;
+let mockedIntervalClear = null;
+
+if (typeof __VRT_PLAYBACK_SPEED__ === 'undefined') {
+window.__VRT_PLAYBACK_SPEED__ = 1;
+}
+const nativeRaf = window.requestAnimatio
[echarts-bar-racing] branch master updated: chore: fix release
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git
The following commit(s) were added to refs/heads/master by this push:
new a3a7d94 chore: fix release
a3a7d94 is described below
commit a3a7d94b5fdaddbc12489f2f70b4c83092976d19
Author: Ovilia
AuthorDate: Fri Feb 18 19:52:52 2022 +0800
chore: fix release
---
_body.html| 5 +
index.html| 3 ++-
src/App.vue | 1 +
src/components/BTable.vue | 4 ++--
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/_body.html b/_body.html
index fddd0ab..6587141 100644
--- a/_body.html
+++ b/_body.html
@@ -1,3 +1,8 @@
+https://cdn.jsdelivr.net/npm/handsontable@6.2.2/dist/handsontable.min.css;
rel="stylesheet" media="screen">
+
+
+https://cdn.jsdelivr.net/npm/handsontable@6.2.2/dist/handsontable.min.js"</a>;>
+
diff --git a/index.html b/index.html
index 725bacc..fb9c74f 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,6 @@
ECharts WWW SPA Boilerplate
-https://cdn.jsdelivr.net/npm/handsontable@6.2.2/dist/handsontable.css;>
body {
padding: 0;
@@ -41,6 +40,7 @@
height: 100%;
}
+https://cdn.jsdelivr.net/npm/handsontable@6.2.2/dist/handsontable.full.min.css;
rel="stylesheet" media="screen">
@@ -69,6 +69,7 @@
document.querySelector('#header .lang').href =
'index.html?locale=' + otherLocale;
})();
+https://cdn.jsdelivr.net/npm/handsontable@6.2.2/dist/handsontable.min.js"</a>;>
diff --git a/src/App.vue b/src/App.vue
index 77b2d87..7402473 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,6 +29,7 @@ import BBody from './components/BBody.vue';
.el-container {
height: 100%;
+margin-top: -50px;
}
.el-main {
diff --git a/src/components/BTable.vue b/src/components/BTable.vue
index d698638..7c85ca5 100644
--- a/src/components/BTable.vue
+++ b/src/components/BTable.vue
@@ -13,7 +13,7 @@ import {defineComponent} from 'vue';
import * as _ from 'lodash';
import Color from 'color';
-import Handsontable from 'handsontable';
+declare const Handsontable;
import handsomeZh from '../i18n/handsometable-zh-CN';
Handsontable.languages.registerLanguageDictionary(handsomeZh);
@@ -35,7 +35,7 @@ function colorRenderer(instance, td, row, col, prop, value) {
return td;
}
-let table: Handsontable;
+let table;
let debouncedTableChange: _.DebouncedFunc<() => void>;
export default defineComponent({
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-bar-racing] branch master updated: fix building
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git
The following commit(s) were added to refs/heads/master by this push:
new 992046f fix building
992046f is described below
commit 992046f8e454093cd10053fdd1652ddd22c86c12
Author: Ovilia
AuthorDate: Fri Feb 18 17:53:27 2022 +0800
fix building
---
src/components/BBody.vue | 2 +-
src/components/BTable.vue | 4 ++--
tsconfig.json | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/components/BBody.vue b/src/components/BBody.vue
index 16e5b7f..4033af5 100644
--- a/src/components/BBody.vue
+++ b/src/components/BBody.vue
@@ -197,7 +197,7 @@ import expectancy from '../data/expectancy';
export default defineComponent({
name: 'BBody',
data() {
-const i18n = this.$$i18n as any;
+const i18n = this.$i18n as any;
return {
selectedDemo: 'complicated',
demoData: expectancy,
diff --git a/src/components/BTable.vue b/src/components/BTable.vue
index f3c7383..d698638 100644
--- a/src/components/BTable.vue
+++ b/src/components/BTable.vue
@@ -11,9 +11,9 @@
[echarts-bar-racing] branch master updated: update i18n
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git
The following commit(s) were added to refs/heads/master by this push:
new 12b422d update i18n
12b422d is described below
commit 12b422d0ffd25cd08617d1d1d1b1854250bb7819
Author: Ovilia
AuthorDate: Fri Feb 18 16:51:27 2022 +0800
update i18n
---
src/components/BBody.vue | 77 +++
src/components/BChart.vue | 9 +++---
src/components/BTable.vue | 2 +-
src/helper/template.ts| 3 +-
src/i18n/en-US.ts | 29 +-
src/i18n/zh-CN.ts | 29 +-
tsconfig.json | 6 ++--
7 files changed, 104 insertions(+), 51 deletions(-)
diff --git a/src/components/BBody.vue b/src/components/BBody.vue
index 0026e75..16e5b7f 100644
--- a/src/components/BBody.vue
+++ b/src/components/BBody.vue
@@ -7,30 +7,28 @@
-示例数据
-
-
-
-
-
-{{$t('chartConfigs')}}
+
+
-
-
-
-
-
-图表设置
+
+
+
+
+
+
+
+
{{$t('chartTitle')}}
@@ -48,7 +46,7 @@
-显示排名上限
+{{$t('maxDataCount')}}
@@ -66,7 +64,7 @@
-每行动画时长（毫秒）
+{{$t('animationDuration')}}
-排序更新时长（毫秒）
+{{$t('reorderDuration')}}
-下载代码
+{{$t('download')}}
-视频设置
+{{$t('videoConfig')}}
-视频宽度
+{{$t('videoWidth')}}
-视频高度
+{{$t('videoHeight')}}
-视频帧率（FPS）
+{{$t('videoFps')}}
-生成视频
+{{$t('generateVideo')}}
@@ -199,14 +197,14 @@ import expectancy from '../data/expectancy';
export default defineComponent({
name: 'BBody',
data() {
+const i18n = this.$$i18n as any;
return {
selectedDemo: 'complicated',
demoData: expectancy,
-// @ts-ignore:
-title: this.$i18n.t('titleComplicated'),
-titleComplicated: this.$i18n.t('titleComplicated'),
-titleSimple: this.$i18n.t('titleSimple'),
-titleNone: this.$i18n.t('titleNone'),
+title: i18n.t('titleComplicated'),
+titleComplicated: i18n.t('titleComplicated'),
+titleSimple: i18n.t('titleSimple'),
+titleNone: i18n.t('titleNone'),
maxDataCnt: 10,
chartData: null,
animationDuration: 3000,
@@ -275,7 +273,8 @@ export default defineComponent({
animationDuration: this.animationDuration,
maxDataCnt: this.maxDataCnt,
title: this.title,
-data
[echarts-handbook] branch master updated: chore: add GA
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new 53d90d2 chore: add GA
53d90d2 is described below
commit 53d90d2c74a48314e5c1bac652df87c41d3124b0
Author: Ovilia
AuthorDate: Tue Feb 15 14:25:29 2022 +0800
chore: add GA
---
app.html | 6 ++
1 file changed, 6 insertions(+)
diff --git a/app.html b/app.html
index d20ce53..8d3c6c6 100644
--- a/app.html
+++ b/app.html
@@ -28,6 +28,7 @@
type="text/javascript"
src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js;
>
+https://www.googletagmanager.com/gtag/js?id=UA-141228404-1"</a>;>
var _hmt = _hmt || []
;(function() {
@@ -38,6 +39,11 @@
var s = document.getElementsByTagName('script')[0]
s.parentNode.insertBefore(hm, s)
})()
+
+ window.dataLayer = window.dataLayer || [];
+ function gtag(){dataLayer.push(arguments);}
+ gtag('js', new Date());
+ gtag('config', 'UA-141228404-1');
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-wordcloud-generator] branch master updated: feat: export image
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git
The following commit(s) were added to refs/heads/master by this push:
new c2201ac feat: export image
c2201ac is described below
commit c2201acbe29f94f8902d16ea956423e63e5d3943
Author: Ovilia
AuthorDate: Mon Jan 10 18:58:58 2022 +0800
feat: export image
---
src/App.vue| 73 --
src/components/WChart.vue | 76 +---
src/components/WConfig.vue | 97 +-
src/components/WData.vue | 37 ++
src/components/WExport.vue | 72 ++
5 files changed, 275 insertions(+), 80 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 3d99246..dede2ab 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,7 @@
{{ $t('title') }}
-
+
-导出
+
+
+
+
+ 项目说明
+
+https://github.com/ecomfe/echarts-wordcloud;
+ target="_blank"
+ >echarts-wordcloud
+是
+https://github.com/apache/echarts; target="_blank"
+ >Apache ECharts
+基于
+https://github.com/timdream/wordcloud2.js; target="_blank"
+ >wordcloud2.js
+的插件，需要使用 JavaScript
+开发。本项目是基于该插件的字符云生成器，用于方便用户无代码生成字符云效果。如果需要更丰富的效果，可以考虑基于上述字符云插件开发。
+
+ 项目源码
+
+https://github.com/apache/echarts-wordcloud-generator;
+ target="_blank"
+>
+ apache/echarts-wordcloud-generator
+
+
+ 版权说明
+
+从本工具下载的图片可免费个人使用或商业使用。源代码版权：
+https://github.com/apache/echarts-wordcloud-generator/blob/master/LICENSE;
+ target="_blank"
+>
+ Apache License 2.0。
+
+
@@ -32,6 +73,7 @@ import { useI18n } from 'vue-i18n';
import WChart from './components/WChart.vue';
import WConfig from './components/WConfig.vue';
import WData from './components/WData.vue';
+import WExport from './components/WExport.vue';
import defaultData from './data/defaultData';
const wconfig = ref(null);
@@ -42,7 +84,19 @@ const { t } = useI18n({ useScope: 'global' });
const activeName = 'config';
function onChange() {
- wchart.value?.run(wdata.value?.data, wconfig.value?.getConfig());
+ wchart.value?.run(
+wdata.value?.data,
+wdata.value?.fillSmall,
+wconfig.value?.getConfig()
+ );
+}
+
+function onSizeChange(size: { width: number; height: number }) {
+ wchart.value?.resize(size.width, size.height);
+}
+
+function onDownload() {
+ wchart.value?.download();
}
function onFontLoading() {
@@ -62,6 +116,10 @@ setTimeout(() => {
h4 {
margin: 10px 0;
}
+
+.el-collapse:first-child {
+ border-top: 0;
+}
@@ -85,4 +143,13 @@ h4 {
height: calc(100vh - 50px);
overflow: auto;
}
+
+#config-tab {
+ margin-top: -15px;
+}
+
+.small {
+ margin: 5px 0 20px 0;
+ font-size: 14px;
+}
diff --git a/src/components/WChart.vue b/src/components/WChart.vue
index 61f8b0b..cbdeea6 100644
--- a/src/components/WChart.vue
+++ b/src/components/WChart.vue
@@ -1,6 +1,13 @@
-aaa
+
@@ -10,16 +17,17 @@ import * as echarts from 'echarts';
import 'echarts-wordcloud';
import Color from 'color';
-// const props = defineProps({
-// foo: String
-// });
const chart = shallowRef(null);
const chartRef = ref(null);
const isWebFontLoading = ref(false);
+const width = ref(800);
+const height = ref(600);
defineExpose({
run,
- setLoading
+ setLoading,
+ resize,
+ download
});
type Config = {
@@ -41,14 +49,53 @@ function setLoading(isLoading: boolean) {
isWebFontLoading.value = isLoading;
}
-function run(data?: [], config?: Config) {
+function resize(w: number, h: number) {
+ w = Math.max(100, w);
+ h = Math.max(100, h);
+ if (width.value !== w || height.value !== h) {
+width.value = w;
+height.value = h;
+ }
+ setTimeout(() => {
+chart.value!.resize();
+ });
+}
+
+function download() {
+ if (chart.value) {
+try {
+ const url = chart.value.getDataURL();
+ const a = document.createElement('a');
+ a.href = url;
+ a.download = 'wordcloud.png';
+ a.click();
+} catch (e) {
+ console.error(e);
+ alert('保存出错了，可以尝试在右图中点击鼠标右键，并选择“图片储存为”');
+}
+ }
+}
+
+function run(data?: [], fillSmall?: boolean, config?: Config) {
+ const chartData = (data ? data.slice() : []) as {
+name: string;
+value: number;
+ }[];
+ // if (fillSmall) {
+ // const smallData = chartData.filter((d) => d.value < 10);
+ //
[echarts] branch master updated: tooltip中time类型的字段默认使用的12小时制展示，容易产生困惑，改成24小时制展示
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/master by this push:
new a5041f6 tooltip中time类型的字段默认使用的12小时制展示，容易产生困惑，改成24小时制展示
new ddc57f4 Merge pull request #16421 from Comee/master
a5041f6 is described below
commit a5041f6f3b829dd6de11b9f218c62f57688d9d5a
Author: Comee <1490220...@qq.com>
AuthorDate: Tue Jan 25 09:15:48 2022 +0800
tooltip中time类型的字段默认使用的12小时制展示，容易产生困惑，改成24小时制展示
---
src/util/format.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/format.ts b/src/util/format.ts
index 372cf1a..883148c 100644
--- a/src/util/format.ts
+++ b/src/util/format.ts
@@ -82,7 +82,7 @@ export function makeValueReadable(
valueType: DimensionType,
useUTC: boolean
): string {
-const USER_READABLE_DEFUALT_TIME_PATTERN = '{}-{MM}-{dd}
{hh}:{mm}:{ss}';
+const USER_READABLE_DEFUALT_TIME_PATTERN = '{}-{MM}-{dd}
{HH}:{mm}:{ss}';
function stringToUserReadable(str: string): string {
return (str && zrUtil.trim(str)) ? str : '-';
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-handbook] branch master updated: fix: punctuation and expression
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new 24b815f fix: punctuation and expression
24b815f is described below
commit 24b815f4c1bd4b1982fedb0cca48b47f3616a0ea
Author: Ovilia
AuthorDate: Mon Jan 24 16:11:06 2022 +0800
fix: punctuation and expression
---
contents/en/basics/release-note/5-3-0.md | 22 +++---
contents/en/posts.yml| 2 +-
contents/zh/basics/release-note/5-3-0.md | 10 +-
contents/zh/posts.yml| 2 +-
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/contents/en/basics/release-note/5-3-0.md
b/contents/en/basics/release-note/5-3-0.md
index 10fd188..97f6191 100644
--- a/contents/en/basics/release-note/5-3-0.md
+++ b/contents/en/basics/release-note/5-3-0.md
@@ -39,13 +39,13 @@ option = {
};
```
-In keyframe animation you can configure the animation duration, delay, easing,
whether to loop or not, the position, easing and graphic properties of each
keyframe. You can also set multiple keyframe animations for each element at the
same time with different configurations. The flexible configuration allows us
to achieve very complex animation effects, here are a few scenarios where
keyframe animation can be applied.
+In keyframe animation you can configure the animation duration, delay, easing,
whether to loop or not, the position, easing, and graphic properties of each
keyframe. You can also set multiple keyframe animations for each element at the
same time with different configurations. The flexible configuration allows us
to achieve very complex animation effects, and here are a few scenarios where
keyframe animation can be applied.
### Custom Loading Animations
-ECharts has a built-in loading animation by default, which can be displayed by
calling `showLoading`. Community often ask for more loading animation effects.
Now with keyframe animations, we can use the [graphic](${optionPath}graphic)
component with keyframe animations to achieve any loading animation effect we
want.
+ECharts has a built-in loading animation by default, which can be displayed by
calling `showLoading`. More loading animation effects have been frequently
asked in the community. Now with keyframe animations, we can use the
[graphic](${optionPath}graphic) component with keyframe animations to achieve
any loading animation effect we want.
-For example, the text stroke animation.
+Here is an example of the text stroke animation.
```js live {layout: 'lr', height:300}
option = {
@@ -150,7 +150,7 @@ option = {
### Extending Richer Animation Effects in the Chart
-Scatter chart with animation effect have long been a feature of ECharts.
Developers can use the [effectScatter](${optionPath}series-effectScatter)
series to implement dynamic scatter chart with ripple effects, which make the
chart more interesting and also serve to highlight the user. As with loading
animations, developers often ask for more animation effects. Now we can achieve
more complex effects by using keyframe animations in our
[custom](${optionPath}series-custom) series.
+Scatter charts with animation effects have long been a feature of ECharts.
Developers can use the [effectScatter](${optionPath}series-effectScatter)
series to implement dynamic scatter charts with ripple effects, which make
charts more interesting and also serve to highlight the user. As with loading
animations, developers often ask for more animation effects. Now we can achieve
more complex effects by using keyframe animations in our
[custom](${optionPath}series-custom) series.
For example, the following example animates the pins drawn by the custom
series on the SVG map with a jumping effect, along with a ripple animation.
@@ -289,7 +289,7 @@ In order to fully exploit the power of new keyframe
animations, Yi Shen from the
## Graphical component transition animations
-We have provided more flexible transition animation configurations for
elements returned in custom series in 5.0. The `transition`, `enterFrom`, and
`leaveTo` configuration items allow you to configure which properties of each
element will have transition animations and how they will be animated when the
graphic is created and removed. For example.
+We have provided more flexible transition animation configurations for
elements returned in the custom series in 5.0. The `transition`, `enterFrom`,
and `leaveTo` configuration items allow you to configure which properties of
each element will have transition animations and how they will be animated when
the graphic is created and removed. Here is an example.
```js
function renderItem() {
@@ -339,7 +339,7 @@ In addition to the performance improvement, we can do more
things with the rende
## Server-side Rendering
[echarts-www] branch master updated: add a new committer
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-www.git
The following commit(s) were added to refs/heads/master by this push:
new 1975e61 add a new committer
1975e61 is described below
commit 1975e61e991878c97f21c18866a0d44351e54ef9
Author: Ovilia
AuthorDate: Fri Jan 21 15:42:29 2022 +0800
add a new committer
---
_jade/en/committers.jade | 6 ++
_jade/zh/committers.jade | 7 ++-
images/people/map1en.jpeg | Bin 0 -> 11866 bytes
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/_jade/en/committers.jade b/_jade/en/committers.jade
index ad599d0..efbcfbb 100644
--- a/_jade/en/committers.jade
+++ b/_jade/en/committers.jade
@@ -184,6 +184,12 @@ block content
h5.about-name Tim Shen
.about-desc Tencent
.about-desc Shenzhen, China
+.col-md-3.col-sm-4.col-xs-6
+.about-person
+a(href='https://github.com/map1en',
target='_blank')
+
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/map1en.jpeg?_v_=#{cdnPayVersion}')
+h5.about-name Map1en
+.about-desc Guangzhou, China
h4.group.contributor Contributors
.row
diff --git a/_jade/zh/committers.jade b/_jade/zh/committers.jade
index 5e62c1e..7499c09 100644
--- a/_jade/zh/committers.jade
+++ b/_jade/zh/committers.jade
@@ -181,6 +181,12 @@ block content
h5.about-name 沈顺天
.about-desc 腾讯
.about-desc 中国 · 深圳
+.col-md-3.col-sm-4.col-xs-6
+.about-person
+a(href='https://github.com/map1en',
target='_blank')
+
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/map1en.jpeg?_v_=#{cdnPayVersion}')
+h5.about-name Map1en
+.about-desc 中国 · 广州
h4.group.contributor Contributors
.row
@@ -226,4 +232,3 @@ block extra_js
//- $('.recommend').removeClass('active');
//- $('.recommend').eq(id).addClass('active');
//- }
-
diff --git a/images/people/map1en.jpeg b/images/people/map1en.jpeg
new file mode 100644
index 000..bdafb30
Binary files /dev/null and b/images/people/map1en.jpeg differ
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated (fea4317 -> 3299297)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. from fea4317 Merge pull request #216 from apache/fix-gradient add 4168741 doc: series-gauge.axisLine.lineStyle.color annotation color[i][0] add ebac5b6 doc: remake note code case with comments from PR217 add 3299297 doc: update gauge lineStyle color explanation No new revisions were added by this update. Summary of changes: en/option/series/gauge.md | 12 +++- zh/option/series/gauge.md | 12 +++- 2 files changed, 22 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: doc: update gauge lineStyle color explanation
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch Rain120-doc/gauge-color
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
commit 32992975dd228815534a20684e7571e7c98e7488
Author: Ovilia
AuthorDate: Thu Jan 20 10:30:53 2022 +0800
doc: update gauge lineStyle color explanation
---
en/option/series/gauge.md | 9 -
zh/option/series/gauge.md | 9 -
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/en/option/series/gauge.md b/en/option/series/gauge.md
index 13bd0be..8356d11 100644
--- a/en/option/series/gauge.md
+++ b/en/option/series/gauge.md
@@ -126,13 +126,13 @@ Default value:
[[1, '#E6EBF8']]
```
-Note: The value of `color[i][0]` means the percentage of the axis line of
gauge chart's segments. Recommend value between 0 then 1, The value in `(0, 1]`
will be valuable.
+Note: The value of `color[i][0]` means the percentage of the axis line of the
gauge chart's segments, which should be between 0 and 1, and `color[i][1]` is
the corresponding color.
```js
color: [
-[0.1, 'red'], // 10% red segments
-[0.2, 'green'], // 20% green segments
-[0.3, 'blue'], // 30% blue segments
+[0.1, 'red'], // 0~10% is red
+[0.2, 'green'], // 10~20% is green
+[0.3, 'blue'], // 20~30% is blue
// ...
]
```
@@ -587,4 +587,3 @@ formatter: function (value) {
return value.toFixed(0);
}
```
-
diff --git a/zh/option/series/gauge.md b/zh/option/series/gauge.md
index b0e1c4d..09d9526 100644
--- a/zh/option/series/gauge.md
+++ b/zh/option/series/gauge.md
@@ -137,13 +137,13 @@ const option = {
[[1, '#E6EBF8']]
```
-注意: `color[i][0]` 的值代表整根轴线的百分比，建议值在 `(0, 1]`，这样的值算是有效值
+注意: `color[i][0]` 的值代表整根轴线的百分比，应在 0 到 1 之间；`color[i][1]` 是对应的颜色。
```js
color: [
-[0.1, 'red'], // 10% 红轴线
-[0.2, 'green'], // 20% 绿轴线
-[0.3, 'blue'], // 30% 蓝轴线
+[0.1, 'red'], // 0~10% 红轴
+[0.2, 'green'], // 10~20% 绿轴
+[0.3, 'blue'], // 20~30% 蓝轴
// ...
]
```
@@ -598,4 +598,3 @@ formatter: function (value) {
return value.toFixed(0);
}
```
-
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch Rain120-doc/gauge-color created (now 3299297)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch Rain120-doc/gauge-color in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. at 3299297 doc: update gauge lineStyle color explanation This branch includes the following new commits: new 3299297 doc: update gauge lineStyle color explanation The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch fix-gradient updated (5e6ba8b -> 79f37f6)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-gradient in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. from 5e6ba8b fix: add color desc for en add 79f37f6 fix: change texture to pattern No new revisions were added by this update. Summary of changes: en/option/option.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch fix-gradient created (now 5e6ba8b)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-gradient in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. at 5e6ba8b fix: add color desc for en This branch includes the following new commits: new 5e6ba8b fix: add color desc for en The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: fix: add color desc for en
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-gradient
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
commit 5e6ba8bbad8270d85b8c792039fa34042aa8548f
Author: Ovilia
AuthorDate: Tue Jan 18 13:42:13 2022 +0800
fix: add color desc for en
---
en/option/option.md | 40 +++-
zh/option/option.md | 2 +-
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/en/option/option.md b/en/option/option.md
index 6ecff7e..510f8b7 100644
--- a/en/option/option.md
+++ b/en/option/option.md
@@ -59,6 +59,45 @@ Defaults:
['#5470c6', '#91cc75', '#fac858', '#ee', '#73c0de', '#3ba272', '#fc8452',
'#9a60b4', '#ea7ccc']
```
+Supported color formats.
+
++ Use RGB for colors, like `'rgb(128, 128, 128)'`, or RGBA if you want to add
an alpha channel for opacity, like `'rgba(128, 128, 128, 0.5)`, or use hex
string, like `'#ccc'`.
+
++ Gradient Color or Texture
+```js
+// Linear gradient with first four parameters x0, y0, x2, y2, ranging from 0 -
1, corresponding to the percentage in the graphical wraparound box, if
globalCoord is ``true``, then the four values are absolute pixel positions
+{
+type: 'linear',
+x: 0,
+y: 0,
+x2: 0,
+y2: 1,
+colorStops: [{
+offset: 0, color: 'red' // color at 0%
+}, {
+offset: 1, color: 'blue' // color at 100%
+}],
+global: false // default is false
+}
+// Radial gradient, the first three parameters are the center x, y and radius,
the values are the same as the linear gradient
+{
+type: 'radial',
+x: 0.5,
+y: 0.5,
+r: 0.5,
+colorStops: [{
+offset: 0, color: 'red' // color at 0%
+}, {
+offset: 1, color: 'blue' // color at 100%
+}],
+global: false // default is false
+}
+// Texture fill
+{
+image: imageDom, // supported as HTMLImageElement, HTMLCanvasElement, path
string not supported
+repeat: 'repeat' // whether to tile, can be 'repeat-x', 'repeat-y',
'no-repeat'
+}
+```
# backgroundColor(Color)
Background color. Defaults to have no background.
@@ -177,4 +216,3 @@ color: {
repeat: 'repeat' // whether to repeat texture, whose value can be
repeat-x, repeat-y, or no-repeat
}
```
-
diff --git a/zh/option/option.md b/zh/option/option.md
index 2b2f863..b61eb4a 100644
--- a/zh/option/option.md
+++ b/zh/option/option.md
@@ -66,7 +66,7 @@
支持的颜色格式：
-+ 使用 RGB 表示纯颜色，比如 `'rgb(128, 128, 128)'`，如果想要加上 alpha 通道表示不透明度，可以使用 RGBA，比如
`'rgba(128, 128, 128, 0.5)'`，也可以使用十六进制格式，比如 `'#ccc'`。
++ 使用 RGB 表示颜色，比如 `'rgb(128, 128, 128)'`，如果想要加上 alpha 通道表示不透明度，可以使用 RGBA，比如
`'rgba(128, 128, 128, 0.5)'`，也可以使用十六进制格式，比如 `'#ccc'`。
+ 渐变色或者纹理填充
```js
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-15915 updated (0ad5438 -> 7ce3d3b)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-15915 in repository https://gitbox.apache.org/repos/asf/echarts.git. from 0ad5438 doc: add deprecared doc for text add 7ce3d3b fix: deprecated log No new revisions were added by this update. Summary of changes: src/preprocessor/helper/compatStyle.ts | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-bot] branch master updated: remove makeapie in demo hint
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-bot.git The following commit(s) were added to refs/heads/master by this push: new bc25c39 remove makeapie in demo hint bc25c39 is described below commit bc25c397bbc97ecac1449760360bc2a6691f92c1 Author: Ovilia AuthorDate: Wed Jan 12 11:14:50 2022 +0800 remove makeapie in demo hint --- src/text.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/text.js b/src/text.js index 0661592..79776cd 100644 --- a/src/text.js +++ b/src/text.js @@ -42,7 +42,7 @@ AT_ISSUE_AUTHOR Would you like to debug it by yourself? This is a quicker way to Please have a look at [How to debug ECharts](https://github.com/apache/echarts/blob/master/CONTRIBUTING.md#how-to-debug-echarts) if you'd like to give a try. 邏`; const MISSING_DEMO = -`AT_ISSUE_AUTHOR Please provide a demo for the issue either with https://codepen.io/Ovilia/pen/dyYWXWM , https://www.makeapie.com/editor.html or https://codesandbox.io/s/mystifying-bash-2uthz.`; +`AT_ISSUE_AUTHOR Please provide a demo for the issue either with https://codepen.io/Ovilia/pen/dyYWXWM , or https://codesandbox.io/s/mystifying-bash-2uthz.`; const ISSUE_TAGGED_PRIORITY_HIGH = `This issue is labeled with \`priority: high\`, which means it's a frequently asked problem and we will fix it ASAP.`; - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-handbook] branch master updated: Update import.md
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new fb8399f Update import.md
new ebf961b Merge pull request #30 from michaelxiaohan/patch-1
fb8399f is described below
commit fb8399f6b42da157ac458e2533b8d339771ea080
Author: chaoge <249671...@qq.com>
AuthorDate: Fri Jan 7 16:15:49 2022 +0800
Update import.md
---
contents/zh/basics/import.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contents/zh/basics/import.md b/contents/zh/basics/import.md
index cc77440..5e55204 100644
--- a/contents/zh/basics/import.md
+++ b/contents/zh/basics/import.md
@@ -39,7 +39,7 @@ myChart.setOption({
## 按需引入 ECharts 图表和组件
-上面的代码会引入所有 ECharts 中所有的图表和组件，但是假如你不想引入所有组件，也可以使用 ECharts 提供的按需引入的接口来打包必须的组件。
+上面的代码会引入 ECharts 中所有的图表和组件，但是假如你不想引入所有组件，也可以使用 ECharts 提供的按需引入的接口来打包必须的组件。
```js
// 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口。
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-wordcloud-generator] branch master updated: feat: user upload shape
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git
The following commit(s) were added to refs/heads/master by this push:
new 07a20d5 feat: user upload shape
07a20d5 is described below
commit 07a20d5daedd371ac87318477284472fe4ca705e
Author: Ovilia
AuthorDate: Fri Jan 7 17:07:34 2022 +0800
feat: user upload shape
---
src/components/WChart.vue | 5 +++--
src/components/WConfig.vue | 40
2 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/components/WChart.vue b/src/components/WChart.vue
index 4d5cce5..61f8b0b 100644
--- a/src/components/WChart.vue
+++ b/src/components/WChart.vue
@@ -65,7 +65,6 @@ function run(data?: [], config?: Config) {
const range = max - min || 1;
return Math.random() * range + min;
}
- console.log(config?.shapeRatio)
function render(maskImage?: HTMLImageElement) {
chart.value!.setOption({
@@ -103,7 +102,9 @@ function run(data?: [], config?: Config) {
let maskImage: HTMLImageElement;
if (config) {
maskImage = new Image();
-maskImage.src = config.shape + '.png';
+maskImage.src = config.shape.startsWith('blob:')
+ ? config.shape
+ : config.shape + '.png';
maskImage.onload = () => {
render(maskImage);
};
diff --git a/src/components/WConfig.vue b/src/components/WConfig.vue
index 6eb62d4..637fb48 100644
--- a/src/components/WConfig.vue
+++ b/src/components/WConfig.vue
@@ -217,6 +217,17 @@
*
+ https://jsonplaceholder.typicode.com/posts/;
+:show-file-list="false"
+list-type="picture"
+:on-success="handleImageSuccess"
+:before-upload="beforeImageUpload">
+
+
+
带 * 的形状来自 https://www.freepik.com; title="Freepik"
_target="_blank">Freepik，查看https://media.flaticon.com/license/license.pdf; _target="_blank">版权
@@ -260,6 +271,7 @@ const width = ref(90);
const height = ref(90);
const selectedMask = ref('heart');
const shapeRatio = ref(true);
+const imageUrl = ref('');
const normalizeFont = (font: string | { name: string; value: string }) => {
if (typeof font === 'string') {
@@ -501,6 +513,18 @@ function addThemeColor() {
emit('change');
}
+function handleImageSuccess(res: any, file: any) {
+ // console.log(res, file);
+ imageUrl.value = URL.createObjectURL(file.raw);
+ selectedMask.value = imageUrl.value;
+ change();
+}
+
+function beforeImageUpload(file: any) {
+ // TODO: loading
+ return true;
+}
+
function getConfig() {
return {
bgColor: bgColor.value,
@@ -615,6 +639,22 @@ $border-color: #e6e6e6;
}
}
+.img-uploader {
+ position: relative;
+ overflow: hidden;
+ top: 6px;
+}
+
+.img-uploader-icon {
+ font-size: 28px;
+ line-height: 55px;
+ text-align: center;
+}
+
+.el-upload {
+ display: block;
+}
+
.el-checkbox {
--el-checkbox-font-color: #888;
margin-top: 7px;
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-wordcloud-generator] branch master updated: feat: shape masks
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git
The following commit(s) were added to refs/heads/master by this push:
new 0e09e56 feat: shape masks
0e09e56 is described below
commit 0e09e565047ef16e2283ad7961af83965af84cc2
Author: Ovilia
AuthorDate: Fri Jan 7 16:08:05 2022 +0800
feat: shape masks
---
public/circle.png| Bin 0 -> 998 bytes
public/cloud.png | Bin 0 -> 705 bytes
public/drop.png | Bin 0 -> 921 bytes
public/echarts-0.png | Bin 0 -> 1892 bytes
public/echarts-1.png | Bin 0 -> 1603 bytes
public/flash.png | Bin 0 -> 1153 bytes
public/flower.png| Bin 0 -> 1748 bytes
public/heart.png | Bin 0 -> 932 bytes
public/hexagonal.png | Bin 0 -> 781 bytes
public/maps-and-flags.png| Bin 0 -> 1171 bytes
public/pentagon.png | Bin 0 -> 1005 bytes
public/question-mark.png | Bin 0 -> 1043 bytes
public/rect.png | Bin 0 -> 290 bytes
public/rhombus.png | Bin 0 -> 732 bytes
public/rounded-rectangle.png | Bin 0 -> 516 bytes
public/splash.png| Bin 0 -> 1410 bytes
public/star.png | Bin 0 -> 964 bytes
public/triangle.png | Bin 0 -> 1049 bytes
public/wow.png | Bin 0 -> 1370 bytes
src/components/WChart.vue| 73 +++---
src/components/WConfig.vue | 175 ---
21 files changed, 192 insertions(+), 56 deletions(-)
diff --git a/public/circle.png b/public/circle.png
new file mode 100644
index 000..c553805
Binary files /dev/null and b/public/circle.png differ
diff --git a/public/cloud.png b/public/cloud.png
new file mode 100644
index 000..c396d7e
Binary files /dev/null and b/public/cloud.png differ
diff --git a/public/drop.png b/public/drop.png
new file mode 100644
index 000..71ff363
Binary files /dev/null and b/public/drop.png differ
diff --git a/public/echarts-0.png b/public/echarts-0.png
new file mode 100644
index 000..bd95647
Binary files /dev/null and b/public/echarts-0.png differ
diff --git a/public/echarts-1.png b/public/echarts-1.png
new file mode 100644
index 000..0238878
Binary files /dev/null and b/public/echarts-1.png differ
diff --git a/public/flash.png b/public/flash.png
new file mode 100644
index 000..4eb9af5
Binary files /dev/null and b/public/flash.png differ
diff --git a/public/flower.png b/public/flower.png
new file mode 100644
index 000..07ca318
Binary files /dev/null and b/public/flower.png differ
diff --git a/public/heart.png b/public/heart.png
new file mode 100644
index 000..7f66ee2
Binary files /dev/null and b/public/heart.png differ
diff --git a/public/hexagonal.png b/public/hexagonal.png
new file mode 100644
index 000..6b89415
Binary files /dev/null and b/public/hexagonal.png differ
diff --git a/public/maps-and-flags.png b/public/maps-and-flags.png
new file mode 100644
index 000..1779512
Binary files /dev/null and b/public/maps-and-flags.png differ
diff --git a/public/pentagon.png b/public/pentagon.png
new file mode 100644
index 000..3bf2a1e
Binary files /dev/null and b/public/pentagon.png differ
diff --git a/public/question-mark.png b/public/question-mark.png
new file mode 100644
index 000..09834c9
Binary files /dev/null and b/public/question-mark.png differ
diff --git a/public/rect.png b/public/rect.png
new file mode 100644
index 000..1cd8ded
Binary files /dev/null and b/public/rect.png differ
diff --git a/public/rhombus.png b/public/rhombus.png
new file mode 100644
index 000..b7459e5
Binary files /dev/null and b/public/rhombus.png differ
diff --git a/public/rounded-rectangle.png b/public/rounded-rectangle.png
new file mode 100644
index 000..e5814fe
Binary files /dev/null and b/public/rounded-rectangle.png differ
diff --git a/public/splash.png b/public/splash.png
new file mode 100644
index 000..be7877e
Binary files /dev/null and b/public/splash.png differ
diff --git a/public/star.png b/public/star.png
new file mode 100644
index 000..3caf69e
Binary files /dev/null and b/public/star.png differ
diff --git a/public/triangle.png b/public/triangle.png
new file mode 100644
index 000..dde4164
Binary files /dev/null and b/public/triangle.png differ
diff --git a/public/wow.png b/public/wow.png
new file mode 100644
index 000..dbcdb78
Binary files /dev/null and b/public/wow.png differ
diff --git a/src/components/WChart.vue b/src/components/WChart.vue
index f62e6b3..4d5cce5 100644
--- a/src/components/WChart.vue
+++ b/src/components/WChart.vue
@@ -34,6 +34,7 @@ type Config = {
width: number;
height: number;
shape: string;
+ shapeRatio: boolean;
};
function setLoading(isLoading: boolean) {
@@ -64,37 +65,55 @@ function run(data?: [], config?: Config) {
[echarts] branch master updated (3731d5f -> cae5a1c)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git. from 3731d5f Support using dataType param to specify edge highlighting (#16243) add 64d62f8 fix(pie): tangential rotation with startAngle #15980 add 383f88e fix(pie): simplify logic add cae5a1c Merge pull request #16307 from apache/fix-15980 No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 34 test/pie-label-rotate.html | 96 +++- 2 files changed, 76 insertions(+), 54 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-15980 updated (64d62f8 -> 383f88e)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-15980 in repository https://gitbox.apache.org/repos/asf/echarts.git. from 64d62f8 fix(pie): tangential rotation with startAngle #15980 add 383f88e fix(pie): simplify logic No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 37 + test/pie-label-rotate.html | 2 +- 2 files changed, 18 insertions(+), 21 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-15980 created (now 64d62f8)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-15980 in repository https://gitbox.apache.org/repos/asf/echarts.git. at 64d62f8 fix(pie): tangential rotation with startAngle #15980 No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-wordcloud-generator] 08/08: feat: web font
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git
commit 8d935b0dac2eea7b117da88ed6aa66367a3c1e02
Author: Ovilia
AuthorDate: Wed Dec 22 13:04:38 2021 +0800
feat: web font
---
package-lock.json | 11 +
package.json | 4 +-
src/App.vue| 16 ++-
src/components/WChart.vue | 10 -
src/components/WConfig.vue | 108 -
5 files changed, 125 insertions(+), 24 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 2766bfc..973455d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -380,6 +380,12 @@
"vfile-message": "*"
}
},
+"@types/webfontloader": {
+"version": "1.6.33",
+"resolved":
"https://registry.npmmirror.com/@types/webfontloader/download/@types/webfontloader-1.6.33.tgz;,
+"integrity": "sha1-ze9mtTNBGTzhtNStdxcDaJ23dwg=",
+"dev": true
+},
"@vitejs/plugin-vue": {
"version": "1.9.2",
"resolved":
"https://registry.npmmirror.com/@vitejs/plugin-vue/download/@vitejs/plugin-vue-1.9.2.tgz;,
@@ -4934,6 +4940,11 @@
"vscode-vue-languageservice": "^0.25.17"
}
},
+"webfontloader": {
+"version": "1.6.28",
+"resolved":
"https://registry.nlark.com/webfontloader/download/webfontloader-1.6.28.tgz;,
+"integrity": "sha1-23hhKSU8tujq5UwvsF+HCvZnW64="
+},
"which": {
"version": "1.3.1",
"resolved":
"https://registry.npm.taobao.org/which/download/which-1.3.1.tgz?cache=0_timestamp=1605134855909_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwhich%2Fdownload%2Fwhich-1.3.1.tgz;,
diff --git a/package.json b/package.json
index c79c5aa..2b55138 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
"devDependencies": {
"@babel/polyfill": "^7.12.1",
"@types/color": "^3.0.2",
+"@types/webfontloader": "^1.6.33",
"@vitejs/plugin-vue": "^1.2.2",
"@vue/compiler-sfc": "^3.0.11",
"chalk": "^3.0.0",
@@ -30,6 +31,7 @@
"element-plus": "^1.0.2-beta.44",
"lodash": "^4.17.19",
"vue": "^3.0.11",
-"vue-i18n": "^9.1.6"
+"vue-i18n": "^9.1.6",
+"webfontloader": "^1.6.28"
}
}
diff --git a/src/App.vue b/src/App.vue
index c5d1655..3d99246 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,7 +6,13 @@
-
+
+
@@ -39,6 +45,14 @@ function onChange() {
wchart.value?.run(wdata.value?.data, wconfig.value?.getConfig());
}
+function onFontLoading() {
+ wchart.value?.setLoading(true);
+}
+
+function onFontLoaded() {
+ wchart.value?.setLoading(false);
+}
+
setTimeout(() => {
wdata.value?.setData(defaultData);
});
diff --git a/src/components/WChart.vue b/src/components/WChart.vue
index 037d5ab..f62e6b3 100644
--- a/src/components/WChart.vue
+++ b/src/components/WChart.vue
@@ -1,5 +1,5 @@
-
+
aaa
@@ -15,9 +15,11 @@ import Color from 'color';
// });
const chart = shallowRef(null);
const chartRef = ref(null);
+const isWebFontLoading = ref(false);
defineExpose({
- run
+ run,
+ setLoading
});
type Config = {
@@ -34,6 +36,10 @@ type Config = {
shape: string;
};
+function setLoading(isLoading: boolean) {
+ isWebFontLoading.value = isLoading;
+}
+
function run(data?: [], config?: Config) {
const hues = config
? config.themeColors.map(
diff --git a/src/components/WConfig.vue b/src/components/WConfig.vue
index 37a11ff..33d6506 100644
--- a/src/components/WConfig.vue
+++ b/src/components/WConfig.vue
@@ -109,13 +109,19 @@
placeholder="请选择字体"
@change="changeFontFamily"
>
-
-
+
+
+
@@ -212,6 +218,7 @@
[echarts-wordcloud-generator] 07/08: feat: colors
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git
commit b24c4e583cddc401a101a43390bbb7726292ff08
Author: Ovilia
AuthorDate: Wed Dec 22 11:05:35 2021 +0800
feat: colors
---
package-lock.json | 61 ++-
package.json | 2 +
src/App.vue| 66 ++--
src/components/WChart.vue | 42 +++-
src/components/WConfig.vue | 264 +
5 files changed, 328 insertions(+), 107 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index af8bb1e..2766bfc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -308,6 +308,30 @@
"defer-to-connect": "^1.0.1"
}
},
+"@types/color": {
+"version": "3.0.2",
+"resolved":
"https://registry.npmmirror.com/@types/color/download/@types/color-3.0.2.tgz;,
+"integrity": "sha1-N3kEPngvViqpFXtfxr0H4U/Y5/M=",
+"dev": true,
+"requires": {
+"@types/color-convert": "*"
+}
+},
+"@types/color-convert": {
+"version": "2.0.0",
+"resolved":
"https://registry.npmmirror.com/@types/color-convert/download/@types/color-convert-2.0.0.tgz;,
+"integrity": "sha1-j17muehj3L7lcD9aUX/7E9PqTiI=",
+"dev": true,
+"requires": {
+"@types/color-name": "*"
+}
+},
+"@types/color-name": {
+"version": "1.1.1",
+"resolved":
"https://registry.npmmirror.com/@types/color-name/download/@types/color-name-1.1.1.tgz;,
+"integrity": "sha1-HBJhu+qhCoBVu8XYq4S3sq/IRqA=",
+"dev": true
+},
"@types/glob": {
"version": "7.1.4",
"resolved":
"https://registry.nlark.com/@types/glob/download/@types/glob-7.1.4.tgz;,
@@ -1000,11 +1024,19 @@
"integrity": "sha1-5jYpwAFmZXkgYNu+t5xCI50sUoc=",
"dev": true
},
+"color": {
+"version": "4.1.0",
+"resolved":
"https://registry.npmmirror.com/color/download/color-4.1.0.tgz;,
+"integrity":
"sha512-o2rkkxyLGgYoeUy1OodXpbPAQNmlNBrirQ8ODO8QutzDiDMNdezSOZLNnusQ6pUpCQJUsaJIo9DZJKqa2HgH7A==",
+"requires": {
+"color-convert": "^2.0.1",
+"color-string": "^1.9.0"
+}
+},
"color-convert": {
"version": "2.0.1",
"resolved":
"https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz;,
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-"dev": true,
"requires": {
"color-name": "~1.1.4"
}
@@ -1012,8 +1044,16 @@
"color-name": {
"version": "1.1.4",
"resolved":
"http://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz;,
-"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-"dev": true
+"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI="
+},
+"color-string": {
+"version": "1.9.0",
+"resolved":
"https://registry.npmmirror.com/color-string/download/color-string-1.9.0.tgz;,
+"integrity":
"sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
+"requires": {
+"color-name": "^1.0.0",
+"simple-swizzle": "^0.2.2"
+}
},
"colors": {
"version": "1.4.0",
@@ -3925,6 +3965,21 @@
"integrity": "sha1-NmpGhNF1ucqyCB42gf2jdHtsUdc=",
"dev": true
},
+"simple-swizzle": {
+"version": "0.2.2",
+"resolved":
"https://registry.npmmirror.com/simple-swizzle/download/simple-swizzle-0.2.2.tgz;,
+"integrity": "sha1-pNprY
[echarts-wordcloud-generator] branch master created (now 8d935b0)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git. at 8d935b0 feat: web font This branch includes the following new commits: new 2643f32 init project new 67a0597 feat: style config new df7cd77 feat: define components new 116bb3c feat: data table new 1828acd feat: add config new 2da5745 feat: basic workflow new b24c4e5 feat: colors new 8d935b0 feat: web font The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-wordcloud-generator] 02/08: feat: style config
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git
commit 67a05976c6730161384e602f5a9b92616110ac98
Author: Ovilia
AuthorDate: Wed Sep 29 10:25:22 2021 +0800
feat: style config
---
package-lock.json | 36
package.json | 1 +
src/App.vue| 24 ---
src/components/WChart.vue | 22 ++
src/components/WConfig.vue | 101 +++
src/components/WData.vue | 104 +
6 files changed, 281 insertions(+), 7 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index ae80466..49819bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -660,6 +660,11 @@
"integrity": "sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4=",
"dev": true
},
+"bignumber.js": {
+"version": "8.1.1",
+"resolved":
"https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.1.1.tgz;,
+"integrity":
"sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
+},
"binary-extensions": {
"version": "2.2.0",
"resolved":
"https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.2.0.tgz?cache=0_timestamp=1610299293319_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbinary-extensions%2Fdownload%2Fbinary-extensions-2.2.0.tgz;,
@@ -1534,6 +1539,16 @@
"integrity": "sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo=",
"dev": true
},
+"handsontable": {
+"version": "6.2.2",
+"resolved":
"https://registry.npmjs.org/handsontable/-/handsontable-6.2.2.tgz;,
+"integrity":
"sha512-Z/sQa51OMHH4RoeBJeANYJMJYmx5SR+/xP8JCh5mzKJnAMKoQWF1zONPNgNCFZ/LdKFmI0f34XKtU0GHW0MG/Q==",
+"requires": {
+"moment": "2.20.1",
+"numbro": "^2.0.6",
+"pikaday": "1.5.1"
+}
+},
"has": {
"version": "1.0.3",
"resolved":
"https://registry.npm.taobao.org/has/download/has-1.0.3.tgz;,
@@ -2211,6 +2226,11 @@
"resolved":
"https://registry.nlark.com/mitt/download/mitt-2.1.0.tgz?cache=0_timestamp=1624483449786_urls=https%3A%2F%2Fregistry.nlark.com%2Fmitt%2Fdownload%2Fmitt-2.1.0.tgz;,
"integrity": "sha1-90BXfCMXbGIFsSGylzUU6t4bIjA="
},
+"moment": {
+"version": "2.20.1",
+"resolved":
"https://registry.npmjs.org/moment/-/moment-2.20.1.tgz;,
+"integrity":
"sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
+},
"ms": {
"version": "2.1.3",
"resolved":
"https://registry.npmmirror.com/ms/download/ms-2.1.3.tgz;,
@@ -2293,6 +2313,14 @@
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true
},
+"numbro": {
+"version": "2.3.5",
+"resolved": "https://registry.npmjs.org/numbro/-/numbro-2.3.5.tgz;,
+"integrity":
"sha512-xlKC0GIZn0iaF7LHE60/DmGfQadDNfnskXdGDGWJfaZfP4pbhc0x+nR8yIIpQkF9n7gJWS6fgBR3Pkvp/W6sDg==",
+"requires": {
+"bignumber.js": "^8.1.1"
+}
+},
"object-assign": {
"version": "4.1.1",
"resolved":
"http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz;,
@@ -2457,6 +2485,14 @@
"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
"dev": true
},
+"pikaday": {
+"version": "1.5.1",
+"resolved":
"https://registry.npmjs.org/pikaday/-/pikaday-1.5.1.tgz;,
+"integrity": "sha1-CkhUm8GhTqHQjEQHTXYbwvK/z9M=",
+"requires": {
+"moment": "2.x"
+}
+},
"pinkie": {
"version": "2.0.4",
"resolved":
"http://registry.npm.taobao.org
[echarts-wordcloud-generator] 06/08: feat: basic workflow
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git
commit 2da57450f98588a16b6e26b78117ca5ae017aa76
Author: Ovilia
AuthorDate: Mon Dec 20 15:26:47 2021 +0800
feat: basic workflow
---
.prettierignore| 1 +
.prettierrc| 7 +
package-lock.json | 952 -
package.json | 2 +-
src/App.vue| 4 +-
src/components/WChart.vue | 59 ++-
src/components/WConfig.vue | 384 +-
src/components/WData.vue | 263 ++---
src/data/defaultData.ts| 365 -
tsconfig.json | 30 +-
vite.config.ts | 28 +-
11 files changed, 1776 insertions(+), 319 deletions(-)
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000..3c3629e
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000..3410e80
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,7 @@
+{
+ "tabWidth": 2,
+ "semi": true,
+ "singleQuote": true,
+ "trailingComma": "none",
+ "printWidth": 80
+}
diff --git a/package-lock.json b/package-lock.json
index 5c1f012..af8bb1e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1248,9 +1248,955 @@
}
},
"echarts-wordcloud": {
-"version": "2.0.0",
-"resolved":
"https://registry.npmjs.org/echarts-wordcloud/-/echarts-wordcloud-2.0.0.tgz;,
-"integrity":
"sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g=="
+"version": "file:../echarts-wordcloud",
+"dependencies": {
+"@discoveryjs/json-ext": {
+"version": "0.5.2",
+"resolved":
"https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz;,
+"integrity":
"sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg=="
+},
+"@types/eslint": {
+"version": "7.2.6",
+"resolved":
"https://registry.npmjs.org/@types/eslint/-/eslint-7.2.6.tgz;,
+"integrity":
"sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw==",
+"requires": {
+"@types/estree": "*",
+"@types/json-schema": "*"
+}
+},
+"@types/eslint-scope": {
+"version": "3.7.0",
+"resolved":
"https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz;,
+"integrity":
"sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+"requires": {
+"@types/eslint": "*",
+"@types/estree": "*"
+}
+},
+"@types/estree": {
+"version": "0.0.45",
+"resolved":
"https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz;,
+"integrity":
"sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g=="
+},
+"@types/json-schema": {
+"version": "7.0.6",
+"resolved":
"https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz;,
+"integrity":
"sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="
+},
+"@types/node": {
+"version": "14.14.20",
+"resolved":
"https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz;,
+"integrity":
"sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="
+},
+"@webassemblyjs/ast": {
+"version": "1.9.1",
+"resolved":
"https://registry.npmjs.org/@we
[echarts-wordcloud-generator] 04/08: feat: data table
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git
commit 116bb3c7409bc83ea7478ec44d3c73e3bb7108bf
Author: Ovilia
AuthorDate: Tue Dec 14 16:22:23 2021 +0800
feat: data table
---
src/App.vue | 9 +--
src/components/WData.vue | 172 ++-
2 files changed, 141 insertions(+), 40 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index f134f7f..884a177 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,7 +9,7 @@
-
+
导出
@@ -26,14 +26,7 @@ import WChart from './components/WChart.vue';
import WConfig from './components/WConfig.vue';
import WData from './components/WData.vue';
-type Config = {
-data: {name: string, value: number}[]
-};
-
const activeName = 'config';
-const config: Config = {
-data: [] as {name: string, value: number}[]
-};
diff --git a/src/components/WData.vue b/src/components/WData.vue
index fe12679..502a332 100644
--- a/src/components/WData.vue
+++ b/src/components/WData.vue
@@ -1,49 +1,157 @@
<template>
<div>
-<div class="table" ref="tableRef">
-</div>
+<el-table class="word-table"
+:data="tableData"
+>
+<el-table-column
+fixed
+prop="name"
+label="文本"
+>
+<template v-slot="scope">
+<el-input
+v-if="scope && scope.row.editAttr === 'name'"
+size="small"
+v-model="scope.row.name"
+@blur="doneEditing(scope.row)"
+>
+</el-input>
+<span
+v-if="scope && scope.row.editAttr !== 'name'"
+@click="edit(scope.row, 'name')"
+>
+{{ scope.row.name }}
+</span>
+</template>
+</el-table-column>
+<el-table-column
+prop="value"
+label="字号"
+>
+<template v-slot="scope">
+<el-input
+v-if="scope && scope.row.editAttr === 'value'"
+size="small"
+v-model="scope.row.value"
+@blur="doneEditing(scope.row)"
+>
+</el-input>
+<span
+v-if="scope && scope.row.editAttr !== 'value'"
+@click="edit(scope.row, 'value')"
+>
+{{ scope.row.value }}
+</span>
+</template>
+</el-table-column>
+<el-table-column
+label="操作"
+width="50"
+>
+<template v-slot="scope">
+<el-button
+type="text"
+size="small"
+@click="removeData(scope.row)"
+>
+删除
+</el-button>
+</template>
+</el-table-column>
+</el-table>
+
+<el-table class="word-table"
+:show-header="false"
+:data="pendingData"
+>
+<el-table-column
+fixed
+prop="name"
+label="文本"
+>
+<template v-slot="scope">
+<el-input
+size="small"
+v-model="scope.row.name"
+>
+</el-input>
+</template>
+</el-table-column>
+<el-table-column
+prop="value"
+label="字号"
+>
+<template v-slot="scope">
+<el-input
+size="small"
+v-model="scope.row.value"
+>
+</el-input>
+</templ
[echarts-wordcloud-generator] 05/08: feat: add config
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git
commit 1828acd24635701642e0c11c74d3e4d08b3a86e5
Author: Ovilia
AuthorDate: Tue Dec 14 17:59:49 2021 +0800
feat: add config
---
src/App.vue| 24 ++---
src/components/WChart.vue | 26 +--
src/components/WConfig.vue | 27 ---
src/components/WData.vue | 65 --
src/data/defaultData.ts| 16
5 files changed, 119 insertions(+), 39 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 884a177..75e8f66 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,27 +6,42 @@
-
+
-
+
导出
-
+
-import { Ref, ref } from 'vue';
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
import WChart from './components/WChart.vue';
import WConfig from './components/WConfig.vue';
import WData from './components/WData.vue';
+import defaultData from './data/defaultData';
+const wconfig = ref<any>(null);
+const wdata = ref<any>(null);
+const wchart = ref<any>(null);
+
+const {t} = useI18n({ useScope: 'global' });
const activeName = 'config';
+
+function onChange() {
+wchart.value?.run(wdata.value?.data);
+}
+
+setTimeout(() => {
+wdata.value?.setData(defaultData);
+});
@@ -52,5 +67,6 @@ h4 {
.el-aside {
padding: 0 15px;
+--el-aside-width: 400px;
}
diff --git a/src/components/WChart.vue b/src/components/WChart.vue
index 2825a92..183452b 100644
--- a/src/components/WChart.vue
+++ b/src/components/WChart.vue
@@ -8,41 +8,29 @@
import { onMounted, shallowRef, ref } from 'vue';
import * as echarts from 'echarts';
-import type { ECharts } from 'echarts';
import 'echarts-wordcloud';
// const props = defineProps({
// foo: String
// });
-const chart = shallowRef<ECharts | null>(null);
+const chart = shallowRef<echarts.ECharts | null>(null);
const chartRef = ref<HTMLElement | null>(null);
-const run = () => {
-console.log('run', chart.value);
+defineExpose({
+run
+});
+
+function run(data?: []) {
chart.value!.setOption({
series: [{
type: 'wordCloud',
-data: [{
-name: 'series',
-value: 100
-}, {
-name: 'data',
-value: 30
-}, {
-name: 'itemStyle',
-value: 20
-}, {
-name: 'lineStyle',
-value: 5
-}]
+data: data || []
}]
});
};
onMounted(() => {
-console.log('mounted', chartRef.value);
chart.value = echarts.init(chartRef.value!);
-run();
});
diff --git a/src/components/WConfig.vue b/src/components/WConfig.vue
index 17c2439..cbd37c5 100644
--- a/src/components/WConfig.vue
+++ b/src/components/WConfig.vue
@@ -1,7 +1,7 @@
-
-基础色
+
+
色相范围
@@ -78,6 +78,18 @@
+
+
+
+
+
+字体
+
+
+
+
+
+
@@ -122,4 +134,13 @@ const alpha = ref([0.5, 0.8]);
.text-pad {
padding: 8px 0;
}
+
+.el-dropdown-link {
+cursor: pointer;
+color: #409EFF;
+}
+
+.el-icon-arrow-down {
+font-size: 12px;
+}
diff --git a/src/components/WData.vue b/src/components/WData.vue
index 502a332..087c007 100644
--- a/src/components/WData.vue
+++ b/src/components/WData.vue
@@ -2,6 +2,7 @@
@@ -104,11 +106,27 @@
+
+
+导入 .cvs
+
+
+清空
+
+
-import { ref } from 'vue';
+import { ref, defineEmits } from 'vue';
type WordData = {
name?: string;
@@ -116,42 +134,63 @@ type WordData = {
editAttr?: string;
};
-const tableData = ref([{name: '测试', value: 100}] as WordData[]);
+const tableData = ref([] as WordData[]);
const pendingData = ref([{}] as WordData[]);
+const emit = defineEmits(['change']);
+
+defineExpose({ data: tableData, setData });
+
+function setData(data: WordData[]) {
+tableData.value = data;
+emit('change');
+}
+
function removeData(row: WordData) {
tableData.value = tableData.value.filter(item => item !== row);
+emit('change');
}
function edit(row: WordData, attr: 'name'
[echarts-wordcloud-generator] 03/08: feat: define components
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/echarts-wordcloud-generator.git
commit df7cd77c84d62b13cb921411e437b57429dcb4a9
Author: Ovilia
AuthorDate: Tue Dec 14 15:30:58 2021 +0800
feat: define components
---
package-lock.json | 85 +++
package.json | 4 +-
src/App.vue| 13 -
src/components/WChart.vue | 44 --
src/components/WConfig.vue | 140 ++---
src/components/WData.vue | 69 +++---
tsconfig.json | 1 +
7 files changed, 193 insertions(+), 163 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 49819bb..5c1f012 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,16 @@
"resolved":
"https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.15.7.tgz?cache=0_timestamp=1632808879837_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.15.7.tgz;,
"integrity": "sha1-DD7UousHsWXfqFs8xFxyczTE7a4="
},
+"@babel/polyfill": {
+"version": "7.12.1",
+"resolved":
"https://registry.npmmirror.com/@babel/polyfill/download/@babel/polyfill-7.12.1.tgz;,
+"integrity": "sha1-Hy1jcdEmG72WHzxdWQkVDhLQvZY=",
+"dev": true,
+"requires": {
+"core-js": "^2.6.5",
+"regenerator-runtime": "^0.13.4"
+}
+},
"@babel/types": {
"version": "7.15.6",
"resolved":
"https://registry.nlark.com/@babel/types/download/@babel/types-7.15.6.tgz?cache=0_timestamp=1631216248664_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Ftypes%2Fdownload%2F%40babel%2Ftypes-7.15.6.tgz;,
@@ -660,11 +670,6 @@
"integrity": "sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4=",
"dev": true
},
-"bignumber.js": {
-"version": "8.1.1",
-"resolved":
"https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.1.1.tgz;,
-"integrity":
"sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
-},
"binary-extensions": {
"version": "2.2.0",
"resolved":
"https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.2.0.tgz?cache=0_timestamp=1610299293319_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbinary-extensions%2Fdownload%2Fbinary-extensions-2.2.0.tgz;,
@@ -1064,6 +1069,12 @@
"@babel/types": "^7.6.1"
}
},
+"core-js": {
+"version": "2.6.12",
+"resolved":
"https://registry.npmmirror.com/core-js/download/core-js-2.6.12.tgz;,
+"integrity": "sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=",
+"dev": true
+},
"core-util-is": {
"version": "1.0.3",
"resolved":
"https://registry.npmmirror.com/core-util-is/download/core-util-is-1.0.3.tgz;,
@@ -1227,6 +1238,20 @@
"integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
"dev": true
},
+"echarts": {
+"version": "5.2.2",
+"resolved":
"https://registry.npmmirror.com/echarts/download/echarts-5.2.2.tgz;,
+"integrity": "sha1-7DyLKhUcu6cbo8LHz5svIEfOQ3A=",
+"requires": {
+"tslib": "2.3.0",
+"zrender": "5.2.1"
+}
+},
+"echarts-wordcloud": {
+"version": "2.0.0",
+"resolved":
"https://registry.npmjs.org/echarts-wordcloud/-/echarts-wordcloud-2.0.0.tgz;,
+"integrity":
"sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g=="
+},
"element-plus": {
"version": "1.0.2-beta.71",
"resolved":
"https://registry.npmmirror.com/element-plus/download/element-plus-1.0.2-beta.71.tgz;,
@@ -1539,16 +1564,6 @@
"integrity": "sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo=",
"dev": true
[echarts] branch fix-16189 updated (d8e29a9 -> 555506b)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-16189 in repository https://gitbox.apache.org/repos/asf/echarts.git. from d8e29a9 fix: remove ellipsis because it is not supported in label add 06b fix: typing No new revisions were added by this update. Summary of changes: src/model/mixin/textStyle.ts | 8 1 file changed, 4 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-16189 updated (373e9a0 -> d8e29a9)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-16189 in repository https://gitbox.apache.org/repos/asf/echarts.git. from 373e9a0 fix: simplify logic add d8e29a9 fix: remove ellipsis because it is not supported in label No new revisions were added by this update. Summary of changes: src/model/mixin/textStyle.ts | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-16189 updated (9ee1a32 -> 373e9a0)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-16189 in repository https://gitbox.apache.org/repos/asf/echarts.git. from 9ee1a32 fix(axis): axis label width when overflow is set add 373e9a0 fix: simplify logic No new revisions were added by this update. Summary of changes: src/model/mixin/textStyle.ts | 42 ++ src/util/types.ts| 3 --- 2 files changed, 22 insertions(+), 23 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated: chore: run ci on direct push
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
The following commit(s) were added to refs/heads/master by this push:
new f7374a7 chore: run ci on direct push
f7374a7 is described below
commit f7374a7ef61d5fb081769392dcef0c4ed68746b7
Author: Ovilia
AuthorDate: Fri Dec 10 15:24:37 2021 +0800
chore: run ci on direct push
---
.github/workflows/nodejs.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 1a9e9b4..4049218 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -1,8 +1,8 @@
name: Node CI
on:
- - push
- - pull_request:
+ push: {}
+ pull_request:
types: [opened, synchronize]
jobs:
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated: chore: run ci on direct push
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git The following commit(s) were added to refs/heads/master by this push: new 7231477 chore: run ci on direct push 7231477 is described below commit 7231477e6bf057b1b2921c1e7f8c71b845bc2789 Author: Ovilia AuthorDate: Fri Dec 10 15:23:10 2021 +0800 chore: run ci on direct push --- .github/workflows/nodejs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 1cf5ada..1a9e9b4 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -1,7 +1,8 @@ name: Node CI on: - pull_request: + - push + - pull_request: types: [opened, synchronize] jobs: - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 02/02: fix: remove lineOverflow because this param is not exposed in echarts
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-lineOverflow
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
commit ba21ff428bc6fe555287cf4b90cfb4ca7f0d44d3
Author: Ovilia
AuthorDate: Fri Dec 10 15:10:53 2021 +0800
fix: remove lineOverflow because this param is not exposed in echarts
---
en/option/partial/label-layout.md | 4 ++--
en/option/partial/text-style.md | 4
zh/option/partial/label-layout.md | 2 +-
zh/option/partial/text-style.md | 6 --
4 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/en/option/partial/label-layout.md
b/en/option/partial/label-layout.md
index 9f8cc46..ba74fdf 100644
--- a/en/option/partial/label-layout.md
+++ b/en/option/partial/label-layout.md
@@ -102,11 +102,11 @@ Label rotation angle.
#${prefix} width(number)
-The width of displayed label. Can be used with `overflow` to constraint the
label in a fixed width
+The width of displayed label. It can be used with `overflow` to constraint the
label in a fixed width.
#${prefix} height(number)
-The height of displayed label. Can be used with `lineOverflow` to constraint
the label in a fixed height.
+The height of displayed label.
#${prefix} align(string)
diff --git a/en/option/partial/text-style.md b/en/option/partial/text-style.md
index 06a9280..a525a61 100644
--- a/en/option/partial/text-style.md
+++ b/en/option/partial/text-style.md
@@ -60,10 +60,6 @@ Determine how to display the text when it's overflow.
Available when `width` is
Ellipsis to be displayed when `overflow` is set to `truncate`.
-#${prefix} lineOverflow(string) = 'none'
-
-Determine how to display the text when it's overflow on height.
-
+ `'truncate'` Truncate the overflow lines.
{{ if: !${noRich} }}
diff --git a/zh/option/partial/label-layout.md
b/zh/option/partial/label-layout.md
index 546d269..ac488b1 100644
--- a/zh/option/partial/label-layout.md
+++ b/zh/option/partial/label-layout.md
@@ -106,7 +106,7 @@ labelLayout(params) {
#${prefix} height(number)
-标签显示的高度。可以配合`lineOverflow`使用控制标签显示在固定高度内
+标签显示的高度。
#${prefix} align(string)
diff --git a/zh/option/partial/text-style.md b/zh/option/partial/text-style.md
index 5e3f4f8..77b7d16 100644
--- a/zh/option/partial/text-style.md
+++ b/zh/option/partial/text-style.md
@@ -60,12 +60,6 @@
在`overflow`配置为`'truncate'`的时候，可以通过该属性配置末尾显示的文本。
-#${prefix} lineOverflow(string) = 'none'
-
-文本超出高度部分是否截断，配置`height`时有效。
-
-+ `'truncate'` 在文本行数超出高度部分截断。
-
{{ if: !${noRich} }}
#${prefix} rich(Object)
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/02: chore: ci should run on pr syncing instead of merging
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch fix-lineOverflow in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 9bc127cdd6306b2f54abaed2b32894b516c0dd1b Author: Ovilia AuthorDate: Fri Dec 10 15:10:21 2021 +0800 chore: ci should run on pr syncing instead of merging --- .github/workflows/nodejs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 35cc3a9..1cf5ada 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -1,6 +1,8 @@ name: Node CI -on: [push] +on: + pull_request: +types: [opened, synchronize] jobs: build: - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch fix-lineOverflow created (now ba21ff4)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-lineOverflow in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. at ba21ff4 fix: remove lineOverflow because this param is not exposed in echarts This branch includes the following new commits: new 9bc127c chore: ci should run on pr syncing instead of merging new ba21ff4 fix: remove lineOverflow because this param is not exposed in echarts The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: fix(axis): axis label width when overflow is set
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-16189
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 9ee1a32654aaaed155d9b35d76c7ac9a68ab8275
Author: Ovilia
AuthorDate: Fri Dec 10 14:57:26 2021 +0800
fix(axis): axis label width when overflow is set
---
src/chart/treemap/TreemapSeries.ts | 3 +--
src/model/mixin/textStyle.ts | 7 ++-
src/util/types.ts | 3 +++
test/bar3.html | 6 +-
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/chart/treemap/TreemapSeries.ts
b/src/chart/treemap/TreemapSeries.ts
index 043018c..241837c 100644
--- a/src/chart/treemap/TreemapSeries.ts
+++ b/src/chart/treemap/TreemapSeries.ts
@@ -54,7 +54,6 @@ interface BreadcrumbItemStyleOption extends ItemStyleOption {
}
interface TreemapSeriesLabelOption extends SeriesLabelOption {
-ellipsis?: boolean
formatter?: string | ((params: CallbackDataParams) => string)
}
@@ -305,7 +304,7 @@ class TreemapSeriesModel extends
SeriesModel {
upperLabel: {
show: true,
position: [0, '50%'],
-ellipsis: true,
+overflow: 'truncate',
verticalAlign: 'middle'
}
},
diff --git a/src/model/mixin/textStyle.ts b/src/model/mixin/textStyle.ts
index 6590e86..5647468 100644
--- a/src/model/mixin/textStyle.ts
+++ b/src/model/mixin/textStyle.ts
@@ -28,6 +28,7 @@ const PATH_COLOR = ['textStyle', 'color'] as const;
export type LabelFontOption = Pick;
type LabelRectRelatedOption = Pick & LabelFontOption;
// TODO Performance improvement?
@@ -68,7 +69,11 @@ class TextStyleMixin {
verticalAlign: this.getShallow('verticalAlign') ||
this.getShallow('baseline'),
padding: this.getShallow('padding') as number[],
lineHeight: this.getShallow('lineHeight'),
-rich: this.getShallow('rich')
+rich: this.getShallow('rich'),
+width: this.getShallow('width') as number,
+height: this.getShallow('height') as number,
+overflow: this.getShallow('overflow'),
+ellipsis: this.getShallow('ellipsis')
});
tmpRichText.update();
return tmpRichText.getBoundingRect();
diff --git a/src/util/types.ts b/src/util/types.ts
index ef9938b..eba0a07 100644
--- a/src/util/types.ts
+++ b/src/util/types.ts
@@ -1078,6 +1078,9 @@ export interface TextCommonOption extends
ShadowOptionMixin {
textShadowOffsetY?: number
tag?: string
+
+overflow?: 'break' | 'breakAll' | 'truncate' | 'none'
+ellipsis?: string
}
export interface LabelFormatterCallback {
diff --git a/test/bar3.html b/test/bar3.html
index f2d6fb3..9b270a2 100644
--- a/test/bar3.html
+++ b/test/bar3.html
@@ -51,7 +51,7 @@ under the License.
var data4 = [];
for (var i = 0; i < 10; i++) {
-xAxisData.push('类目' + i);
+xAxisData.push(i + ' Long label should use ellipsis if
width is set');
data0.push(-Math.random().toFixed(2));
data1.push((Math.random() * 5).toFixed(2));
data2.push(-Math.random().toFixed(2));
@@ -127,6 +127,10 @@ under the License.
},
splitArea: {
show: true
+},
+axisLabel: {
+width: 100,
+overflow: 'truncate',
}
},
xAxis: {
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-16189 created (now 9ee1a32)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-16189 in repository https://gitbox.apache.org/repos/asf/echarts.git. at 9ee1a32 fix(axis): axis label width when overflow is set This branch includes the following new commits: new 9ee1a32 fix(axis): axis label width when overflow is set The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #16194 from apache/fix-doc
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 9ac5e5579f8ee2baf5e78ba635f62e10a2a03bd3 Merge: 79ca516 2920fc4 Author: Wenli Zhang AuthorDate: Thu Dec 9 12:42:55 2021 +0800 Merge pull request #16194 from apache/fix-doc doc: fix link in readme README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (79ca516 -> 9ac5e55)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git. from 79ca516 Merge pull request #16193 from apache/fix-doc add 2920fc4 doc: fix link in readme new 9ac5e55 Merge pull request #16194 from apache/fix-doc The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-doc updated: doc: fix link in readme
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch fix-doc in repository https://gitbox.apache.org/repos/asf/echarts.git The following commit(s) were added to refs/heads/fix-doc by this push: new 2920fc4 doc: fix link in readme 2920fc4 is described below commit 2920fc40ac4c555159add98e73f4305bcc97880f Author: Ovilia AuthorDate: Thu Dec 9 12:39:24 2021 +0800 doc: fix link in readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ae9c57..26835cb 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,8 @@ Apache ECharts is a free, powerful charting and visualization library offering a [](https://github.com/apache/echarts/graphs/contributors) [](https://www.npmjs.com/package/echarts) [](https://www.npmjs.com/package/echarts) [](https://github.com/apach [...] -[](https://travis-ci.org/apache/echarts) +[](https://github.com/apache/echarts/actions/workflows/ci.yml) + ## Get Apache ECharts You may choose one of the following methods: - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-doc created (now 694698f)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-doc in repository https://gitbox.apache.org/repos/asf/echarts.git. at 694698f doc: update badges in readme This branch includes the following new commits: new 694698f doc: update badges in readme The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: doc: update badges in readme
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch fix-doc in repository https://gitbox.apache.org/repos/asf/echarts.git commit 694698f1dd0d6f1af88d6031283c0fb26b35a152 Author: Ovilia AuthorDate: Thu Dec 9 12:30:15 2021 +0800 doc: update badges in readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d0d5543..3ae9c57 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,9 @@ Apache ECharts is a free, powerful charting and visualization library offering a **[中文官网](https://echarts.apache.org/zh/index.html)** | **[ENGLISH HOMEPAGE](https://echarts.apache.org/en/index.html)** -[](https://travis-ci.org/apache/echarts) [](https://www.npmjs.com/package/echarts) [](https://www.npmjs.com/package/echarts) +[](https://github.com/apache/echarts/graphs/contributors) [](https://www.npmjs.com/package/echarts) [](https://www.npmjs.com/package/echarts) [](https://github.com/apach [...] +[](https://travis-ci.org/apache/echarts) ## Get Apache ECharts You may choose one of the following methods: - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: fix(event): provide label index in axis events
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-15798
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit e6490e67f0d3cdf7f8b3115f5eda543a856921a2
Author: Ovilia
AuthorDate: Wed Dec 8 17:33:49 2021 +0800
fix(event): provide label index in axis events
---
src/component/axis/AxisBuilder.ts | 4
test/axisLabel.html | 10 +-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/component/axis/AxisBuilder.ts
b/src/component/axis/AxisBuilder.ts
index d06c0b5..17bb935 100644
--- a/src/component/axis/AxisBuilder.ts
+++ b/src/component/axis/AxisBuilder.ts
@@ -46,6 +46,8 @@ type AxisEventData = {
targetType: 'axisName' | 'axisLabel'
name?: string
value?: string | number
+dataIndex?: number
+formattedLabel?: string
} & {
[key in AxisIndexKey]?: number
};
@@ -816,6 +818,8 @@ function buildAxisLabel(
const eventData = AxisBuilder.makeAxisEventDataBase(axisModel);
eventData.targetType = 'axisLabel';
eventData.value = rawLabel;
+eventData.dataIndex = index;
+eventData.formattedLabel = formattedLabel;
getECData(textEl).eventData = eventData;
}
diff --git a/test/axisLabel.html b/test/axisLabel.html
index c8cb8bc..a6c9e7a 100644
--- a/test/axisLabel.html
+++ b/test/axisLabel.html
@@ -315,10 +315,6 @@ under the License.
-var chart;
-var myChart;
-var option;
-
require([
'echarts'/*, 'map/js/china' */
], function (echarts) {
@@ -326,6 +322,7 @@ under the License.
var option = {
backgroundColor: '#eee',
"xAxis": {
+triggerEvent: true,
"type": "category",
"data": [
"2018-10-08",
@@ -365,11 +362,14 @@ under the License.
]
}
-testHelper.create(echarts, 'main4', {
+var chart = testHelper.create(echarts, 'main4', {
title: 'Label of yAxis should be RED, but 0 label does not
display',
option: option,
recordCanvas: true
});
+chart.on('click', function (params) {
+console.log(params);
+});
});
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-15798 created (now e6490e6)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-15798 in repository https://gitbox.apache.org/repos/asf/echarts.git. at e6490e6 fix(event): provide label index in axis events This branch includes the following new commits: new e6490e6 fix(event): provide label index in axis events The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-bar-racing] branch master updated: feat: change demo data
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git
The following commit(s) were added to refs/heads/master by this push:
new 37ea081 feat: change demo data
37ea081 is described below
commit 37ea081b32e57d2d7e02dfd8c2a74470dece08ac
Author: Ovilia
AuthorDate: Wed Dec 8 17:02:15 2021 +0800
feat: change demo data
---
package-lock.json | 24 +--
package.json | 2 +-
src/components/BBody.vue | 40 +-
src/components/BChart.vue | 7 ++--
src/components/BTable.vue | 103 +-
src/data/expectancy.ts| 2 +-
src/helper/template.ts| 5 ++-
7 files changed, 116 insertions(+), 67 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 6650c61..c02307f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1540,12 +1540,12 @@
"dev": true
},
"echarts": {
-"version": "5.1.1",
-"resolved":
"https://registry.nlark.com/echarts/download/echarts-5.1.1.tgz;,
-"integrity": "sha1-sYbxYvAXxVXP1nsS7eZ2K9w939o=",
+"version": "5.2.2",
+"resolved":
"https://registry.npmjs.org/echarts/-/echarts-5.2.2.tgz;,
+"integrity":
"sha512-yxuBfeIH5c+0FsoRP60w4De6omXhA06c7eUYBsC1ykB6Ys2yK5fSteIYWvkJ4xJVLQgCvAdO8C4mN6MLeJpBaw==",
"requires": {
-"tslib": "2.0.3",
-"zrender": "5.1.0"
+"tslib": "2.3.0",
+"zrender": "5.2.1"
}
},
"electron-to-chromium": {
@@ -4070,9 +4070,9 @@
"dev": true
},
"tslib": {
-"version": "2.0.3",
-"resolved":
"https://registry.npm.taobao.org/tslib/download/tslib-2.0.3.tgz?cache=0_timestamp=1617647074515_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-2.0.3.tgz;,
-"integrity": "sha1-jgdBrEX8DCJuWKF7/D5kubxsphw="
+"version": "2.3.0",
+"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz;,
+"integrity":
"sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
},
"type-fest": {
"version": "0.3.1",
@@ -5131,11 +5131,11 @@
}
},
"zrender": {
-"version": "5.1.0",
-"resolved":
"https://registry.nlark.com/zrender/download/zrender-5.1.0.tgz;,
-"integrity": "sha1-tqhMOqfMxmQu4FGZAcpMCDXE2F4=",
+"version": "5.2.1",
+"resolved":
"https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz;,
+"integrity":
"sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==",
"requires": {
-"tslib": "2.0.3"
+"tslib": "2.3.0"
}
}
}
diff --git a/package.json b/package.json
index dcf46a6..4c24285 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
"dependencies": {
"canvas-record": "^3.0.0",
"color": "^3.1.3",
-"echarts": "^5.1.1",
+"echarts": "^5.2.2",
"element-plus": "^1.0.2-beta.44",
"handsontable": "^6.2.2",
"jquery": "^3.6.0",
diff --git a/src/components/BBody.vue b/src/components/BBody.vue
index 7c57b3f..8b01dc2 100644
--- a/src/components/BBody.vue
+++ b/src/components/BBody.vue
@@ -8,7 +8,7 @@
示例数据
-
+
清空
@@ -66,6 +66,23 @@
+
+排序更新时长（毫秒）
+
+
+
+
+
+
+
下载代码
@@ -148,6 +
[echarts-handbook] branch master updated (9ab55fd -> 0705ad2)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git. from 9ab55fd fix: tweak example code for basic-bar. new eb302b0 align with Chinese document new 8d26642 add a link to community new 0705ad2 Merge pull request #28 from dbgee/patch-2 The 283 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: contents/en/basics/inspiration.md | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (b7ea00a -> 77dbb95)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from b7ea00a fix(pie): truncate text add 77dbb95 fix(pie): simplify logic No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 76 1 file changed, 35 insertions(+), 41 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (f9d6d49 -> b7ea00a)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from f9d6d49 fix(pie): available width should be set to label only if larger add b7ea00a fix(pie): truncate text No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 28 ++-- 1 file changed, 26 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (c2bf46c -> f9d6d49)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from c2bf46c fix(pie): label wrapping for align on ellipse curve add f9d6d49 fix(pie): available width should be set to label only if larger No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 26 +- 1 file changed, 17 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (8c7b2ec -> c2bf46c)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from 8c7b2ec Merge branch 'master' into fix-pie-label add c2bf46c fix(pie): label wrapping for align on ellipse curve No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 26 -- 1 file changed, 20 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (d820576 -> 8c7b2ec)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from d820576 fix(pie): simplify code add 41e132a fix(pie): recalculate text width when x changes add d999fd1 fix(line): fix bezier cp calculate wrong in monotone smooth add efc66bd Merge pull request #16069 from apache/fix-smooth-monotone add 15375ca fix(dataZoom): optimize dataZoom shadow render performance add b1eb944 fix(throttle): clear throttle add 2b61e57 Merge pull request #16070 from apache/optimize-dataZoom-shadow-performance add 46e268f fix: fitler -> filter typo add 790687d Merge pull request #16090 from vojty/fix-fitler-typo add 0bb53b2 chore: use issue form to submit new issue add 65e8b65 chore: tweak issue template add 0b99272 chore: tweak description in issue form add 01a25f4 Merge pull request #16128 from pissang/master add 1bda9e5 fix typo add e12f8c0 chore: fix typo add 05220d8 Merge pull request #16129 from pissang/master add 6a94527 chore: tweak issue template description add a9b08aa Merge pull request #16130 from pissang/master add 7b21590 chore: tweak issue and pull request template. add a93b0e3 Merge pull request #16131 from apache/improve-issue-template add ae71ff4 chore: update links in readme add 8d9a156 chore: update download link in readme add 56fbf07 Merge pull request #16141 from apache/pissang-patch-1 add 8c7b2ec Merge branch 'master' into fix-pie-label No new revisions were added by this update. Summary of changes: .github/ISSUE_TEMPLATE.md| 10 --- .github/ISSUE_TEMPLATE/bug_report.yml| 101 .github/ISSUE_TEMPLATE/config.yml| 6 ++ .github/ISSUE_TEMPLATE/feature_request.yml | 39 ++ .github/pull_request_template.md | 6 +- README.md| 18 ++--- src/chart/line/poly.ts | 10 ++- src/chart/pie/labelLayout.ts | 100 +--- src/component/axisPointer/BaseAxisPointer.ts | 2 + src/component/dataZoom/SliderZoomView.ts | 111 +++ src/component/dataZoom/roams.ts | 18 +++-- src/component/parallel/ParallelView.ts | 3 +- src/util/throttle.ts | 2 + test/dataZoom-axes.html | 4 +- test/encode.html | 2 +- 15 files changed, 300 insertions(+), 132 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (e0afee4 -> d820576)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from e0afee4 style(pie): update code style add d820576 fix(pie): simplify code No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 74 +--- test/pie-label-alignTo.html | 4 +-- 2 files changed, 37 insertions(+), 41 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-bot] branch master updated: update bot for new issue template apache/echarts#16128
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 22ddfd1 update bot for new issue template apache/echarts#16128
22ddfd1 is described below
commit 22ddfd14864079db172c2ea73ae64da437703497
Author: Ovilia
AuthorDate: Mon Nov 29 14:44:38 2021 +0800
update bot for new issue template apache/echarts#16128
---
src/issue.js | 48 +++-
1 file changed, 11 insertions(+), 37 deletions(-)
diff --git a/src/issue.js b/src/issue.js
index 839fbf2..bf641ac 100644
--- a/src/issue.js
+++ b/src/issue.js
@@ -23,38 +23,20 @@ class Issue {
async init () {
// if author is committer, do not check if using template
const isCore = isCommitter(this.issue.author_association,
this.issue.user.login);
-if (isCore || this.isUsingTemplate()) {
-if (this._contain('Steps to reproduce')) {
-this.issueType = label.BUG;
-} else if (this._contain('What problem does this feature solve')) {
-this.issueType = label.NEW_FEATURE;
-} else if (!isCore) {
-this.response = text.NOT_USING_TEMPLATE;
-return;
-}
-if (!isCore) {
-this.addLabels.push(label.PENDING);
-this.addLabels.push(label.WAITING_FOR_COMMUNITY);
-}
-
-this.issueType && this.addLabels.push(this.issueType);
-
-// translate issue
-isCore || await this._translate();
+if (!isCore) {
+this.addLabels.push(label.PENDING);
+this.addLabels.push(label.WAITING_FOR_COMMUNITY);
+}
-// const isInEnglish = this._contain('This issue is in English');
-const isInEnglish = (!this.translatedTitle && !this.translatedBody)
- || (!this.title.trim() && !this.translatedBody)
- || (!this.body.trim() && !this.translatedTitle);
-if (isInEnglish) {
-this.addLabels.push(label.EN);
-}
+// translate issue
+await this._translate();
-isCore || this._computeResponse();
-} else {
-this.response = text.NOT_USING_TEMPLATE;
-this.addLabels.push(label.INVALID);
+const isInEnglish = (!this.translatedTitle && !this.translatedBody)
+|| (!this.title.trim() && !this.translatedBody)
+|| (!this.body.trim() && !this.translatedTitle);
+if (isInEnglish) {
+this.addLabels.push(label.EN);
}
}
@@ -69,10 +51,6 @@ class Issue {
}
}
-isUsingTemplate() {
-return this.body.indexOf('generated by echarts-issue-helper') > -1;
-}
-
_computeResponse() {
switch(this.context.payload.action) {
case 'opened':
@@ -85,10 +63,6 @@ class Issue {
break;
}
}
-
-_contain(txt) {
-return this.body.indexOf(txt) > -1;
-}
}
module.exports = Issue;
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (c19fe18 -> e0afee4)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from c19fe18 fix(pie): extreme cases add e0afee4 style(pie): update code style No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (2f722b7 -> c19fe18)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from 2f722b7 fix(pie): label works for richText add 28609f2 fix(text): text padding works add a15b54f fix(pie): fix padding add c19fe18 fix(pie): extreme cases No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 69 ++- test/pie-label-alignTo-adjust.html | 170 - test/pie-label.html| 3 - 3 files changed, 137 insertions(+), 105 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (f85ba48 -> 2f722b7)
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a change to branch fix-pie-label
in repository https://gitbox.apache.org/repos/asf/echarts.git.
from f85ba48 fix(pie): refine logic
add 2f722b7 fix(pie): label works for richText
No new revisions were added by this update.
Summary of changes:
src/chart/pie/labelLayout.ts | 6 +-
test/pie-alignTo.html | 310 --
...-alignTo.html => pie-label-alignTo-adjust.html} | 18 +-
test/pie-label-alignTo.html| 348 +++--
4 files changed, 273 insertions(+), 409 deletions(-)
delete mode 100644 test/pie-alignTo.html
copy test/{pie-label-alignTo.html => pie-label-alignTo-adjust.html} (92%)
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (0c0d080 -> f85ba48)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from 0c0d080 fix(pie): update padding logic and test cases add f85ba48 fix(pie): refine logic No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 53 - test/pie-label-alignTo.html | 138 +++ test/pie-label.html | 138 --- 3 files changed, 164 insertions(+), 165 deletions(-) create mode 100644 test/pie-label-alignTo.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (cec9d28 -> 0c0d080)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from cec9d28 test: support seed random in test add 361b6ca fix(pie): fix dy add 0c0d080 fix(pie): update padding logic and test cases No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 10 +++- test/pie-alignTo.html| 59 ++-- test/pie-label.html | 36 +++ 3 files changed, 65 insertions(+), 40 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label updated (4bcace4 -> cec9d28)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. from 4bcace4 test(pie): add test case add 263e4a7 fix(pie): label alignTo edge fixed add 8a28e8e fix(pie): label for alignTo labelLine add f1dbeac test(pie): update test cases for pie labels add b2b20c6 fix(pie): add label margin add cec9d28 test: support seed random in test No new revisions were added by this update. Summary of changes: src/chart/pie/labelLayout.ts | 56 test/lib/testHelper.js | 18 ++ test/pie-label.html | 16 - 3 files changed, 64 insertions(+), 26 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch fix-treemap updated (c37378b -> 6215725)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-treemap in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. from c37378b fix: dafault value of treemap.label.padding add 6215725 fix: update zh doc No new revisions were added by this update. Summary of changes: zh/option/series/treemap.md | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: fix: dafault value of treemap.label.padding
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-treemap
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
commit c37378b7e4e771f42848fd47036d4a0a064af282
Author: Ovilia
AuthorDate: Tue Nov 16 11:10:15 2021 +0800
fix: dafault value of treemap.label.padding
---
en/option/partial/label.md | 1 +
en/option/partial/text-style.md | 3 ++-
en/option/series/treemap.md | 1 +
zh/option/partial/label.md | 1 +
zh/option/partial/text-style.md | 3 ++-
5 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/en/option/partial/label.md b/en/option/partial/label.md
index 6b15321..19dd729 100644
--- a/en/option/partial/label.md
+++ b/en/option/partial/label.md
@@ -69,6 +69,7 @@ Whether to move text slightly. For example: `[30, 40]` means
move `30` horizonta
noVerticalAlign = ${noVerticalAlign},
name = ${name},
defaultColor = ${defaultColor},
+defaultPadding = ${defaultPadding},
defaultFontSize = ${defaultFontSize},
noRich = ${noRich},
noBox = ${noBox},
diff --git a/en/option/partial/text-style.md b/en/option/partial/text-style.md
index 24ce81c..3e8a5bd 100644
--- a/en/option/partial/text-style.md
+++ b/en/option/partial/text-style.md
@@ -22,6 +22,7 @@
prefix = ${prefix},
name = ${name},
defaultColor = ${defaultColor},
+defaultPadding = ${defaultPadding},
defaultFontSize = ${defaultFontSize},
defaultFontWeight = ${defaultFontWeight},
defaultLineHeight = ${defaultLineHeight},
@@ -273,7 +274,7 @@ Border width of the text fragment.
Border radius of the text fragment.
-#${prefix} padding(number|Array) = 0
+#${prefix} padding(number|Array) = ${defaultPadding|default(0)}
diff --git a/en/option/series/treemap.md b/en/option/series/treemap.md
index d5d00d5..3741c58 100644
--- a/en/option/series/treemap.md
+++ b/en/option/series/treemap.md
@@ -558,6 +558,7 @@ This can hide the details of nodes when the rectangular
area is not large enough
{{ use: partial-label(
prefix = ${prefix} + "#",
+defaultPadding = 5,
defaultPosition = "'inside'",
formatter = true
) }}
diff --git a/zh/option/partial/label.md b/zh/option/partial/label.md
index f08aa90..e8b8d84 100644
--- a/zh/option/partial/label.md
+++ b/zh/option/partial/label.md
@@ -69,6 +69,7 @@ ${name}图形上的文本标签，可用于说明图形的一些数据信息，
noVerticalAlign = ${noVerticalAlign},
name = ${name},
defaultColor = ${defaultColor},
+defaultPadding = ${defaultPadding},
defaultFontSize = ${defaultFontSize},
noRich = ${noRich},
noBox = ${noBox},
diff --git a/zh/option/partial/text-style.md b/zh/option/partial/text-style.md
index 698306b..00276c3 100644
--- a/zh/option/partial/text-style.md
+++ b/zh/option/partial/text-style.md
@@ -22,6 +22,7 @@
prefix = ${prefix},
name = ${name},
defaultColor = ${defaultColor},
+defaultPadding = ${defaultPadding},
defaultFontSize = ${defaultFontSize},
defaultFontWeight = ${defaultFontWeight},
defaultLineHeight = ${defaultLineHeight},
@@ -274,7 +275,7 @@ backgroundColor: {
文字块的圆角。
-#${prefix} padding(number|Array) = 0
+#${prefix} padding(number|Array) = ${defaultPadding|default(0)}
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch fix-treemap created (now c37378b)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-treemap in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. at c37378b fix: dafault value of treemap.label.padding This branch includes the following new commits: new c37378b fix: dafault value of treemap.label.padding The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/02: fix(pie): label position with rich text #16023
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-pie-label
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 06a3c7f316c03185d9ef4c48c51d64ec599ba13e
Author: Ovilia
AuthorDate: Tue Nov 9 18:11:22 2021 +0800
fix(pie): label position with rich text #16023
---
src/chart/pie/labelLayout.ts | 38 +-
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/chart/pie/labelLayout.ts b/src/chart/pie/labelLayout.ts
index 14be831..f0a1d59 100644
--- a/src/chart/pie/labelLayout.ts
+++ b/src/chart/pie/labelLayout.ts
@@ -25,9 +25,10 @@ import { HorizontalAlign, ZRTextAlign } from
'../../util/types';
import { Sector, Polyline, Point } from '../../util/graphic';
import ZRText from 'zrender/src/graphic/Text';
import BoundingRect, {RectLike} from 'zrender/src/core/BoundingRect';
-import { each } from 'zrender/src/core/util';
+import { each, extend } from 'zrender/src/core/util';
import { limitTurnAngle, limitSurfaceAngle } from
'../../label/labelGuideHelper';
import { shiftLayoutOnY } from '../../label/labelLayoutHelper';
+import { parsePlainText, parseRichText, RichTextContentBlock } from
'zrender/src/graphic/helper/parseText';
const RADIAN = Math.PI / 180;
@@ -160,9 +161,6 @@ function avoidOverlap(
}
}
-adjustSingleSide(rightList, cx, cy, r, 1, viewWidth, viewHeight, viewLeft,
viewTop, rightmostX);
-adjustSingleSide(leftList, cx, cy, r, -1, viewWidth, viewHeight, viewLeft,
viewTop, leftmostX);
-
for (let i = 0; i < labelLayoutList.length; i++) {
const layout = labelLayoutList[i];
const label = layout.label;
@@ -195,13 +193,32 @@ function avoidOverlap(
}
}
if (targetTextWidth < layout.rect.width) {
-// TODOTODO
-// layout.text = textContain.truncateText(layout.text,
targetTextWidth, layout.font);
-layout.label.style.width = targetTextWidth;
+const style = layout.label.style;
+/**
+ * Parsing the rich text to get the constraining width.
+ *
+ * Consider the case where text is "{aabbcc|real names}", its
+ * width is not determined by the characters of this string but
+ * the parsed text in varied lines. Let's assume in this case,
+ * "real" and "names" are separated into two lines due to
+ * `overflow` being `'break'`. `style.width` should be the
+ * `contentWidth` of the parsed rich text, which is also the
+ * bigger one of the width of "real" and "names".
+ */
+const parstText = style.rich ? parseRichText : parsePlainText;
+const block = parstText(style.text, extend(style, {
+width: targetTextWidth
+}));
+const padding = style.padding as number[];
+const paddingH = padding ? padding[1] + padding[3] : 0;
+style.width = block.contentWidth;
if (layout.labelAlignTo === 'edge') {
-realTextWidth = targetTextWidth;
-// realTextWidth = textContain.getWidth(layout.text,
layout.font);
+realTextWidth = block.contentWidth + paddingH;
}
+layout.rect.y -= (block.contentHeight - layout.rect.height) /
2;
+layout.rect.width = block.width;
+layout.rect.height = block.height;
+console.log(block,layout.rect.width, layout.rect.height);
}
const dist = linePoints[1][0] - linePoints[2][0];
@@ -226,6 +243,9 @@ function avoidOverlap(
linePoints[1][1] = linePoints[2][1] = label.y;
}
}
+
+adjustSingleSide(rightList, cx, cy, r, 1, viewWidth, viewHeight, viewLeft,
viewTop, rightmostX);
+adjustSingleSide(leftList, cx, cy, r, -1, viewWidth, viewHeight, viewLeft,
viewTop, leftmostX);
}
function isPositionCenter(sectorShape: LabelLayout) {
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-pie-label created (now 4bcace4)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-pie-label in repository https://gitbox.apache.org/repos/asf/echarts.git. at 4bcace4 test(pie): add test case This branch includes the following new commits: new 06a3c7f fix(pie): label position with rich text #16023 new 4bcace4 test(pie): add test case The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 02/02: test(pie): add test case
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-pie-label
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 4bcace439918b2d3763325a3749f327eb7d851e9
Author: Ovilia
AuthorDate: Tue Nov 9 18:14:35 2021 +0800
test(pie): add test case
---
src/chart/pie/labelLayout.ts | 1 -
test/pie-label.html | 165 +++
2 files changed, 165 insertions(+), 1 deletion(-)
diff --git a/src/chart/pie/labelLayout.ts b/src/chart/pie/labelLayout.ts
index f0a1d59..1143823 100644
--- a/src/chart/pie/labelLayout.ts
+++ b/src/chart/pie/labelLayout.ts
@@ -218,7 +218,6 @@ function avoidOverlap(
layout.rect.y -= (block.contentHeight - layout.rect.height) /
2;
layout.rect.width = block.width;
layout.rect.height = block.height;
-console.log(block,layout.rect.width, layout.rect.height);
}
const dist = linePoints[1][0] - linePoints[2][0];
diff --git a/test/pie-label.html b/test/pie-label.html
index 9041d2d..e5bf5e5 100644
--- a/test/pie-label.html
+++ b/test/pie-label.html
@@ -37,6 +37,9 @@ under the License.
background: #146402;
color: #fff;
}
+#main9, #main10 {
+border: 1px solid red;
+}
@@ -49,6 +52,8 @@ under the License.
+
+
@@ -770,5 +775,165 @@ under the License.
});
+
+
+
+require([
+'echarts'
+], function (echarts) {
+var data = [
+{
+name: 'Apples',
+value: 138
+},
+{
+name: '{a|Neque porro quisquam est qui dolorem}',
+value: 48
+},
+{
+name: 'Oranges',
+value: 40
+},
+{
+name: 'Pears',
+value: 32
+},
+{
+name: 'quia dolorsit amet consectetur adipisci',
+value: 27
+}
+];
+var option = {
+series: [
+{
+type: 'pie',
+radius: '80%',
+center: ['50%', '50%'],
+data: data,
+label: {
+position: 'outer',
+alignTo: 'edge',
+margin: 20,
+fontSize: 30,
+padding: [5, 20],
+backgroundColor: 'rgba(0, 0, 255, 0.2)',
+rich: {
+a: {
+fontSize: 46,
+borderColor: 'rgba(0, 0, 255, 0.8)',
+borderWidth: 1,
+borderRadius: 10
+}
+},
+overflow: 'break'
+},
+left: 0,
+right: 0,
+top: 0,
+bottom: 0,
+animationDuration: 0
+}
+]
+};
+
+var chart = testHelper.create(echarts, 'main9', {
+title: 'Labels (rich text) should not be outside of the
canvas',
+option: option,
+info: {
+label: {
+position: 'outer',
+alignTo: 'edge',
+margin: 20,
+fontSize: 30,
+padding: [5, 20],
+backgroundColor: 'rgba(0, 0, 255, 0.2)',
+rich: {
+a: {
+fontSize: 46,
+borderColor: 'rgba(0, 0, 255, 0.8)',
+borderWidth: 1,
+borderRadius: 10
+}
+},
+overflow: 'break'
+}
+}
+});
+});
+
+
+
+
+
+require([
+'echarts'
+], function (echarts) {
+var data
[echarts] branch fix-15915 updated (6a1a8ae -> 0ad5438)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-15915 in repository https://gitbox.apache.org/repos/asf/echarts.git. from 6a1a8ae test(radar): update test for #15915 add 0ad5438 doc: add deprecared doc for text No new revisions were added by this update. Summary of changes: src/coord/radar/RadarModel.ts | 3 +++ 1 file changed, 3 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch fix-radar updated (a3f8a31 -> 030a2d3)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-radar in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. from a3f8a31 fix(radar): radar.name is deprecated add 030a2d3 fix(radar): update axisName description in en No new revisions were added by this update. Summary of changes: en/option/component/radar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: fix(radar): radar.name is deprecated
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-radar
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
commit a3f8a310b88312bdd95daa7df553645d7dd1de5a
Author: Ovilia
AuthorDate: Mon Nov 1 17:22:09 2021 +0800
fix(radar): radar.name is deprecated
---
en/option/component/radar.md | 2 +-
zh/option/component/radar.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/en/option/component/radar.md b/en/option/component/radar.md
index fb99550..c30caeb 100644
--- a/en/option/component/radar.md
+++ b/en/option/component/radar.md
@@ -24,7 +24,7 @@ Here is a custom example of radar component.
The start angle of coordinate, which is the angle of the first indicator axis.
-## name(Object)
+## axisName(Object)
Name of radar chart.
diff --git a/zh/option/component/radar.md b/zh/option/component/radar.md
index 546d362..3ba0c1b 100644
--- a/zh/option/component/radar.md
+++ b/zh/option/component/radar.md
@@ -60,7 +60,7 @@ const option = {
坐标系起始角度，也就是第一个指示器轴的角度。
-## name(Object)
+## axisName(Object)
雷达图每个指示器名称的配置项。
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch fix-radar created (now a3f8a31)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-radar in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. at a3f8a31 fix(radar): radar.name is deprecated This branch includes the following new commits: new a3f8a31 fix(radar): radar.name is deprecated The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-15915 updated (28c059d -> 6a1a8ae)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-15915 in repository https://gitbox.apache.org/repos/asf/echarts.git. from 28c059d fix(radar): name being - in tooltip when name.show is false #15915 new 8cecdd7 test(radar): update test for #15915 new 6a1a8ae test(radar): update test for #15915 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: test/radar3.html | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/02: test(radar): update test for #15915
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-15915
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 8cecdd767a4599ac32523143718d0c12c19b4ea3
Author: Ovilia
AuthorDate: Mon Nov 1 16:34:02 2021 +0800
test(radar): update test for #15915
---
test/radar3.html | 22 --
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/test/radar3.html b/test/radar3.html
index 6b6f64e..ca311d3 100644
--- a/test/radar3.html
+++ b/test/radar3.html
@@ -41,9 +41,14 @@ under the License.
var chart = echarts.init(document.getElementById('main'));
chart.setOption({
-title: {
+title: [{
text: '多雷达图'
-},
+}, {
+text: 'Tooltip series names should not be "-"',
+left: '25%',
+top: '70%',
+textAlign: 'center'
+}],
tooltip: {
trigger: 'axis'
},
@@ -54,13 +59,18 @@ under the License.
radar: [
{
indicator: [
-{text: '品牌', max: 100},
-{text: '内容', max: 100},
-{text: '可用性', max: 100},
+{name: '品牌', max: 100},
+{name: '内容', max: 100},
+{name: '可用性', max: 100},
+// text is deprecated
{text: '功能', max: 100}
],
center: ['25%',200],
-radius: 80
+radius: 80,
+axisName: {
+show: false,
+formatter: 'name: {value}'
+}
},
{
indicator: [
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 02/02: test(radar): update test for #15915
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-15915
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 6a1a8ae4415f8ebdf996a7b047f14411e7a3e5a5
Author: Ovilia
AuthorDate: Mon Nov 1 16:36:59 2021 +0800
test(radar): update test for #15915
---
test/radar3.html | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/test/radar3.html b/test/radar3.html
index ca311d3..fda7b3d 100644
--- a/test/radar3.html
+++ b/test/radar3.html
@@ -46,7 +46,7 @@ under the License.
}, {
text: 'Tooltip series names should not be "-"',
left: '25%',
-top: '70%',
+top: 320,
textAlign: 'center'
}],
tooltip: {
@@ -68,8 +68,7 @@ under the License.
center: ['25%',200],
radius: 80,
axisName: {
-show: false,
-formatter: 'name: {value}'
+show: false
}
},
{
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: fix(radar): name being - in tooltip when name.show is false #15915
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-15915
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 28c059d88e6765faffb3a6b74e56adb019e87244
Author: Ovilia
AuthorDate: Mon Nov 1 16:32:08 2021 +0800
fix(radar): name being - in tooltip when name.show is false #15915
---
src/component/radar/RadarView.ts | 4
src/coord/radar/RadarModel.ts | 5 ++---
src/preprocessor/helper/compatStyle.ts | 5 +
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/component/radar/RadarView.ts b/src/component/radar/RadarView.ts
index 430ec27..1b3c11f 100644
--- a/src/component/radar/RadarView.ts
+++ b/src/component/radar/RadarView.ts
@@ -47,7 +47,11 @@ class RadarView extends ComponentView {
const radar = radarModel.coordinateSystem;
const indicatorAxes = radar.getIndicatorAxes();
const axisBuilders = zrUtil.map(indicatorAxes, function
(indicatorAxis) {
+const axisName = indicatorAxis.model.get('showName')
+? indicatorAxis.name
+: ''; // hide name
const axisBuilder = new AxisBuilder(indicatorAxis.model, {
+axisName: axisName,
position: [radar.cx, radar.cy],
rotation: indicatorAxis.angle,
labelDirection: -1,
diff --git a/src/coord/radar/RadarModel.ts b/src/coord/radar/RadarModel.ts
index cdcd3e8..94007bb 100644
--- a/src/coord/radar/RadarModel.ts
+++ b/src/coord/radar/RadarModel.ts
@@ -88,6 +88,7 @@ export interface RadarOption extends ComponentOption,
CircleLayoutOptionMixin {
export type InnerIndicatorAxisOption = AxisBaseOption & {
// TODO Use type?
// axisType?: 'value' | 'log'
+showName?: boolean
};
class RadarModel extends ComponentModel implements
CoordinateSystemHostModel {
@@ -137,15 +138,13 @@ class RadarModel extends ComponentModel
implements CoordinateSystem
axisLabel: axisLabel,
// Compatible with 2 and use text
name: indicatorOpt.text,
+showName: showName,
nameLocation: 'end',
nameGap: nameGap,
// min: 0,
nameTextStyle: iNameTextStyle,
triggerEvent: triggerEvent
} as InnerIndicatorAxisOption, false);
-if (!showName) {
-innerIndicatorOpt.name = '';
-}
if (typeof nameFormatter === 'string') {
const indName = innerIndicatorOpt.name;
innerIndicatorOpt.name = nameFormatter.replace('{value}',
indName != null ? indName : '');
diff --git a/src/preprocessor/helper/compatStyle.ts
b/src/preprocessor/helper/compatStyle.ts
index 215e0fd..7d74555 100644
--- a/src/preprocessor/helper/compatStyle.ts
+++ b/src/preprocessor/helper/compatStyle.ts
@@ -307,6 +307,11 @@ export default function globalCompatStyle(option: any,
isTheme?: boolean) {
deprecateLog('nameGap property in radar component has been
changed to axisNameGap');
}
}
+each(radarOpt.indicator, function (indicatorOpt: any) {
+if (__DEV__ && indicatorOpt.text) {
+deprecateReplaceLog('text', 'name', 'radar.indicator');
+}
+});
});
each(toArr(option.geo), function (geoOpt) {
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-15915 created (now 28c059d)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-15915 in repository https://gitbox.apache.org/repos/asf/echarts.git. at 28c059d fix(radar): name being - in tooltip when name.show is false #15915 This branch includes the following new commits: new 28c059d fix(radar): name being - in tooltip when name.show is false #15915 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (2bd54c3 -> 2c7608b)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git. from 2bd54c3 Merge pull request #15942 from apache/fix-line-draw add 316820a fix(bar-race): label value animation duration after sorting add f8ba254 fix(bar-race): fix typing add c450c93 fix(bar-race): improve code add 504a2d0 fix(bar-race): fix the case when new bar appears add 9e13382 fix(bar-race): fix label animation when changeOrder in the first render new 2c7608b Merge pull request #15916 from apache/fix-bar-race The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/chart/bar/BarView.ts | 37 ++--- src/label/LabelManager.ts | 13 + src/label/labelStyle.ts| 12 ++--- src/util/types.ts | 11 +++- test/bar-race.html | 55 +- test/runTest/actions/__meta__.json | 1 + 6 files changed, 116 insertions(+), 13 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #15916 from apache/fix-bar-race
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 2c7608b0afb74fd843324b419d86371520176439 Merge: 2bd54c3 9e13382 Author: Wenli Zhang AuthorDate: Tue Oct 26 16:01:36 2021 +0800 Merge pull request #15916 from apache/fix-bar-race fix(bar-race): label value animation duration after sorting src/chart/bar/BarView.ts | 37 ++--- src/label/LabelManager.ts | 13 + src/label/labelStyle.ts| 12 ++--- src/util/types.ts | 11 +++- test/bar-race.html | 55 +- test/runTest/actions/__meta__.json | 1 + 6 files changed, 116 insertions(+), 13 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-bar-race updated (504a2d0 -> 9e13382)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-bar-race in repository https://gitbox.apache.org/repos/asf/echarts.git. from 504a2d0 fix(bar-race): fix the case when new bar appears add 9e13382 fix(bar-race): fix label animation when changeOrder in the first render No new revisions were added by this update. Summary of changes: src/chart/bar/BarView.ts | 27 +++ 1 file changed, 15 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-bar-race updated (c450c93 -> 504a2d0)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-bar-race in repository https://gitbox.apache.org/repos/asf/echarts.git. from c450c93 fix(bar-race): improve code add 504a2d0 fix(bar-race): fix the case when new bar appears No new revisions were added by this update. Summary of changes: src/chart/bar/BarView.ts | 42 ++ src/label/LabelManager.ts | 13 - src/util/types.ts | 11 ++- test/bar-race.html| 8 +--- 4 files changed, 53 insertions(+), 21 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-bar-race updated (f8ba254 -> c450c93)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-bar-race in repository https://gitbox.apache.org/repos/asf/echarts.git. from f8ba254 fix(bar-race): fix typing add c450c93 fix(bar-race): improve code No new revisions were added by this update. Summary of changes: src/chart/bar/BarView.ts | 14 ++ src/label/labelStyle.ts | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-bar-race updated (316820a -> f8ba254)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-bar-race in repository https://gitbox.apache.org/repos/asf/echarts.git. from 316820a fix(bar-race): label value animation duration after sorting add f8ba254 fix(bar-race): fix typing No new revisions were added by this update. Summary of changes: src/label/labelStyle.ts | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #15869 from apache/fix-15809
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit cd782ab70571846f32b4f77f1b4c11eb3efdf379 Merge: 4dde106 c285682 Author: Wenli Zhang AuthorDate: Thu Oct 14 10:43:15 2021 +0800 Merge pull request #15869 from apache/fix-15809 fix(tooltip): format boolean in value #15809 src/util/format.ts | 2 ++ test/tooltip-axisPointer2.html | 19 ++- 2 files changed, 20 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (4dde106 -> cd782ab)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git. from 4dde106 Merge pull request #15867 from finkrer/russian_translation add 2f7c6fe fix(tooltip): format boolean in value #15809 add c285682 fix(tooltip): simplify logic new cd782ab Merge pull request #15869 from apache/fix-15809 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/util/format.ts | 2 ++ test/tooltip-axisPointer2.html | 19 ++- 2 files changed, 20 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-bar-racing] branch master updated: feat: add life-expectancy data
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bar-racing.git
The following commit(s) were added to refs/heads/master by this push:
new ce1de0a feat: add life-expectancy data
ce1de0a is described below
commit ce1de0a451283defbd139c5f7fb0381aab6368df
Author: Ovilia
AuthorDate: Wed Oct 13 18:46:31 2021 +0800
feat: add life-expectancy data
---
src/components/BBody.vue | 13 -
src/components/BTable.vue | 22 ++
src/data/expectancy.ts| 1 +
src/data/fruit.ts | 8
4 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/components/BBody.vue b/src/components/BBody.vue
index d0d1638..7c57b3f 100644
--- a/src/components/BBody.vue
+++ b/src/components/BBody.vue
@@ -7,6 +7,13 @@
+示例数据
+
+清空
+
+
+
+
图表设置
@@ -35,7 +42,7 @@
size="medium"
class="col-span-2"
placeholder="为空则显示所有"
-v-model="maxDataCnt"
+v-model.number="maxDataCnt"
@change="runChart"
>
@@ -126,6 +133,7 @@
>
@@ -151,11 +159,14 @@ import {defineComponent} from 'vue';
import BTable, {ChartData} from './BTable.vue';
import BChart from './BChart.vue';
import template from '../helper/template';
+import fruit from '../data/fruit';
+import expectancy from '../data/expectancy';
export default defineComponent({
name: 'BBody',
data() {
return {
+demoData: expectancy,
// @ts-ignore:
title: this.$i18n.t('defaultChartTitle'),
maxDataCnt: null,
diff --git a/src/components/BTable.vue b/src/components/BTable.vue
index c3b883a..318daed 100644
--- a/src/components/BTable.vue
+++ b/src/components/BTable.vue
@@ -35,21 +35,19 @@ function colorRenderer(instance, td, row, col, prop, value)
{
export default defineComponent({
name: 'BTable',
props: {
+demoData: Array
},
data() {
-return {
-tableData: [
-['', 'blueberry', 'kiwi', 'banana', 'watermelon']
-// @ts-ignore:
-.map(name => name ? this.$i18n.t(name) : ''),
+const data = this.demoData && this.demoData.length
+? [
+// @ts-ignore:
+this.demoData[0].map(name => name ? this.$i18n.t(name) : ''),
// @ts-ignore:
-[this.$i18n.t('color'), '', '', '', ''],
-['2017', '13', '11', '12', '14'],
-['2018', '20', '44', '34', '39'],
-['2019', '62', '75', '58', '63'],
-['2020', '98', '81', '78', '93'],
-['2021', '139', '98', '88', '143']
-],
+[this.$i18n.t('color'), '', '', '', '']
+].concat(this.demoData.slice(1))
+: [];
+return {
+tableData: data,
table: null,
debouncedTableChange: null
}
diff --git a/src/data/expectancy.ts b/src/data/expectancy.ts
new file mode 100644
index 000..230d59f
--- /dev/null
+++ b/src/data/expectancy.ts
@@ -0,0 +1 @@
+export default
[["","Australia","Canada","China","Cuba","Finland","France","Germany","Iceland","India","Japan","North
Korea","South Korea","New Zealand","Norway","Poland","Russia","Turkey","United
Kingdom","United
States"],["1800",34.05,39,32,32.2,36.5731262,33.96717024,38.37,42.84559912,25.4424,36.4,26,25.8,34.05,37.91620899,35.9,29.5734572,35,38.6497603,39.41],["1810",34.05,39.01496774,32,33.64,36.9473378,37.4,38.37,43.13915533,25.4424,36.40397538,26,25.8,34.05,36.47500606,35.9,29.5734
[...]
diff --git a/src/data/fruit.ts b/src/data/fruit.ts
new file mode 100644
index 000..cdf2bde
--- /dev/null
+++ b/src/data/fruit.ts
@@ -0,0 +1,8 @@
+export default [
+['', 'blueberry', 'kiwi', 'banana', 'watermelon'],
+['2017', '13', '11', '12', '14'],
+['2018', '20', '44', '34', '39'],
+['2019', '62', '75', '58', '63'],
+['2020', '98', '81', '78', '93'],
+['2021', '139', '98', '88', '143']
+];
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-15809 updated (2f7c6fe -> c285682)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-15809 in repository https://gitbox.apache.org/repos/asf/echarts.git. from 2f7c6fe fix(tooltip): format boolean in value #15809 add c285682 fix(tooltip): simplify logic No new revisions were added by this update. Summary of changes: src/util/format.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
