(echarts) 01/01: Merge pull request #19901 from apache/fix/seriesModel-getLinkedData-NPE
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 2a2a6e41fcc98f56f9b3ae9f59cc50024fdf0ca9 Merge: 3cdc70347 ea0da6344 Author: Wenli Zhang AuthorDate: Wed May 8 14:59:57 2024 +0800 Merge pull request #19901 from apache/fix/seriesModel-getLinkedData-NPE fix(series): avoid NPE caused by `seriesData.getLinkedData` src/model/Series.ts | 2 +- test/graph-case.html | 252 ++- test/runTest/actions/__meta__.json | 2 +- test/runTest/actions/graph-case.json | 2 +- 4 files changed, 254 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (3cdc70347 -> 2a2a6e41f)
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 3cdc70347 Merge pull request #19888 from polzmann/feat/add-meridian-template-to-time add ea0da6344 fix(series): add non-null check for `seriesData.getLinkedData`. new 2a2a6e41f Merge pull request #19901 from apache/fix/seriesModel-getLinkedData-NPE 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/model/Series.ts | 2 +- test/graph-case.html | 252 ++- test/runTest/actions/__meta__.json | 2 +- test/runTest/actions/graph-case.json | 2 +- 4 files changed, 254 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-matrix updated (859ab1d22 -> 0daaae1c7)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts.git from 859ab1d22 feat(matrix): graph, scatter, custom add 0daaae1c7 test(matrix): update test cases No new revisions were added by this update. Summary of changes: src/coord/matrix/Matrix.ts | 1 - test/matrix.html| 225 test/matrix_covariance.html | 131 ++ 3 files changed, 356 insertions(+), 1 deletion(-) create mode 100644 test/matrix_covariance.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-matrix updated (0daaae1c7 -> e510f3e57)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts.git from 0daaae1c7 test(matrix): update test cases add e510f3e57 fix(matrix): fix lint errors No new revisions were added by this update. Summary of changes: src/coord/matrix/Matrix.ts | 31 +-- src/coord/matrix/MatrixDim.ts | 18 - src/coord/matrix/MatrixModel.ts | 2 +- test/matrix.html| 56 + 4 files changed, 75 insertions(+), 32 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (2a2a6e41f -> 7e4c70336)
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 2a2a6e41f Merge pull request #19901 from apache/fix/seriesModel-getLinkedData-NPE add f12a3c72c fix(marker): fix marker label formatter can't get series information. new 7e4c70336 Merge pull request #19898 from apache/fix/marker/label-formatter-callback-params 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/marker/MarkerModel.ts | 20 +++- test/markPoint.html | 198 2 files changed, 197 insertions(+), 21 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 #19898 from apache/fix/marker/label-formatter-callback-params
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 7e4c70336762c1ed3fdd84f586b8218692a649ae Merge: 2a2a6e41f f12a3c72c Author: Wenli Zhang AuthorDate: Thu May 9 15:53:42 2024 +0800 Merge pull request #19898 from apache/fix/marker/label-formatter-callback-params fix(marker): fix marker label formatter can't get series information src/component/marker/MarkerModel.ts | 20 +++- test/markPoint.html | 198 2 files changed, 197 insertions(+), 21 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 #19763 from deftliang/fix-sankey-radius
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 75dd430d77e8949d56f2129f05018fe8629e5b2d Merge: 7e4c70336 29c0f9df1 Author: Wenli Zhang AuthorDate: Thu May 9 15:56:26 2024 +0800 Merge pull request #19763 from deftliang/fix-sankey-radius feat(sankey): Add sankey chart itemStyle.borderRadius support. src/chart/sankey/SankeyView.ts | 6 ++- src/util/types.ts | 1 + test/sankey-borderRadius.html | 93 ++ 3 files changed, 98 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (7e4c70336 -> 75dd430d7)
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 7e4c70336 Merge pull request #19898 from apache/fix/marker/label-formatter-callback-params add 29c0f9df1 feat(sankey): Add sankey chart itemStyle.borderRadius support. new 75dd430d7 Merge pull request #19763 from deftliang/fix-sankey-radius 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/sankey/SankeyView.ts | 6 ++- src/util/types.ts | 1 + test/sankey-borderRadius.html | 93 ++ 3 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 test/sankey-borderRadius.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat/break-axis updated (fdf9b556a -> 24a2c9d30)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat/break-axis in repository https://gitbox.apache.org/repos/asf/echarts.git from fdf9b556a feat: add intraday stock chart demo add 2e010c78a test: update dataset-layout.html (#19373) add cdf0c72fe chore: update workflow deps add 492a3f2e9 chore: update workflow deps add f9f324956 chore: update workflow deps add 12c555c51 Merge pull request #19697 from apache/update-workflow-deps add 7d2531398 chore: update deps & install and test typescript versions >=3.5 add bd7a5825d Merge pull request #19696 from apache/test-dts add 1e027061b chore: ignore some unused dirs and files from npm add c576f0c39 Merge pull request #19695 from apache/npmignore add 1ad9a08fe Georoam supports the totalZoom parameter add 697e7984e Merge pull request #19837 from zhaoxinggang/master add e23a40759 fix: detectValue & parseDataValue not crashing with BigInt add bdc5d4f51 Merge pull request #19847 from zettca/fix/bigint add 4515cd37f fix: aria throws error in SSR (#19191) add 872ac99c7 chore(aria): add TODO comment for SSR support add 832cc514a Merge pull request #19892 from OverflowCat/master add 96f4a5f3b feat(time): add meridian template add 3cdc70347 Merge pull request #19888 from polzmann/feat/add-meridian-template-to-time add ea0da6344 fix(series): add non-null check for `seriesData.getLinkedData`. add 2a2a6e41f Merge pull request #19901 from apache/fix/seriesModel-getLinkedData-NPE add f12a3c72c fix(marker): fix marker label formatter can't get series information. add 7e4c70336 Merge pull request #19898 from apache/fix/marker/label-formatter-callback-params add 29c0f9df1 feat(sankey): Add sankey chart itemStyle.borderRadius support. add 75dd430d7 Merge pull request #19763 from deftliang/fix-sankey-radius add 24a2c9d30 Merge branch 'master' into feat/break-axis No new revisions were added by this update. Summary of changes: .github/workflows/ci.yml |6 +- .github/workflows/pr-preview.yml |2 +- .github/workflows/source-release.yml | 10 +- .github/workflows/stale.yml |2 +- .npmignore |3 + build/testDts.js | 27 +- package-lock.json| 1915 +++--- package.json |4 +- src/chart/sankey/SankeyView.ts |6 +- src/component/helper/MapDraw.ts |1 + src/component/marker/MarkerModel.ts | 20 +- src/data/helper/dataValueHelper.ts |2 +- src/data/helper/sourceHelper.ts |4 +- src/model/Series.ts |2 +- src/util/time.ts |5 +- src/util/types.ts|1 + src/visual/aria.ts |7 +- test/dataset-layout.html | 28 +- test/graph-case.html | 252 - test/map-china.html |1 + test/markPoint.html | 198 +++- test/node/ssr.js |4 + test/runTest/actions/__meta__.json |2 +- test/runTest/actions/graph-case.json |2 +- test/sankey-borderRadius.html| 93 ++ test/ut/spec/util/time.test.ts | 16 +- 26 files changed, 1721 insertions(+), 892 deletions(-) create mode 100644 test/sankey-borderRadius.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 02/02: fix: fix failed test cases and improve code
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch dvdkon-fix-13627 in repository https://gitbox.apache.org/repos/asf/echarts.git commit 0c908241d8cf6ee2e3daf26c0582fae40061179f Author: Ovilia AuthorDate: Fri May 10 14:53:21 2024 +0800 fix: fix failed test cases and improve code --- src/coord/axisTickLabelBuilder.ts | 12 +--- test/axis-customTicks.html| 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/coord/axisTickLabelBuilder.ts b/src/coord/axisTickLabelBuilder.ts index dcd9febd7..e7f7bbb08 100644 --- a/src/coord/axisTickLabelBuilder.ts +++ b/src/coord/axisTickLabelBuilder.ts @@ -61,17 +61,7 @@ type InnerStore = { const inner = makeInner(); function tickValuesToNumbers(axis: Axis, values: (number | string | Date)[]) { -const nums = values.map(val => { -if (zrUtil.isString(val)) { -return axis.model.get('data').indexOf(val); -} -else if (val instanceof Date) { -return val.getTime(); -} -else { -return val; -} -}); +const nums = zrUtil.map(values, val => axis.scale.parse(val)); if (axis.type === 'time' && nums.length > 0) { // Time axis needs duplicate first/last tick (see TimeScale.getTicks()) // The first and last tick/label don't get drawn diff --git a/test/axis-customTicks.html b/test/axis-customTicks.html index d11ec2972..24f9c7dc9 100644 --- a/test/axis-customTicks.html +++ b/test/axis-customTicks.html @@ -23,7 +23,7 @@ under the License. - + - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch dvdkon-fix-13627 created (now 0c908241d)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch dvdkon-fix-13627 in repository https://gitbox.apache.org/repos/asf/echarts.git at 0c908241d fix: fix failed test cases and improve code This branch includes the following new commits: new 952fa4523 chore: merge new 0c908241d fix: fix failed test cases and improve code 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/02: chore: merge
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch dvdkon-fix-13627 in repository https://gitbox.apache.org/repos/asf/echarts.git commit 952fa45236e710fd55aa66cbb864716292bffd43 Merge: 75dd430d7 0c013fe71 Author: Ovilia AuthorDate: Fri May 10 14:52:37 2024 +0800 chore: merge src/coord/axisCommonTypes.ts | 9 +- src/coord/axisTickLabelBuilder.ts | 42 test/axis-customTicks.html| 202 ++ 3 files changed, 249 insertions(+), 4 deletions(-) diff --cc src/coord/axisCommonTypes.ts index fbfaf9cf4,4287256f0..0eb29b060 --- a/src/coord/axisCommonTypes.ts +++ b/src/coord/axisCommonTypes.ts @@@ -185,14 -143,20 +185,15 @@@ interface AxisTickOption inside?: boolean, // The length of axisTick. length?: number, --lineStyle?: LineStyleOption -customValues?: (number | string | Date)[], - -// -// [Properties below only for 'category' axis]: - -// If tick is align with label when boundaryGap is true -alignWithLabel?: boolean, -interval?: 'auto' | number | ((index: number, value: string) => boolean) ++lineStyle?: LineStyleOption, ++customValues?: (number | string | Date)[] } -export type AxisLabelFormatterOption = string | ((value: OrdinalRawValue | number, index: number) => string); +type AxisLabelValueFormatter = (value: number, index: number) => string; +type AxisLabelCategoryFormatter = (value: string, index: number) => string; -type TimeAxisLabelUnitFormatter = AxisLabelFormatterOption | string[]; +// export type AxisLabelFormatterOption = string | ((value: OrdinalRawValue | number, index: number) => string); +type TimeAxisLabelUnitFormatter = AxisLabelValueFormatter | string[] | string; export type TimeAxisLabelFormatterOption = string | ((value: number, index: number, extra: {level: number}) => string) @@@ -224,26 -181,20 +225,27 @@@ interface AxisLabelBaseOption extends O showMinLabel?: boolean, // true | false | null/undefined (auto) showMaxLabel?: boolean, +// 'left' | 'center' | 'right' | null/undefined (auto) +alignMinLabel?: TextAlign, +// 'left' | 'center' | 'right' | null/undefined (auto) +alignMaxLabel?: TextAlign, +// 'top' | 'middle' | 'bottom' | null/undefined (auto) +verticalAlignMinLabel?: TextVerticalAlign, +// 'top' | 'middle' | 'bottom' | null/undefined (auto) +verticalAlignMaxLabel?: TextVerticalAlign, margin?: number, -// value is supposed to be OptionDataPrimitive but for time axis, it is time stamp. -formatter?: AxisLabelFormatterOption | TimeAxisLabelFormatterOption, +rich?: Dictionary +/** + * If hide overlapping labels. + */ - hideOverlap?: boolean; ++hideOverlap?: boolean, + customValues?: (number | string | Date)[], - -// -// [Properties below only for 'category' axis]: - -interval?: 'auto' | number | ((index: number, value: string) => boolean) - // Color can be callback --color?: ColorString | ((value?: string | number, index?: number) => ColorString) - -rich?: Dictionary ++color?: ColorString | ((value?: string | number, index?: number) => ColorString), +overflow?: TextStyleProps['overflow'] +} +interface AxisLabelOption extends AxisLabelBaseOption { +formatter?: LabelFormatters[TType] } interface MinorTickOption { @@@ -271,7 -222,3 +273,6 @@@ interface SplitAreaOption // colors will display in turn areaStyle?: AreaStyleOption } + - +export type AxisBaseOption = ValueAxisBaseOption | LogAxisBaseOption +| CategoryAxisBaseOption | TimeAxisBaseOption | AxisBaseOptionCommon; diff --cc src/coord/axisTickLabelBuilder.ts index 6ac305f9b,8787207ca..dcd9febd7 --- a/src/coord/axisTickLabelBuilder.ts +++ b/src/coord/axisTickLabelBuilder.ts @@@ -60,9 -60,30 +60,31 @@@ type InnerStore = const inner = makeInner(); + function tickValuesToNumbers(axis: Axis, values: (number | string | Date)[]) { + const nums = values.map(val => { + if (zrUtil.isString(val)) { + return axis.model.get('data').indexOf(val); + } + else if (val instanceof Date) { + return val.getTime(); + } + else { + return val; + } + }); + if (axis.type === 'time' && nums.length > 0) { + // Time axis needs duplicate first/last tick (see TimeScale.getTicks()) + // The first and last tick/label don't get drawn + nums.sort(); + nums.unshift(nums[0]); + nums.push(num
(echarts) branch feat-matrix updated (e510f3e57 -> 0b3f14bc8)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts.git from e510f3e57 fix(matrix): fix lint errors add 0b3f14bc8 fix(matrix): fix import No new revisions were added by this update. Summary of changes: src/coord/matrix/Matrix.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) branch v6 created (now a5d803b3)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts-doc.git at a5d803b3 tweak extractOptionKeys tool 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) branch feat-matrix updated (0b3f14bc8 -> 9d1b48d0e)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts.git from 0b3f14bc8 fix(matrix): fix import add 9d1b48d0e test(matrix): more applications No new revisions were added by this update. Summary of changes: src/coord/matrix/MatrixDim.ts | 4 +- test/matrix_application.html | 458 ++ test/matrix_covariance.html | 131 3 files changed, 460 insertions(+), 133 deletions(-) create mode 100644 test/matrix_application.html delete mode 100644 test/matrix_covariance.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-examples) branch v6 created (now 1ab5a78e)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts-examples.git at 1ab5a78e update thumbnail of the bar-rich-text example (apache/echarts#19898) 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) branch feat-matrix updated (9d1b48d0e -> 6e8c626fd)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts.git from 9d1b48d0e test(matrix): more applications add 6e8c626fd test(matrix): fix test cases No new revisions were added by this update. Summary of changes: test/matrix_application.html | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-matrix updated (6e8c626fd -> b0529f915)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts.git from 6e8c626fd test(matrix): fix test cases add b0529f915 feat(matrix): support convertToPixel and add a case for Periodic Table No new revisions were added by this update. Summary of changes: src/component/matrix/MatrixView.ts | 40 +++--- src/coord/matrix/Matrix.ts | 40 ++ src/coord/matrix/MatrixDim.ts | 8 ++ src/util/model.ts | 1 + test/matrix_application.html | 261 + 5 files changed, 332 insertions(+), 18 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-matrix updated (b0529f915 -> 8bedb782f)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts.git from b0529f915 feat(matrix): support convertToPixel and add a case for Periodic Table add 8bedb782f feat(matrix): support darkMode, headers can be hidden No new revisions were added by this update. Summary of changes: src/coord/matrix/Matrix.ts | 5 src/coord/matrix/MatrixDim.ts | 4 +++ src/coord/matrix/MatrixModel.ts | 3 ++ src/theme/dark.ts | 18 test/matrix.html| 61 - test/matrix_application.html| 11 ++-- 6 files changed, 98 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-matrix updated (8bedb782f -> ab3efd315)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts.git from 8bedb782f feat(matrix): support darkMode, headers can be hidden add ab3efd315 fix(matrix): remove unnecessary field No new revisions were added by this update. Summary of changes: src/coord/matrix/MatrixModel.ts | 5 - 1 file changed, 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-examples) 01/02: feat(matrix): add demos of matrix charts
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts-examples.git commit 723d48527fe90ad3cf63aab90cd2d012042fca10 Author: Ovilia AuthorDate: Mon May 13 19:09:41 2024 +0800 feat(matrix): add demos of matrix charts --- public/examples/ts/matrix-confusion.ts | 111 ++ public/examples/ts/matrix-correlation-heatmap.ts | 81 +++ public/examples/ts/matrix-correlation-scatter.ts | 80 +++ public/examples/ts/matrix-covariance.ts | 104 + public/examples/ts/matrix-graph.ts | 123 +++ public/examples/ts/matrix-periodic-table.ts | 259 +++ public/examples/ts/matrix-pie.ts | 74 +++ public/examples/ts/matrix-simple.ts | 54 + src/data/chart-list-data.js | 88 9 files changed, 974 insertions(+) diff --git a/public/examples/ts/matrix-confusion.ts b/public/examples/ts/matrix-confusion.ts new file mode 100644 index ..51714f1d --- /dev/null +++ b/public/examples/ts/matrix-confusion.ts @@ -0,0 +1,111 @@ +/* +title: Confusion Matrix +category: matrix +titleCN: 混淆矩阵 +difficulty: 3 +*/ + +const label = { + fontSize: 16, + color: '#555' +}; +option = { + matrix: { +x: { + data: ['Positive', 'Negative'], + label +}, +y: { + data: ['Positive', 'Negative'], + label +}, +top: 80, +width: 600, +left: 'center' + }, + series: { +type: 'custom', +coordinateSystem: 'matrix', +data: [ + ['Positive', 'Positive', 10], + ['Positive', 'Negative', 2], + ['Negative', 'Positive', 3], + ['Negative', 'Negative', 5] +], +label: { + show: true, + formatter: (params) => { +const value = params.value[2]; +return ( + '{name|' + + (params.value[0] === params.value[1] ? 'True ' : 'False ') + + params.value[1] + + '}\n{value|' + + value + + '}' +); + }, + rich: { +name: { + color: '#fff', + backgroundColor: '#999', + textBorderColor: '#333', + padding: 5, + fontSize: 18 +}, +value: { + color: '#444', + textBorderWidth: 0, + padding: 5, + fontSize: 16, + align: 'center' +} + } +}, +renderItem: function (params, api) { + const x = api.value(0); + const y = api.value(1); + const center = api.coord([x, y]); + const size = api.size([x, y]); + return { +type: 'rect', +shape: { + x: center[0] - size[0] / 2, + y: center[1] - size[1] / 2, + width: size[0], + height: size[1] +}, +style: api.style({ + fill: x === y ? '#8f8' : '#f88' +}) + }; +} + }, + graphic: { +elements: [ + { +type: 'text', +style: { + text: 'True Class', + fill: '#333', + font: 'bold 24px serif', + textAlign: 'center' +}, +x: (window.innerWidth - 600) / 2 + (600 / 6) * 4, +y: 40 + }, + { +type: 'text', +style: { + text: 'Predicted Class', + fill: '#333', + font: 'bold 24px serif', + textAlign: 'center' +}, +x: (window.innerWidth - 600) / 2 - 50, +y: 270, +rotation: Math.PI / 2 + } +] + } +}; diff --git a/public/examples/ts/matrix-correlation-heatmap.ts b/public/examples/ts/matrix-correlation-heatmap.ts new file mode 100644 index ..a2c17229 --- /dev/null +++ b/public/examples/ts/matrix-correlation-heatmap.ts @@ -0,0 +1,81 @@ +/* +title: Correlation Matrix (Heatmap) +category: matrix +titleCN: 相关矩阵(热力图) +difficulty: 2 +*/ + +const xCnt = 8; +const yCnt = xCnt; +const xData = []; +const yData = []; +for (let i = 0; i < xCnt; ++i) { + xData.push({ +value: 'X' + (i + 1) + }); +} + +for (let i = 0; i < yCnt; ++i) { + yData.push({ +value: 'Y' + (i + 1) + }); +} + +const data = []; +for (let i = 1; i <= xCnt; ++i) { + for (let j = 1; j <= yCnt; ++j) { +if (i >= j) { + data.push([ +'X' + i, +'Y' + j, +i === j ? 1 : Math.random() * 2 - 1 + ]); +} + } +} + +option = { + matrix: { +x: { + data: xData +}, +y: { + data: yData +}, +top: 80 + }, + vi
(echarts-examples) 02/02: doc(matrix): add examples for apache/echarts#19807
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts-examples.git commit 850f21d6ca51befcf72f49553b983467e63eb676 Author: Ovilia AuthorDate: Wed May 15 15:27:25 2024 +0800 doc(matrix): add examples for apache/echarts#19807 --- public/data/thumb-dark/matrix-confusion.png| Bin 0 -> 36258 bytes public/data/thumb-dark/matrix-confusion.webp | Bin 0 -> 5676 bytes public/data/thumb-dark/matrix-correlation-heatmap.png | Bin 0 -> 61334 bytes public/data/thumb-dark/matrix-correlation-heatmap.webp | Bin 0 -> 9462 bytes public/data/thumb-dark/matrix-correlation-scatter.png | Bin 0 -> 127787 bytes public/data/thumb-dark/matrix-correlation-scatter.webp | Bin 0 -> 19360 bytes public/data/thumb-dark/matrix-covariance.png | Bin 0 -> 101854 bytes public/data/thumb-dark/matrix-covariance.webp | Bin 0 -> 17886 bytes public/data/thumb-dark/matrix-graph.png| Bin 0 -> 66156 bytes public/data/thumb-dark/matrix-graph.webp | Bin 0 -> 9488 bytes public/data/thumb-dark/matrix-periodic-table.png | Bin 0 -> 115402 bytes public/data/thumb-dark/matrix-periodic-table.webp | Bin 0 -> 25808 bytes public/data/thumb-dark/matrix-pie.png | Bin 0 -> 76079 bytes public/data/thumb-dark/matrix-pie.webp | Bin 0 -> 20544 bytes public/data/thumb-dark/matrix-simple.png | Bin 0 -> 22934 bytes public/data/thumb-dark/matrix-simple.webp | Bin 0 -> 3048 bytes public/data/thumb/matrix-confusion.png | Bin 0 -> 31424 bytes public/data/thumb/matrix-confusion.webp| Bin 0 -> 6624 bytes public/data/thumb/matrix-correlation-heatmap.png | Bin 0 -> 52804 bytes public/data/thumb/matrix-correlation-heatmap.webp | Bin 0 -> 8922 bytes public/data/thumb/matrix-correlation-scatter.png | Bin 0 -> 101729 bytes public/data/thumb/matrix-correlation-scatter.webp | Bin 0 -> 16188 bytes public/data/thumb/matrix-covariance.png| Bin 0 -> 88219 bytes public/data/thumb/matrix-covariance.webp | Bin 0 -> 16910 bytes public/data/thumb/matrix-graph.png | Bin 0 -> 48459 bytes public/data/thumb/matrix-graph.webp| Bin 0 -> 11160 bytes public/data/thumb/matrix-periodic-table.png| Bin 0 -> 109954 bytes public/data/thumb/matrix-periodic-table.webp | Bin 0 -> 28708 bytes public/data/thumb/matrix-pie.png | Bin 0 -> 60149 bytes public/data/thumb/matrix-pie.webp | Bin 0 -> 17510 bytes public/data/thumb/matrix-simple.png| Bin 0 -> 16535 bytes public/data/thumb/matrix-simple.webp | Bin 0 -> 2826 bytes public/examples/ts/matrix-correlation-heatmap.ts | 17 + public/examples/ts/matrix-covariance.ts| 10 -- src/asset/icon/matrix.svg | 3 +++ src/common/config.js | 1 + src/common/i18n.js | 2 ++ src/explore/Explore.vue| 1 + 38 files changed, 16 insertions(+), 18 deletions(-) diff --git a/public/data/thumb-dark/matrix-confusion.png b/public/data/thumb-dark/matrix-confusion.png new file mode 100644 index ..fdde08ea Binary files /dev/null and b/public/data/thumb-dark/matrix-confusion.png differ diff --git a/public/data/thumb-dark/matrix-confusion.webp b/public/data/thumb-dark/matrix-confusion.webp new file mode 100644 index ..253a475d Binary files /dev/null and b/public/data/thumb-dark/matrix-confusion.webp differ diff --git a/public/data/thumb-dark/matrix-correlation-heatmap.png b/public/data/thumb-dark/matrix-correlation-heatmap.png new file mode 100644 index ..8f0614c4 Binary files /dev/null and b/public/data/thumb-dark/matrix-correlation-heatmap.png differ diff --git a/public/data/thumb-dark/matrix-correlation-heatmap.webp b/public/data/thumb-dark/matrix-correlation-heatmap.webp new file mode 100644 index ..d6e26fdb Binary files /dev/null and b/public/data/thumb-dark/matrix-correlation-heatmap.webp differ diff --git a/public/data/thumb-dark/matrix-correlation-scatter.png b/public/data/thumb-dark/matrix-correlation-scatter.png new file mode 100644 index ..2742dd4a Binary files /dev/null and b/public/data/thumb-dark/matrix-correlation-scatter.png differ diff --git a/public/data/thumb-dark/matrix-correlation-scatter.webp b/public/data/thumb-dark/matrix-correlation-scatter.webp new file mode 100644 index ..154a8851 Binary files /dev/null and b/public/data/thumb-dark/matrix-correlation-scatter.webp differ diff --git a/public/data/thumb-dark/
(echarts-examples) branch feat-matrix created (now 850f21d6)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts-examples.git at 850f21d6 doc(matrix): add examples for apache/echarts#19807 This branch includes the following new commits: new 723d4852 feat(matrix): add demos of matrix charts new 850f21d6 doc(matrix): add examples for apache/echarts#19807 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) branch v6 created (now a861bef15)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts.git at a861bef15 Merge pull request #19937 from apache/master 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-doc) branch feat-matrix created (now 66932afd)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts-doc.git at 66932afd doc(matrix): add doc for apache/echarts#19807 This branch includes the following new commits: new 66932afd doc(matrix): add doc for apache/echarts#19807 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: doc(matrix): add doc for apache/echarts#19807
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 66932afd21998c08c3886dc49e6cea0f7245590f Author: Ovilia AuthorDate: Thu May 16 14:44:32 2024 +0800 doc(matrix): add doc for apache/echarts#19807 --- en/option/component/matrix.md | 74 + en/option/option.md| 1 + en/option/partial/matrix-header.md | 61 +++ zh/option/component/matrix.md | 75 ++ zh/option/option.md| 1 + zh/option/partial/matrix-header.md | 61 +++ 6 files changed, 273 insertions(+) diff --git a/en/option/component/matrix.md b/en/option/component/matrix.md new file mode 100644 index ..2abe7040 --- /dev/null +++ b/en/option/component/matrix.md @@ -0,0 +1,74 @@ +{{ target: component-matrix }} + +# matrix(Object) + +Matrix coordinate system component. + +Matrix coordinate system is similar to a table, mainly used to display the relationship and interaction of multi-dimensional data. It presents data in the form of a rectangular grid, where each grid unit (or "cell") represents the value of a specific data point. The entire layout is displayed in rows and columns to express the relationship of two-dimensional or higher-dimensional data. + +Because it is a "coordinate system", it can be used in combination with multiple chart series, such as heat maps, scatter plots, custom series, etc. + +Correlation heat map using heat map in matrix coordinate system: +~[800x400](${galleryViewPath}matrix-correlation-heatmap&edit=1&reset=1) + +Correlation scatter plot using scatter plot in matrix coordinate system: +~[800x400](${galleryViewPath}matrix-correlation-scatter&edit=1&reset=1) + +Correlation graph using relationship graph in matrix coordinate system: +~[800x600](${galleryViewPath}matrix-graph&edit=1&reset=1) + +Correlation pie chart using pie chart in matrix coordinate system. The example below shows multi-level X data: +~[800x600](${galleryViewPath}matrix-pie&edit=1&reset=1) + +Confusion matrix using custom series in matrix coordinate system: +~[800x400](${galleryViewPath}matrix-confusion&edit=1&reset=1) + +By flexibly using the combination of chart series, coordinate systems, and APIs, richer effects can be achieved. + +{{ use: partial-component-id( +prefix = "#" +) }} + +{{ use: partial-rect-layout-width-height( +componentName = "matrix", +defaultLeft = "10%", +defaultTop = "10%" +) }} + +## x(Object) + +{{ use: partial-matrix-header( +name = 'x', +prefix = '##' +) }} + +## y(Object) + +{{ use: partial-matrix-header( +name = 'y', +prefix = '##' +) }} + +## backgroundStyle(Object) + +The style of the entire matrix area. + +{{ use: partial-item-style( +prefix = "##", +name = "Entire matrix area ", +defaultColor = "none", +defaultBorderColor = "'#ccc'", +defaultBorderWidth = 1 +) }} + +## innerBackgroundStyle(Object) + +The style of the inner cells. + +{{ use: partial-item-style( +prefix = "##", +name = "Inner cells ", +defaultColor = "none", +defaultBorderColor = "'#ccc'", +defaultBorderWidth = 1 +) }} diff --git a/en/option/option.md b/en/option/option.md index 0f37d5b7..dbc20589 100644 --- a/en/option/option.md +++ b/en/option/option.md @@ -22,6 +22,7 @@ {{import: component-timeline}} {{import: component-graphic}} {{import: component-calendar}} +{{import: component-matrix}} {{import: component-dataset}} {{import: component-aria}} diff --git a/en/option/partial/matrix-header.md b/en/option/partial/matrix-header.md new file mode 100644 index ..efa0ee06 --- /dev/null +++ b/en/option/partial/matrix-header.md @@ -0,0 +1,61 @@ +{{ target: partial-matrix-header }} + +Configuration for the ${name} Axis + +#${prefix|default('##')} show(boolean) = true + +Determines whether to display the title row of the ${name} axis. + +#${prefix|default('##')} data(Array) + +Specifies the data for the title row of the ${name} axis. + +```js +// Data for a single row +data: ['A', 'B', 'C', 'D', 'E'] + +// Data in a tree structure +data: [{ +value: 'A', +children: [ +{ +value: 'A1', +children: [ +{value: 'A1-1'}, +{value: 'A1-2'} +] +}, +{value: 'A2'} +] +}, { +value: 'B', +children: [ +{value: 'B1'}, +{value: 'B2'} +] +}] +``` + +#${prefix|defau
(echarts-examples) branch v6 updated (1ab5a78e -> 1b4632da)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts-examples.git from 1ab5a78e update thumbnail of the bar-rich-text example (apache/echarts#19898) add 723d4852 feat(matrix): add demos of matrix charts add 850f21d6 doc(matrix): add examples for apache/echarts#19807 new 1b4632da Merge pull request #90 from apache/feat-matrix 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: public/data/thumb-dark/matrix-confusion.png| Bin 0 -> 36258 bytes public/data/thumb-dark/matrix-confusion.webp | Bin 0 -> 5676 bytes .../data/thumb-dark/matrix-correlation-heatmap.png | Bin 0 -> 61334 bytes .../thumb-dark/matrix-correlation-heatmap.webp | Bin 0 -> 9462 bytes .../data/thumb-dark/matrix-correlation-scatter.png | Bin 0 -> 127787 bytes .../thumb-dark/matrix-correlation-scatter.webp | Bin 0 -> 19360 bytes public/data/thumb-dark/matrix-covariance.png | Bin 0 -> 101854 bytes public/data/thumb-dark/matrix-covariance.webp | Bin 0 -> 17886 bytes public/data/thumb-dark/matrix-graph.png| Bin 0 -> 66156 bytes public/data/thumb-dark/matrix-graph.webp | Bin 0 -> 9488 bytes public/data/thumb-dark/matrix-periodic-table.png | Bin 0 -> 115402 bytes public/data/thumb-dark/matrix-periodic-table.webp | Bin 0 -> 25808 bytes public/data/thumb-dark/matrix-pie.png | Bin 0 -> 76079 bytes public/data/thumb-dark/matrix-pie.webp | Bin 0 -> 20544 bytes public/data/thumb-dark/matrix-simple.png | Bin 0 -> 22934 bytes public/data/thumb-dark/matrix-simple.webp | Bin 0 -> 3048 bytes public/data/thumb/matrix-confusion.png | Bin 0 -> 31424 bytes public/data/thumb/matrix-confusion.webp| Bin 0 -> 6624 bytes public/data/thumb/matrix-correlation-heatmap.png | Bin 0 -> 52804 bytes public/data/thumb/matrix-correlation-heatmap.webp | Bin 0 -> 8922 bytes public/data/thumb/matrix-correlation-scatter.png | Bin 0 -> 101729 bytes public/data/thumb/matrix-correlation-scatter.webp | Bin 0 -> 16188 bytes public/data/thumb/matrix-covariance.png| Bin 0 -> 88219 bytes public/data/thumb/matrix-covariance.webp | Bin 0 -> 16910 bytes public/data/thumb/matrix-graph.png | Bin 0 -> 48459 bytes public/data/thumb/matrix-graph.webp| Bin 0 -> 11160 bytes public/data/thumb/matrix-periodic-table.png| Bin 0 -> 109954 bytes public/data/thumb/matrix-periodic-table.webp | Bin 0 -> 28708 bytes public/data/thumb/matrix-pie.png | Bin 0 -> 60149 bytes public/data/thumb/matrix-pie.webp | Bin 0 -> 17510 bytes public/data/thumb/matrix-simple.png| Bin 0 -> 16535 bytes public/data/thumb/matrix-simple.webp | Bin 0 -> 2826 bytes public/examples/ts/matrix-confusion.ts | 111 + public/examples/ts/matrix-correlation-heatmap.ts | 66 ++ public/examples/ts/matrix-correlation-scatter.ts | 80 +++ public/examples/ts/matrix-covariance.ts| 110 + public/examples/ts/matrix-graph.ts | 123 ++ public/examples/ts/matrix-periodic-table.ts| 259 + public/examples/ts/matrix-pie.ts | 74 ++ public/examples/ts/matrix-simple.ts| 54 + src/asset/icon/matrix.svg | 3 + src/common/config.js | 1 + src/common/i18n.js | 2 + src/data/chart-list-data.js| 88 +++ src/explore/Explore.vue| 1 + 45 files changed, 972 insertions(+) create mode 100644 public/data/thumb-dark/matrix-confusion.png create mode 100644 public/data/thumb-dark/matrix-confusion.webp create mode 100644 public/data/thumb-dark/matrix-correlation-heatmap.png create mode 100644 public/data/thumb-dark/matrix-correlation-heatmap.webp create mode 100644 public/data/thumb-dark/matrix-correlation-scatter.png create mode 100644 public/data/thumb-dark/matrix-correlation-scatter.webp create mode 100644 public/data/thumb-dark/matrix-covariance.png create mode 100644 public/data/thumb-dark/matrix-covariance.webp create mode 100644 public/data/thumb-dark/matrix-graph.png create mode 100644 public/data/thumb-dark/matrix-graph.webp create mode 100644 public/data/thumb-dark/matrix-periodic-table.png create mode 100644 public/data/thumb-dark/matrix-periodic-table.webp create mode 100644 public/data/thumb-dark/matrix-pie.png cr
(echarts-examples) 01/01: Merge pull request #90 from apache/feat-matrix
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts-examples.git commit 1b4632da8be19b1938d0bc8758d534b39dce790a Merge: 1ab5a78e 850f21d6 Author: Wenli Zhang AuthorDate: Thu May 16 14:47:48 2024 +0800 Merge pull request #90 from apache/feat-matrix doc(matrix): matrix coordinate public/data/thumb-dark/matrix-confusion.png| Bin 0 -> 36258 bytes public/data/thumb-dark/matrix-confusion.webp | Bin 0 -> 5676 bytes .../data/thumb-dark/matrix-correlation-heatmap.png | Bin 0 -> 61334 bytes .../thumb-dark/matrix-correlation-heatmap.webp | Bin 0 -> 9462 bytes .../data/thumb-dark/matrix-correlation-scatter.png | Bin 0 -> 127787 bytes .../thumb-dark/matrix-correlation-scatter.webp | Bin 0 -> 19360 bytes public/data/thumb-dark/matrix-covariance.png | Bin 0 -> 101854 bytes public/data/thumb-dark/matrix-covariance.webp | Bin 0 -> 17886 bytes public/data/thumb-dark/matrix-graph.png| Bin 0 -> 66156 bytes public/data/thumb-dark/matrix-graph.webp | Bin 0 -> 9488 bytes public/data/thumb-dark/matrix-periodic-table.png | Bin 0 -> 115402 bytes public/data/thumb-dark/matrix-periodic-table.webp | Bin 0 -> 25808 bytes public/data/thumb-dark/matrix-pie.png | Bin 0 -> 76079 bytes public/data/thumb-dark/matrix-pie.webp | Bin 0 -> 20544 bytes public/data/thumb-dark/matrix-simple.png | Bin 0 -> 22934 bytes public/data/thumb-dark/matrix-simple.webp | Bin 0 -> 3048 bytes public/data/thumb/matrix-confusion.png | Bin 0 -> 31424 bytes public/data/thumb/matrix-confusion.webp| Bin 0 -> 6624 bytes public/data/thumb/matrix-correlation-heatmap.png | Bin 0 -> 52804 bytes public/data/thumb/matrix-correlation-heatmap.webp | Bin 0 -> 8922 bytes public/data/thumb/matrix-correlation-scatter.png | Bin 0 -> 101729 bytes public/data/thumb/matrix-correlation-scatter.webp | Bin 0 -> 16188 bytes public/data/thumb/matrix-covariance.png| Bin 0 -> 88219 bytes public/data/thumb/matrix-covariance.webp | Bin 0 -> 16910 bytes public/data/thumb/matrix-graph.png | Bin 0 -> 48459 bytes public/data/thumb/matrix-graph.webp| Bin 0 -> 11160 bytes public/data/thumb/matrix-periodic-table.png| Bin 0 -> 109954 bytes public/data/thumb/matrix-periodic-table.webp | Bin 0 -> 28708 bytes public/data/thumb/matrix-pie.png | Bin 0 -> 60149 bytes public/data/thumb/matrix-pie.webp | Bin 0 -> 17510 bytes public/data/thumb/matrix-simple.png| Bin 0 -> 16535 bytes public/data/thumb/matrix-simple.webp | Bin 0 -> 2826 bytes public/examples/ts/matrix-confusion.ts | 111 + public/examples/ts/matrix-correlation-heatmap.ts | 66 ++ public/examples/ts/matrix-correlation-scatter.ts | 80 +++ public/examples/ts/matrix-covariance.ts| 110 + public/examples/ts/matrix-graph.ts | 123 ++ public/examples/ts/matrix-periodic-table.ts| 259 + public/examples/ts/matrix-pie.ts | 74 ++ public/examples/ts/matrix-simple.ts| 54 + src/asset/icon/matrix.svg | 3 + src/common/config.js | 1 + src/common/i18n.js | 2 + src/data/chart-list-data.js| 88 +++ src/explore/Explore.vue| 1 + 45 files changed, 972 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-examples) branch feat-matrix deleted (was 850f21d6)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts-examples.git was 850f21d6 doc(matrix): add examples for apache/echarts#19807 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) branch v6 updated (a5d803b3 -> 34f8b9f8)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from a5d803b3 tweak extractOptionKeys tool add 66932afd doc(matrix): add doc for apache/echarts#19807 new 34f8b9f8 Merge pull request #394 from apache/feat-matrix 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: en/option/component/matrix.md | 74 + en/option/option.md| 1 + en/option/partial/matrix-header.md | 61 +++ zh/option/component/matrix.md | 75 ++ zh/option/option.md| 1 + zh/option/partial/matrix-header.md | 61 +++ 6 files changed, 273 insertions(+) create mode 100644 en/option/component/matrix.md create mode 100644 en/option/partial/matrix-header.md create mode 100644 zh/option/component/matrix.md create mode 100644 zh/option/partial/matrix-header.md - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) 01/01: Merge pull request #394 from apache/feat-matrix
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 34f8b9f893b8b524e434076992c2f3a46d0770b0 Merge: a5d803b3 66932afd Author: Wenli Zhang AuthorDate: Thu May 16 14:48:33 2024 +0800 Merge pull request #394 from apache/feat-matrix doc(matrix): add doc for apache/echarts#19807 en/option/component/matrix.md | 74 + en/option/option.md| 1 + en/option/partial/matrix-header.md | 61 +++ zh/option/component/matrix.md | 75 ++ zh/option/option.md| 1 + zh/option/partial/matrix-header.md | 61 +++ 6 files changed, 273 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) branch feat-matrix deleted (was 66932afd)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts-doc.git was 66932afd doc(matrix): add doc for apache/echarts#19807 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat/break-axis updated (24a2c9d30 -> 124376d2f)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat/break-axis in repository https://gitbox.apache.org/repos/asf/echarts.git from 24a2c9d30 Merge branch 'master' into feat/break-axis add 0c82ead72 Merge pull request #17716 from apache/master add 7a12c0ba8 Merge pull request #17796 from apache/master add 6f500be79 test(universalTransition): a possible test file add 0f850296a wip: successfully get childGroupId (a possible new interface) add 4d4634fd4 wip: can decide "parent2child" or "child2parent" add a4cf7f9f2 wip: new createKeyGetters that suppot multi-drill (but only get key from dim) add 788daecc1 wip: should consider getting direction from more ways & using groupId only when direction is 'nodirection' add 5063c519f refactor: rename "KeyDim" to "GroupIdDim" add 01ba523a7 learning: add some comments add 5e475a208 fix: incorrect dataGroupId for old data items in universalTransition add 6e555b754 feat: multiple level drill down (alpha) add 9fcbc7c58 refactor: more readable universalTransition-multiLevelDrillDown.html add ce89ee778 docs: add comments for code add b123f35e3 docs: improve comments in test html add 6168f98e2 docs: update universalTransition-multiLevelDrilldown.html add e5b9be310 Merge branch 'master' into feat/multi-drill add d6895216a revert changes introduced by a merge in mistake add 938e4152b rename `childGroupId` to `itemChildGroupId` to make it consistent with `itemGroupId` add 8e80c0116 no need to return undefined, just return add 55ba82589 use `!= null` to test if equal to `undefined` or `null` add ffbc6afaf not use enum, just use const variables add 5321c2d8d merge `getGroupId` and `getChildGroupId` into one function add dc9a3f68c use createHashMap() to improve performance add 6f7a395ac add another test case add edd2d3cf3 slow down animation update in test cases add 9d52862cb fix unexpected appearance of xAxis.name after switching options add 3d5b32c42 simplify code add 1dadcabe2 Merge pull request #17611 from tyn1998/feat/multi-drill add 7749341f7 Merge pull request #18049 from apache/master add 5c1c53d2a Merge pull request #18420 from apache/master add 11b4c8e93 Merge pull request #18558 from apache/master add c77017025 Merge pull request #19632 from apache/master add 1cd9e0965 Merge branch 'next' into feat/break-axis add 124376d2f fix(break): fix lint No new revisions were added by this update. Summary of changes: src/component/axis/axisBreakHelper.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 feat/break-axis updated (124376d2f -> f5f246d8f)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat/break-axis in repository https://gitbox.apache.org/repos/asf/echarts.git from 124376d2f fix(break): fix lint add a861bef15 Merge pull request #19937 from apache/master add f5f246d8f Merge branch 'next' into feat/break-axis No new revisions were added by this update. Summary of changes: - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/01: feat(scatter): support jitter for scatters #18432
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat-scatter in repository https://gitbox.apache.org/repos/asf/echarts.git commit ecfe5832db45d9261898bedf02c9628d85dbd7c5 Author: Ovilia AuthorDate: Thu May 16 18:52:07 2024 +0800 feat(scatter): support jitter for scatters #18432 --- src/coord/axisCommonTypes.ts | 1 + src/coord/axisDefault.ts | 1 + src/coord/cartesian/Cartesian2D.ts | 19 ++- src/coord/single/Single.ts | 7 + test/scatter-jitter.html | 262 + 5 files changed, 288 insertions(+), 2 deletions(-) diff --git a/src/coord/axisCommonTypes.ts b/src/coord/axisCommonTypes.ts index fbfaf9cf4..e051d08b5 100644 --- a/src/coord/axisCommonTypes.ts +++ b/src/coord/axisCommonTypes.ts @@ -81,6 +81,7 @@ export interface AxisBaseOptionCommon extends ComponentOption, */ max?: ScaleDataValue | 'dataMax' | ((extent: {min: number, max: number}) => ScaleDataValue); +jitter?: number; } export interface NumericAxisBaseOptionCommon extends AxisBaseOptionCommon { diff --git a/src/coord/axisDefault.ts b/src/coord/axisDefault.ts index 4d2c6674b..8e03ca133 100644 --- a/src/coord/axisDefault.ts +++ b/src/coord/axisDefault.ts @@ -113,6 +113,7 @@ const categoryAxis: AxisBaseOption = zrUtil.merge({ boundaryGap: true, // Set false to faster category collection. deduplication: null, +jitter: 0, // splitArea: { // show: false // }, diff --git a/src/coord/cartesian/Cartesian2D.ts b/src/coord/cartesian/Cartesian2D.ts index 4072684d1..1351a6085 100644 --- a/src/coord/cartesian/Cartesian2D.ts +++ b/src/coord/cartesian/Cartesian2D.ts @@ -133,11 +133,26 @@ class Cartesian2D extends Cartesian implements CoordinateSystem { } const xAxis = this.getAxis('x'); const yAxis = this.getAxis('y'); -out[0] = xAxis.toGlobalCoord(xAxis.dataToCoord(xVal, clamp)); -out[1] = yAxis.toGlobalCoord(yAxis.dataToCoord(yVal, clamp)); +out[0] = this._fixJitter( +xAxis.toGlobalCoord(xAxis.dataToCoord(xVal, clamp)), +xAxis +); +out[1] = this._fixJitter( +yAxis.toGlobalCoord(yAxis.dataToCoord(yVal, clamp)), +yAxis +); return out; } +protected _fixJitter(coord: number, axis: Axis2D): number { +const jitter = axis.model.get('jitter'); +const scaleType = axis.scale.type; +if (jitter > 0 && (scaleType === 'category' || scaleType === 'ordinal')) { +return coord + (Math.random() - 0.5) * jitter; +} +return coord; +} + clampData(data: ScaleDataValue[], out?: number[]): number[] { const xScale = this.getAxis('x').scale; const yScale = this.getAxis('y').scale; diff --git a/src/coord/single/Single.ts b/src/coord/single/Single.ts index c9226b5aa..80133df60 100644 --- a/src/coord/single/Single.ts +++ b/src/coord/single/Single.ts @@ -238,6 +238,13 @@ class Single implements CoordinateSystem, CoordinateSystemMaster { pt[idx] = axis.toGlobalCoord(axis.dataToCoord(+val)); pt[1 - idx] = idx === 0 ? (rect.y + rect.height / 2) : (rect.x + rect.width / 2); + +const jitter = axis.model.get('jitter'); +if (jitter) { +const diff = (Math.random() - 0.5) * jitter; +pt[1 - idx] += diff; +} + return pt; } diff --git a/test/scatter-jitter.html b/test/scatter-jitter.html new file mode 100644 index 0..700a8ba83 --- /dev/null +++ b/test/scatter-jitter.html @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +require([ +'echarts', +// 'map/js/china', +// './data/nutrients.json' +], function (echarts) { +var option; + +const data = []; +for (let i = 0; i < 200; ++i) { +data.push([ +'a' + (Math.floor(Math.random() * 4) + 1), +Math.random() * 100, +]) +} + +option = { +xAxis: { +type: 'category', +data: ['a1', 'a2', 'a3', 'a4'], +jitter: 20 +}, +yAxis: {}, +series: { +type: 'scatter', +data +} +}; + +var chart = testHelper.create(echarts, 'main0', { +title: [ +'Jittering
(echarts) branch feat-scatter created (now ecfe5832d)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-scatter in repository https://gitbox.apache.org/repos/asf/echarts.git at ecfe5832d feat(scatter): support jitter for scatters #18432 This branch includes the following new commits: new ecfe5832d feat(scatter): support jitter for scatters #18432 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 v6 updated: doc(scatter): add jitter apache/echarts#19941
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts-doc.git The following commit(s) were added to refs/heads/v6 by this push: new 5b6f4ecf doc(scatter): add jitter apache/echarts#19941 5b6f4ecf is described below commit 5b6f4ecf9d195c03adf87b45e3926a58f0d10ea8 Author: Ovilia AuthorDate: Fri May 17 14:55:53 2024 +0800 doc(scatter): add jitter apache/echarts#19941 --- en/option/component/axis-common.md | 4 zh/option/component/axis-common.md | 4 2 files changed, 8 insertions(+) diff --git a/en/option/component/axis-common.md b/en/option/component/axis-common.md index 0462773e..2ecd84a4 100644 --- a/en/option/component/axis-common.md +++ b/en/option/component/axis-common.md @@ -25,6 +25,10 @@ Parameters of the event include: } ``` +#${prefix} jitter(number) = 0 + +To prevent data points from overlapping in scatter plots, a small amount of random noise is added to the positions of the data points. This helps to visualize the distribution of the data more clearly. It is only applicable to scatter plots and is effective only in single-axis or category axes in Cartesian coordinate systems. The unit is in pixels. + #${prefix} axisLine(Object) Settings related to axis line. diff --git a/zh/option/component/axis-common.md b/zh/option/component/axis-common.md index bc76b640..8addbcc3 100644 --- a/zh/option/component/axis-common.md +++ b/zh/option/component/axis-common.md @@ -23,6 +23,10 @@ } ``` +#${prefix} jitter(number) = 0 + +用于在散点图中防止数据点重叠,通过在数据点的位置上添加少量随机噪音来实现,可以帮助更清晰地可视化数据的分布。仅适用于散点图,且仅在单轴或笛卡尔坐标系下的类目轴中有效。单位是像素。 + #${prefix} axisLine(Object) 坐标轴轴线相关设置。 - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-examples) 01/01: doc(jitter): example of jittering scatter apache/echarts#19941
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat-jitter in repository https://gitbox.apache.org/repos/asf/echarts-examples.git commit ce54447ceb4957410f5d4933cbf79a8a0939d74b Author: Ovilia AuthorDate: Mon May 20 17:15:15 2024 +0800 doc(jitter): example of jittering scatter apache/echarts#19941 --- public/data/thumb-dark/scatter-jitter.png | Bin 0 -> 247506 bytes public/data/thumb-dark/scatter-jitter.webp | Bin 0 -> 25640 bytes public/data/thumb/scatter-jitter.png | Bin 0 -> 201889 bytes public/data/thumb/scatter-jitter.webp | Bin 0 -> 18320 bytes public/examples/ts/scatter-jitter.ts | 45 + src/data/chart-list-data.js| 11 +++ 6 files changed, 56 insertions(+) diff --git a/public/data/thumb-dark/scatter-jitter.png b/public/data/thumb-dark/scatter-jitter.png new file mode 100644 index ..4835378d Binary files /dev/null and b/public/data/thumb-dark/scatter-jitter.png differ diff --git a/public/data/thumb-dark/scatter-jitter.webp b/public/data/thumb-dark/scatter-jitter.webp new file mode 100644 index ..3cfaed80 Binary files /dev/null and b/public/data/thumb-dark/scatter-jitter.webp differ diff --git a/public/data/thumb/scatter-jitter.png b/public/data/thumb/scatter-jitter.png new file mode 100644 index ..94c735c1 Binary files /dev/null and b/public/data/thumb/scatter-jitter.png differ diff --git a/public/data/thumb/scatter-jitter.webp b/public/data/thumb/scatter-jitter.webp new file mode 100644 index ..46abf01d Binary files /dev/null and b/public/data/thumb/scatter-jitter.webp differ diff --git a/public/examples/ts/scatter-jitter.ts b/public/examples/ts/scatter-jitter.ts new file mode 100644 index ..aa78170c --- /dev/null +++ b/public/examples/ts/scatter-jitter.ts @@ -0,0 +1,45 @@ +/* +title: Scatter with Jittering +category: scatter +titleCN: 带抖动的散点图 +difficulty: 3 +*/ +const grid = { + left: 80, + right: 50 +}; +const width = myChart.getWidth() - grid.left - grid.right; +const data = []; +for (let day = 0; day < 7; ++day) { + for (let i = 0; i < 1000; ++i) { +const y = Math.tan(i) / 2 + 7; +data.push([day, y, Math.random()]); + } +} +option = { + title: { +text: 'Scatter with Jittering' + }, + grid, + xAxis: { +type: 'category', +jitter: (width / 7) * 0.8, +data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + }, + yAxis: { +type: 'value', +max: 10, +min: 0 + }, + series: [ +{ + name: 'Sleeping Hours', + type: 'scatter', + data, + colorBy: 'data', + itemStyle: { +opacity: 0.4 + } +} + ] +}; diff --git a/src/data/chart-list-data.js b/src/data/chart-list-data.js index 7ba34642..5244bb8b 100644 --- a/src/data/chart-list-data.js +++ b/src/data/chart-list-data.js @@ -1202,6 +1202,17 @@ export default [ "titleCN": "桑基图右对齐布局", "difficulty": 3 }, + { +"category": [ + "scatter" +], +"id": "scatter-jitter", +"ts": true, +"tags": [], +"title": "Scatter with Jittering", +"titleCN": "带抖动的散点图", +"difficulty": 3 + }, { "category": [ "scatter" - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-examples) branch feat-jitter created (now ce54447c)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-jitter in repository https://gitbox.apache.org/repos/asf/echarts-examples.git at ce54447c doc(jitter): example of jittering scatter apache/echarts#19941 This branch includes the following new commits: new ce54447c doc(jitter): example of jittering scatter apache/echarts#19941 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 v6 updated: doc(scatter): add jitter apache/echarts#19941
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts-doc.git The following commit(s) were added to refs/heads/v6 by this push: new 44754dd8 doc(scatter): add jitter apache/echarts#19941 44754dd8 is described below commit 44754dd8d1abb1324f991345089c5a453b44f0d2 Author: Ovilia AuthorDate: Mon May 20 17:23:19 2024 +0800 doc(scatter): add jitter apache/echarts#19941 --- en/option/component/axis-common.md | 2 ++ zh/option/component/axis-common.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/en/option/component/axis-common.md b/en/option/component/axis-common.md index 2ecd84a4..5a009576 100644 --- a/en/option/component/axis-common.md +++ b/en/option/component/axis-common.md @@ -29,6 +29,8 @@ Parameters of the event include: To prevent data points from overlapping in scatter plots, a small amount of random noise is added to the positions of the data points. This helps to visualize the distribution of the data more clearly. It is only applicable to scatter plots and is effective only in single-axis or category axes in Cartesian coordinate systems. The unit is in pixels. +~[600x400](${galleryViewPath}scatter-jitter&edit=1&reset=1) + #${prefix} axisLine(Object) Settings related to axis line. diff --git a/zh/option/component/axis-common.md b/zh/option/component/axis-common.md index 8addbcc3..eb54306f 100644 --- a/zh/option/component/axis-common.md +++ b/zh/option/component/axis-common.md @@ -27,6 +27,8 @@ 用于在散点图中防止数据点重叠,通过在数据点的位置上添加少量随机噪音来实现,可以帮助更清晰地可视化数据的分布。仅适用于散点图,且仅在单轴或笛卡尔坐标系下的类目轴中有效。单位是像素。 +~[600x400](${galleryViewPath}scatter-jitter&edit=1&reset=1) + #${prefix} axisLine(Object) 坐标轴轴线相关设置。 - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (75dd430d7 -> a4db0d4f7)
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 75dd430d7 Merge pull request #19763 from deftliang/fix-sankey-radius add aaa2a48b9 feat: barSeries.startValue added add 7eae8148b extra testcases added add 323eca770 feat: rewrite changes to make dataZoom work add f74ede1e6 fix: fix the build bug caused by changes add 0d3a28962 fix: fix the build bug caused by changes add 0e862ce71 Merge branch 'issue#17077' of https://github.com/jiawulin001/echarts into issue#17077 new a4db0d4f7 Merge pull request #17078 from jiawulin001/issue#17077 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 | 2 + src/coord/axisCommonTypes.ts| 1 + src/coord/scaleRawExtentInfo.ts | 6 +- src/layout/barGrid.ts | 19 ++-- src/layout/barPolar.ts | 6 +- test/bar-startValue.html| 225 6 files changed, 251 insertions(+), 8 deletions(-) create mode 100644 test/bar-startValue.html - 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 #17078 from jiawulin001/issue#17077
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 a4db0d4f7f87e73ac20a322ee586f9ac5e8618ba Merge: 75dd430d7 0e862ce71 Author: Wenli Zhang AuthorDate: Tue May 21 16:42:09 2024 +0800 Merge pull request #17078 from jiawulin001/issue#17077 feat: barSeries.startValue added src/chart/bar/BarSeries.ts | 2 + src/coord/axisCommonTypes.ts| 1 + src/coord/scaleRawExtentInfo.ts | 6 +- src/layout/barGrid.ts | 19 ++-- src/layout/barPolar.ts | 6 +- test/bar-startValue.html| 225 6 files changed, 251 insertions(+), 8 deletions(-) diff --cc src/coord/scaleRawExtentInfo.ts index 52f6b8d06,6a0541306..78c29cc0c --- a/src/coord/scaleRawExtentInfo.ts +++ b/src/coord/scaleRawExtentInfo.ts @@@ -98,9 -98,13 +98,13 @@@ export class ScaleRawExtentInfo const isOrdinal = this._isOrdinal = scale.type === 'ordinal'; this._needCrossZero = scale.type === 'interval' && model.getNeedCrossZero && model.getNeedCrossZero(); - const modelMinRaw = this._modelMinRaw = model.get('min', true); + let axisMinValue = model.get('min', true); + if (axisMinValue == null) { + axisMinValue = model.get('startValue', true); + } + const modelMinRaw = this._modelMinRaw = axisMinValue; if (isFunction(modelMinRaw)) { -// This callback alway provide users the full data extent (before data filtered). +// This callback always provides users the full data extent (before data is filtered). this._modelMinNum = parseAxisModelMinMax(scale, modelMinRaw({ min: dataExtent[0], max: dataExtent[1] - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-scatter updated (ecfe5832d -> ef777eb4e)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-scatter in repository https://gitbox.apache.org/repos/asf/echarts.git from ecfe5832d feat(scatter): support jitter for scatters #18432 add 1ccceac62 feat(jitter): support overlapping API add ae6f8bd77 test(jitter): support overlapping API add ef777eb4e feat(jitter): support beeswarm-like jitter No new revisions were added by this update. Summary of changes: src/chart/helper/SymbolDraw.ts | 41 +++- src/coord/axisCommonTypes.ts | 2 + src/coord/axisDefault.ts | 2 + src/coord/cartesian/Cartesian2D.ts | 20 +- src/coord/single/AxisModel.ts | 6 +- src/coord/single/Single.ts | 6 - src/util/jitter.ts | 128 ++ test/{build/mktest-tpl.html => at.html}| 47 ++-- test/bar-stack-minHeight.html | 206 .../{build/mktest-tpl.html => label-emphasis.html} | 42 ++-- test/{pie-case.html => legend-emphasis.html} | 45 ++-- ...-line-cap.html => line-stack-connectNulls.html} | 38 +-- test/{label-ellipsis.html => radar-zero.html} | 69 +++--- test/scatter-jitter.html | 51 +++- test/tmp-bug-svg.html | 267 + test/treemap-option-label-position-with-rich.html | 95 16 files changed, 932 insertions(+), 133 deletions(-) create mode 100644 src/util/jitter.ts copy test/{build/mktest-tpl.html => at.html} (70%) create mode 100644 test/bar-stack-minHeight.html copy test/{build/mktest-tpl.html => label-emphasis.html} (72%) copy test/{pie-case.html => legend-emphasis.html} (68%) copy test/{clip-line-cap.html => line-stack-connectNulls.html} (69%) copy test/{label-ellipsis.html => radar-zero.html} (59%) create mode 100644 test/tmp-bug-svg.html create mode 100644 test/treemap-option-label-position-with-rich.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-scatter updated (ef777eb4e -> b58178999)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-scatter in repository https://gitbox.apache.org/repos/asf/echarts.git from ef777eb4e feat(jitter): support beeswarm-like jitter add b58178999 feat(jitter): support beeswarm-like jitter No new revisions were added by this update. Summary of changes: src/chart/helper/SymbolDraw.ts| 13 +- src/coord/cartesian/Cartesian2D.ts| 1 - src/coord/single/Single.ts| 1 - src/util/jitter.ts| 1 + test/at.html | 95 --- test/bar-stack-minHeight.html | 206 --- test/label-emphasis.html | 90 --- test/legend-emphasis.html | 99 test/line-stack-connectNulls.html | 103 test/radar-zero.html | 117 - test/scatter-jitter.html | 291 +++--- test/tmp-bug-svg.html | 267 test/treemap-option-label-position-with-rich.html | 95 --- 13 files changed, 268 insertions(+), deletions(-) delete mode 100644 test/at.html delete mode 100644 test/bar-stack-minHeight.html delete mode 100644 test/label-emphasis.html delete mode 100644 test/legend-emphasis.html delete mode 100644 test/line-stack-connectNulls.html delete mode 100644 test/radar-zero.html delete mode 100644 test/tmp-bug-svg.html delete mode 100644 test/treemap-option-label-position-with-rich.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-scatter updated (b58178999 -> 52f5ef46b)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-scatter in repository https://gitbox.apache.org/repos/asf/echarts.git from b58178999 feat(jitter): support beeswarm-like jitter add 52f5ef46b feat(jitter): fix lint and unit test No new revisions were added by this update. Summary of changes: src/chart/helper/SymbolDraw.ts | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-matrix updated (ab3efd315 -> 6fe5d6991)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts.git from ab3efd315 fix(matrix): remove unnecessary field add 6fe5d6991 fix(matrix): improve code No new revisions were added by this update. Summary of changes: src/chart/heatmap/HeatmapView.ts | 2 +- src/component/matrix/MatrixView.ts | 116 - src/coord/matrix/MatrixDim.ts | 25 3 files changed, 77 insertions(+), 66 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-matrix updated (6fe5d6991 -> 31295e1e3)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-matrix in repository https://gitbox.apache.org/repos/asf/echarts.git from 6fe5d6991 fix(matrix): improve code add 31295e1e3 chore(matrix): update package.json No new revisions were added by this update. Summary of changes: package.json | 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 feat-scatter updated (52f5ef46b -> b95d3791b)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-scatter in repository https://gitbox.apache.org/repos/asf/echarts.git from 52f5ef46b feat(jitter): fix lint and unit test add b95d3791b refactor(jitter): fix import type No new revisions were added by this update. Summary of changes: src/chart/helper/SymbolDraw.ts | 4 ++-- src/util/jitter.ts | 8 2 files changed, 6 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 (a4db0d4f7 -> 4b2d52fd0)
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 a4db0d4f7 Merge pull request #17078 from jiawulin001/issue#17077 add 57b8c9752 feat(treemap): add scaleLimit to limit the zooming. close #14599 add 8921fec4b feat(treemap): add scaleLimit to limit the zooming. close #14599 add 9f1d4fb14 fix: prototype _onZoom not effect add 0c5d5e791 feat(treemap):remove coordinateSystem add 4f0bb6527 feat(treemap): add scaleLimit with controllerHost add b0f77e880 feat(treemap): onZoom without controllerHost add 4dbfcfaa5 fix: custom onZoom add 91680313c feat(treemap): reset zoom when chart restore new 4b2d52fd0 Merge pull request #18304 from liuyizhou/fix-14599 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/treemap/TreemapSeries.ts | 8 ++ src/chart/treemap/TreemapView.ts | 43 - test/treemap-scaleLimit.html | 181 + 3 files changed, 230 insertions(+), 2 deletions(-) create mode 100644 test/treemap-scaleLimit.html - 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 #18304 from liuyizhou/fix-14599
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 4b2d52fd0f5732a6d97b3b808d592982f4138781 Merge: a4db0d4f7 91680313c Author: Wenli Zhang AuthorDate: Tue Jun 11 18:09:42 2024 +0800 Merge pull request #18304 from liuyizhou/fix-14599 feat(treemap): add scaleLimit to limit the zooming. close #14599 src/chart/treemap/TreemapSeries.ts | 8 ++ src/chart/treemap/TreemapView.ts | 43 - test/treemap-scaleLimit.html | 181 + 3 files changed, 230 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/01: test(treemap): update test case for #18304
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat-treemap-test in repository https://gitbox.apache.org/repos/asf/echarts.git commit 7faa2e17604e2bd7321d3d67cd5cbf1df7a3b565 Author: Ovilia AuthorDate: Tue Jun 11 18:14:31 2024 +0800 test(treemap): update test case for #18304 --- test/treemap-scaleLimit.html | 20 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/treemap-scaleLimit.html b/test/treemap-scaleLimit.html index e766cd02d..4ad5d7890 100644 --- a/test/treemap-scaleLimit.html +++ b/test/treemap-scaleLimit.html @@ -37,23 +37,23 @@ under the License. height: 50%; } - + scaleLimit: { max: 1, min: 0.5 } - + require([ 'echarts' ], function (echarts) { - + var chart = echarts.init(document.getElementById('main1'), null, { - + }); - + chart.setOption({ - + series: [ { name: '矩形树图scaleLimit', @@ -146,10 +146,14 @@ under the License. } ] }); - + var chart1 = echarts.init(document.getElementById('main2')); option = { series: [{ +scaleLimit: { +max: 3, +min: 0.8 +}, emphasis: { label: { show: true, @@ -175,7 +179,7 @@ under the License. chart1.setOption(option); }); - + - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-treemap-test created (now 7faa2e176)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-treemap-test in repository https://gitbox.apache.org/repos/asf/echarts.git at 7faa2e176 test(treemap): update test case for #18304 This branch includes the following new commits: new 7faa2e176 test(treemap): update test case for #18304 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 feat-treemap-test updated (7faa2e176 -> 0ee94981f)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-treemap-test in repository https://gitbox.apache.org/repos/asf/echarts.git from 7faa2e176 test(treemap): update test case for #18304 add 0ee94981f test(treemap): record test visual action for #18304 No new revisions were added by this update. Summary of changes: test/runTest/actions/__meta__.json | 1 + test/runTest/actions/treemap-scaleLimit.json | 1 + 2 files changed, 2 insertions(+) create mode 100644 test/runTest/actions/treemap-scaleLimit.json - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (4b2d52fd0 -> b61f6c028)
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 4b2d52fd0 Merge pull request #18304 from liuyizhou/fix-14599 add 71541f85a fix: In users' .d.ts `import('echarts/types/dist/shared')` can not visit `'echarts/types/dist/shared.d.ts'` since v5.5.0. Fix it. Fix #19663. add a20948618 Merge branch 'master' into fix/ts-type-visibility new b61f6c028 Merge pull request #20030 from apache/fix/ts-type-visibility 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: package.README.md | 5 - package.json | 8 2 files changed, 12 insertions(+), 1 deletion(-) - 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 #20030 from apache/fix/ts-type-visibility
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 b61f6c0288bdaf45e619319b2716b982a4257136 Merge: 4b2d52fd0 a20948618 Author: Wenli Zhang AuthorDate: Fri Jun 14 13:41:43 2024 +0800 Merge pull request #20030 from apache/fix/ts-type-visibility Fix that in users' .d.ts `import('echarts/types/dist/shared')` can not visit `'echarts/types/dist/shared.d.ts'` since v5.5.0 package.README.md | 5 - package.json | 8 2 files changed, 12 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/ts-type-visibility deleted (was a20948618)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix/ts-type-visibility in repository https://gitbox.apache.org/repos/asf/echarts.git was a20948618 Merge branch 'master' into fix/ts-type-visibility The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - 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 #20051 from apache/wokflow-deps
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 40c2870d337316f1fba8429fb3d3a1990791eafb Merge: a2824713a 562889eed Author: Wenli Zhang AuthorDate: Thu Jun 20 14:36:11 2024 +0800 Merge pull request #20051 from apache/wokflow-deps chore(workflow): use forked workflow deps for timely update .github/workflows/pr-preview.yml | 7 +++ .github/workflows/teardown-pr-preview.yml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (a2824713a -> 40c2870d3)
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 a2824713a Merge pull request #19919 from apache/dvdkon-fix-13627 add 562889eed chore(workflow): use forked workflow deps for timely update & fix typo new 40c2870d3 Merge pull request #20051 from apache/wokflow-deps 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: .github/workflows/pr-preview.yml | 7 +++ .github/workflows/teardown-pr-preview.yml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch wokflow-deps deleted (was 562889eed)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch wokflow-deps in repository https://gitbox.apache.org/repos/asf/echarts.git was 562889eed chore(workflow): use forked workflow deps for timely update & fix typo The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix-16565 deleted (was d09d65ba8)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-16565 in repository https://gitbox.apache.org/repos/asf/echarts.git was d09d65ba8 WIP(bar): fix barMinHeight for stacked bars The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (40c2870d3 -> 32eeb07c7)
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 40c2870d3 Merge pull request #20051 from apache/wokflow-deps add d3d974f7c feat: add role region to div tag when aria: true add b15b918b1 fix: change ARIA role from region to img for accessibility add 64539fed9 refactor: move dom.setAttribute('role', 'img') to reduce duplication new 32eeb07c7 Merge pull request #20050 from ViniciusCestarii/aria-role 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/visual/aria.ts | 2 ++ 1 file changed, 2 insertions(+) - 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 #20050 from ViniciusCestarii/aria-role
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 32eeb07c7a5eaf08c991da875568d53f9d6d2485 Merge: 40c2870d3 64539fed9 Author: Wenli Zhang AuthorDate: Mon Jun 24 10:48:55 2024 +0800 Merge pull request #20050 from ViniciusCestarii/aria-role feat: add role region to div tag when aria: true src/visual/aria.ts | 2 ++ 1 file changed, 2 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/02: feat(dataZoom): handle labels can be configured when to show #19676
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat-dataZoom-label-show in repository https://gitbox.apache.org/repos/asf/echarts.git commit 70f0b5a580347685d8a903c83fac5e910a9d083b Author: Ovilia AuthorDate: Wed Jun 26 18:31:44 2024 +0800 feat(dataZoom): handle labels can be configured when to show #19676 --- src/component/dataZoom/SliderZoomModel.ts | 5 + src/component/dataZoom/SliderZoomView.ts | 22 ++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/component/dataZoom/SliderZoomModel.ts b/src/component/dataZoom/SliderZoomModel.ts index a6d051e1b..26d755fe3 100644 --- a/src/component/dataZoom/SliderZoomModel.ts +++ b/src/component/dataZoom/SliderZoomModel.ts @@ -79,6 +79,8 @@ export interface SliderDataZoomOption extends DataZoomOption, BoxLayoutOptionMix handleIcon?: string +handleLabelShow?: boolean + /** * number: height of icon. width will be calculated according to the aspect of icon. * string: percent of the slider height. width will be calculated according to the aspect of icon. @@ -117,6 +119,7 @@ export interface SliderDataZoomOption extends DataZoomOption, BoxLayoutOptionMix brushStyle?: ItemStyleOption emphasis?: { +handleLabelShow?: boolean handleStyle?: ItemStyleOption moveHandleStyle?: ItemStyleOption } @@ -171,6 +174,7 @@ class SliderZoomModel extends DataZoomModel { // Color of selected window. fillerColor: 'rgba(135,175,274,0.2)', handleIcon: 'path://M-9.35,34.56V42m0-40V9.5m-2,0h4a2,2,0,0,1,2,2v21a2,2,0,0,1-2,2h-4a2,2,0,0,1-2-2v-21A2,2,0,0,1-11.35,9.5Z', +handleLabelShow: false, // Percent of the slider height handleSize: '100%', @@ -201,6 +205,7 @@ class SliderZoomModel extends DataZoomModel { }, emphasis: { +handleLabelShow: true, handleStyle: { borderColor: '#8FB0F7' }, diff --git a/src/component/dataZoom/SliderZoomView.ts b/src/component/dataZoom/SliderZoomView.ts index a6545fdb3..cf3908b90 100644 --- a/src/component/dataZoom/SliderZoomView.ts +++ b/src/component/dataZoom/SliderZoomView.ts @@ -619,11 +619,12 @@ class SliderZoomView extends DataZoomView { sliderGroup.add(handles[handleIndex] = path); const textStyleModel = dataZoomModel.getModel('textStyle'); +const handleLabelShow = dataZoomModel.get('handleLabelShow'); thisGroup.add( handleLabels[handleIndex] = new graphic.Text({ silent: true, -invisible: true, +invisible: !handleLabelShow, style: createTextStyle(textStyleModel, { x: 0, y: 0, text: '', verticalAlign: 'middle', @@ -885,19 +886,24 @@ class SliderZoomView extends DataZoomView { } /** - * @param showOrHide true: show, false: hide + * @param isEmphasis true: show, false: hide */ -private _showDataInfo(showOrHide?: boolean) { -// Always show when drgging. -showOrHide = this._dragging || showOrHide; +private _showDataInfo(isEmphasis?: boolean) { +const normalShow = this.dataZoomModel.get('handleLabelShow'); +const emphasisShow = this.dataZoomModel.getModel('emphasis') +.get('handleLabelShow'); +// Dragging is considered as emphasis +const toShow = isEmphasis +? (emphasisShow || this._dragging) +: normalShow; const displayables = this._displayables; const handleLabels = displayables.handleLabels; -handleLabels[0].attr('invisible', !showOrHide); -handleLabels[1].attr('invisible', !showOrHide); +handleLabels[0].attr('invisible', !toShow); +handleLabels[1].attr('invisible', !toShow); // Highlight move handle displayables.moveHandle -&& this.api[showOrHide ? 'enterEmphasis' : 'leaveEmphasis'](displayables.moveHandle, 1); +&& this.api[toShow ? 'enterEmphasis' : 'leaveEmphasis'](displayables.moveHandle, 1); } private _onDragMove(handleIndex: 0 | 1 | 'all', dx: number, dy: number, event: ZRElementEvent) { - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 02/02: test(dataZoom): add test cases
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat-dataZoom-label-show in repository https://gitbox.apache.org/repos/asf/echarts.git commit dd5d624cd9131b6281542a4b92461820f246b108 Author: Ovilia AuthorDate: Thu Jun 27 15:38:59 2024 +0800 test(dataZoom): add test cases --- src/component/dataZoom/SliderZoomView.ts | 6 +- test/dataZoom-handleLabelShow.html | 208 +++ 2 files changed, 211 insertions(+), 3 deletions(-) diff --git a/src/component/dataZoom/SliderZoomView.ts b/src/component/dataZoom/SliderZoomView.ts index cf3908b90..5647ffdeb 100644 --- a/src/component/dataZoom/SliderZoomView.ts +++ b/src/component/dataZoom/SliderZoomView.ts @@ -892,9 +892,9 @@ class SliderZoomView extends DataZoomView { const normalShow = this.dataZoomModel.get('handleLabelShow'); const emphasisShow = this.dataZoomModel.getModel('emphasis') .get('handleLabelShow'); -// Dragging is considered as emphasis -const toShow = isEmphasis -? (emphasisShow || this._dragging) +// Dragging is considered as emphasis, unless emphasisShow is false +const toShow = (isEmphasis || this._dragging) +? emphasisShow : normalShow; const displayables = this._displayables; const handleLabels = displayables.handleLabels; diff --git a/test/dataZoom-handleLabelShow.html b/test/dataZoom-handleLabelShow.html new file mode 100644 index 0..2454c5a37 --- /dev/null +++ b/test/dataZoom-handleLabelShow.html @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +require([ +'echarts', +// 'map/js/china', +// './data/nutrients.json' +], function (echarts) { +var option; + +option = { +xAxis: {}, +yAxis: {}, +series: { +type: 'line', +data: [[11, 22], [33, 44]] +}, +dataZoom: [{ +type: 'slider', +handleLabelShow: true +}, { +type: 'slider', +yAxisIndex: 0, +handleLabelShow: true, +right: 30 +}] +}; + +var chart = testHelper.create(echarts, 'main0', { +title: [ +'handleLabelShow: true, (emphasis.handleLabelShow: true)', +'Always show the handle label.' +], +option: option +}); +}); + + + +require([ +'echarts', +// 'map/js/china', +// './data/nutrients.json' +], function (echarts) { +var option; + +option = { +xAxis: {}, +yAxis: {}, +series: { +type: 'line', +data: [[11, 22], [33, 44]] +}, +dataZoom: [{ +type: 'slider', +handleLabelShow: true, +emphasis: { +handleLabelShow: false +}, +}, { +type: 'slider', +yAxisIndex: 0, +handleLabelShow: true, +emphasis: { +handleLabelShow: false +}, +right: 30 +}] +}; + +var chart = testHelper.create(echarts, 'main1', { +title: [ +'handleLabelShow: true, emphasis.handleLabelShow: false', +'Hide the handle label when mouse over, which may be useful to hide information when dragging so that user is more focused.' +], +option: option +}); +}); + + + + +require([ +'echarts', +// 'map/js/china', +// './data/nutrients.json' +], function (echarts) { +var option; + +option = { +xAxis: {}, +yAxis: {}, +series: { +type: 'line', +data: [[11, 22], [33, 44]] +}, +dataZoom: [{ +type: 'slider', +handleLabelShow: false, +}, { +type: 'slider', +yAxisIndex: 0, +handleLabelShow: false, +right: 30 +}] +}; + +var chart = testHelper.create(echarts, 'main2', { +title: [ +'h
(echarts) branch feat-dataZoom-label-show created (now dd5d624cd)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-dataZoom-label-show in repository https://gitbox.apache.org/repos/asf/echarts.git at dd5d624cd test(dataZoom): add test cases This branch includes the following new commits: new 70f0b5a58 feat(dataZoom): handle labels can be configured when to show #19676 new dd5d624cd test(dataZoom): add test cases 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) branch feat-step created (now 05ac7dd6e)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-step in repository https://gitbox.apache.org/repos/asf/echarts.git at 05ac7dd6e fix(line): step areaStyle bug #20021 This branch includes the following new commits: new 05ac7dd6e fix(line): step areaStyle bug #20021 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: fix(line): step areaStyle bug #20021
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat-step in repository https://gitbox.apache.org/repos/asf/echarts.git commit 05ac7dd6efb7b7a512735552a90ba76fe9513508 Author: Ovilia AuthorDate: Fri Jun 28 10:43:15 2024 +0800 fix(line): step areaStyle bug #20021 --- src/chart/line/LineView.ts | 50 + test/line-step.html| 105 + 2 files changed, 138 insertions(+), 17 deletions(-) diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts index 9672eb720..21f8e4367 100644 --- a/src/chart/line/LineView.ts +++ b/src/chart/line/LineView.ts @@ -147,8 +147,19 @@ function getStackedOnPoints( return points; } +/** + * Filter the null data and extend data for step considering `stepTurnAt` + * + * @param points data to convert, that may containing null + * @param basePoints base data to reference, used only for areaStyle points + * @param coordSys coordinate system + * @param stepTurnAt 'start' | 'end' | 'middle' | true + * @param connectNulls whether to connect nulls + * @returns converted point positions + */ function turnPointsIntoStep( points: ArrayLike, +basePoints: ArrayLike | null, coordSys: Cartesian2D | Polar, stepTurnAt: 'start' | 'end' | 'middle', connectNulls: boolean @@ -163,12 +174,18 @@ function turnPointsIntoStep( const nextPt: number[] = []; const filteredPoints = []; if (connectNulls) { - for (i = 0; i < points.length; i += 2) { - if (!isNaN(points[i]) && !isNaN(points[i + 1])) { - filteredPoints.push(points[i], points[i + 1]); - } - } - points = filteredPoints; +for (i = 0; i < points.length; i += 2) { +/** + * For areaStyle of stepped lines, `stackedOnPoints` should be + * filtered the same as `points` so that the base axis values + * should stay the same as the lines above. See #20021 + */ +const reference = basePoints || points; +if (!isNaN(reference[i]) && !isNaN(reference[i + 1])) { +filteredPoints.push(points[i], points[i + 1]); +} +} +points = filteredPoints; } for (i = 0; i < points.length - 2; i += 2) { nextPt[0] = points[i + 2]; @@ -717,12 +734,11 @@ class LineView extends ChartView { ); if (step) { -// TODO If stacked series is not step -points = turnPointsIntoStep(points, coordSys, step, connectNulls); - if (stackedOnPoints) { -stackedOnPoints = turnPointsIntoStep(stackedOnPoints, coordSys, step, connectNulls); +stackedOnPoints = turnPointsIntoStep(stackedOnPoints, points, coordSys, step, connectNulls); } +// TODO If stacked series is not step +points = turnPointsIntoStep(points, null, coordSys, step, connectNulls); } polyline = this._newPolyline(points); @@ -801,11 +817,11 @@ class LineView extends ChartView { else { // Not do it in update with animation if (step) { -// TODO If stacked series is not step -points = turnPointsIntoStep(points, coordSys, step, connectNulls); if (stackedOnPoints) { -stackedOnPoints = turnPointsIntoStep(stackedOnPoints, coordSys, step, connectNulls); +stackedOnPoints = turnPointsIntoStep(stackedOnPoints, points, coordSys, step, connectNulls); } +// TODO If stacked series is not step +points = turnPointsIntoStep(points, null, coordSys, step, connectNulls); } polyline.setShape({ @@ -1337,10 +1353,10 @@ class LineView extends ChartView { let stackedOnNext = diff.stackedOnNext; if (step) { // TODO If stacked series is not step -current = turnPointsIntoStep(diff.current, coordSys, step, connectNulls); -stackedOnCurrent = turnPointsIntoStep(diff.stackedOnCurrent, coordSys, step, connectNulls); -next = turnPointsIntoStep(diff.next, coordSys, step, connectNulls); -stackedOnNext = turnPointsIntoStep(diff.stackedOnNext, coordSys, step, connectNulls); +stackedOnCurrent = turnPointsIntoStep(diff.stackedOnCurrent, diff.current, coordSys, step, connectNulls); +current = turnPointsIntoStep(diff.current, null, coordSys, step, connectNulls); +stackedOnNext = turnPointsIntoStep(diff.stackedOnNext, diff.next, coordSys, step, connectNulls); +next = turnPointsIntoStep(diff.next,
(echarts) branch master updated: fix(custom): grid area clipping in custom series #19993 (#20043)
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 369cb0350 fix(custom): grid area clipping in custom series #19993 (#20043) 369cb0350 is described below commit 369cb035030124e0c1fe2c74a882781c0e90a556 Author: fandi-1205 <141796004+fandi-1...@users.noreply.github.com> AuthorDate: Fri Jun 28 15:29:41 2024 +0800 fix(custom): grid area clipping in custom series #19993 (#20043) --- src/chart/helper/createClipPathFromCoordSys.ts | 2 +- test/clip-custom.html | 127 + 2 files changed, 128 insertions(+), 1 deletion(-) diff --git a/src/chart/helper/createClipPathFromCoordSys.ts b/src/chart/helper/createClipPathFromCoordSys.ts index 74ec7f8e9..191ac95c6 100644 --- a/src/chart/helper/createClipPathFromCoordSys.ts +++ b/src/chart/helper/createClipPathFromCoordSys.ts @@ -43,7 +43,7 @@ function createGridClipPath( let width = rect.width; let height = rect.height; -const lineWidth = seriesModel.get(['lineStyle', 'width']) || 2; +const lineWidth = seriesModel.get(['lineStyle', 'width']) || 0; // Expand the clip path a bit to avoid the border is clipped and looks thinner x -= lineWidth / 2; y -= lineWidth / 2; diff --git a/test/clip-custom.html b/test/clip-custom.html new file mode 100644 index 0..3e32aab73 --- /dev/null +++ b/test/clip-custom.html @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +require([ +'echarts', +// 'map/js/china', +// './data/nutrients.json' +], function (echarts) { +var option; + +const data = [ +[-10, 100, 20, 'A'], +]; + +option = { +xAxis: { +min: 0, +max: 10, +axisLine: { +lineStyle: { +width: '1', +}, +}, + + +}, +yAxis: { +scale: true, +min: 0, +max: 10, +axisLine: { +lineStyle: { +width: '1', +}, +}, +}, +series: [ +{ +type: 'custom', +clip: true, // CLIP = true +renderItem: function (params, api) { +var yValue = api.value(2); +var start = api.coord([api.value(0), yValue]); +var size = api.size([api.value(1) - api.value(0), yValue]); +var style = api.style(); +return { +type: 'rect', +shape: { +x: start[0], +y: start[1], +width: size[0], +height: size[1], +}, +style: { +fill: '#4f81bd', +opacity: 0.5 +} +}; +}, +data: data +} +] +}; + + + +var chart = testHelper.create(echarts, 'main0', { +title: [ +'Clipping in custom series off by 1 pixel', +'In the case of customization, modify the range of the clipping path', + +], +option: option + +}); +}); + + + + + + \ No newline at end of file - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch v6 updated (a861bef15 -> 114df2836)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts.git from a861bef15 Merge pull request #19937 from apache/master add aaa2a48b9 feat: barSeries.startValue added add 7eae8148b extra testcases added add 323eca770 feat: rewrite changes to make dataZoom work add f74ede1e6 fix: fix the build bug caused by changes add 0d3a28962 fix: fix the build bug caused by changes add 0e862ce71 Merge branch 'issue#17077' of https://github.com/jiawulin001/echarts into issue#17077 add a4db0d4f7 Merge pull request #17078 from jiawulin001/issue#17077 add 71541f85a fix: In users' .d.ts `import('echarts/types/dist/shared')` can not visit `'echarts/types/dist/shared.d.ts'` since v5.5.0. Fix it. Fix #19663. add 57b8c9752 feat(treemap): add scaleLimit to limit the zooming. close #14599 add 8921fec4b feat(treemap): add scaleLimit to limit the zooming. close #14599 add 9f1d4fb14 fix: prototype _onZoom not effect add 0c5d5e791 feat(treemap):remove coordinateSystem add 4f0bb6527 feat(treemap): add scaleLimit with controllerHost add b0f77e880 feat(treemap): onZoom without controllerHost add 4dbfcfaa5 fix: custom onZoom add 91680313c feat(treemap): reset zoom when chart restore add 4b2d52fd0 Merge pull request #18304 from liuyizhou/fix-14599 add a20948618 Merge branch 'master' into fix/ts-type-visibility add b61f6c028 Merge pull request #20030 from apache/fix/ts-type-visibility add 7faa2e176 test(treemap): update test case for #18304 add 0ee94981f test(treemap): record test visual action for #18304 add 0ab5f7264 Merge pull request #20020 from apache/feat-treemap-test add 0c013fe71 feat(axis): custom axis tick/label positions. close #13627 add 952fa4523 chore: merge add 0c908241d fix: fix failed test cases and improve code add a2824713a Merge pull request #19919 from apache/dvdkon-fix-13627 add 562889eed chore(workflow): use forked workflow deps for timely update & fix typo add 40c2870d3 Merge pull request #20051 from apache/wokflow-deps add d3d974f7c feat: add role region to div tag when aria: true add b15b918b1 fix: change ARIA role from region to img for accessibility add 64539fed9 refactor: move dom.setAttribute('role', 'img') to reduce duplication add 32eeb07c7 Merge pull request #20050 from ViniciusCestarii/aria-role add 955762035 Merge pull request #20037 from apache/master add ca9ed741e chore: release 5.6.0 add 486f24f6d change version from 5.6.0 to 5.5.1 add 4c015dd9f chore(deps-dev): bump ws from 7.5.7 to 7.5.10 add 9d2bab0ea Merge pull request #20044 from apache/dependabot/npm_and_yarn/ws-7.5.10 add ad947d661 fix(tooltip): fix tooltip XSS issue when legend name is HTML string add c1727a65f refactor(tooltip): add `encodeHTMLContent` option to specify whether the content should be encoded by default add 62210761d test(tooltip): update test case for tooltip xss add efa3e5a8e Merge pull request #20045 from apache/fix/tooltip-xss add 34889d934 build release add 2caf68489 Merge pull request #20039 from apache/release-dev add a6d046302 Merge pull request #20084 from apache/release add 369cb0350 fix(custom): grid area clipping in custom series #19993 (#20043) new 114df2836 Merge pull request #20101 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: .github/workflows/pr-preview.yml | 7 +- .github/workflows/teardown-pr-preview.yml | 2 +- dist/echarts.common.js | 114 ++--- dist/echarts.common.js.map | 2 +- dist/echarts.common.min.js | 4 +- dist/echarts.esm.js| 157 ++--- dist/echarts.esm.js.map| 2 +- dist/echarts.esm.min.js| 4 +- dist/echarts.esm.min.mjs | 4 +- dist/echarts.esm.mjs | 157 ++--- dist/echarts.esm.mjs.map | 2 +- dist/echarts.js| 157 ++--- dist/echarts.js.map| 2 +- dist/echarts.min.js| 4 +- dist/echarts.simple.js | 90 -- dist/echarts.simple.js.map | 2 +- dist/echarts.simple.min.js | 4 +- package-lock.json | 30 ++-- package.README.md |
(echarts) branch next updated (a861bef15 -> fdf2e4dcc)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch next in repository https://gitbox.apache.org/repos/asf/echarts.git from a861bef15 Merge pull request #19937 from apache/master add aaa2a48b9 feat: barSeries.startValue added add 7eae8148b extra testcases added add 323eca770 feat: rewrite changes to make dataZoom work add f74ede1e6 fix: fix the build bug caused by changes add 0d3a28962 fix: fix the build bug caused by changes add 0e862ce71 Merge branch 'issue#17077' of https://github.com/jiawulin001/echarts into issue#17077 add a4db0d4f7 Merge pull request #17078 from jiawulin001/issue#17077 add 71541f85a fix: In users' .d.ts `import('echarts/types/dist/shared')` can not visit `'echarts/types/dist/shared.d.ts'` since v5.5.0. Fix it. Fix #19663. add 57b8c9752 feat(treemap): add scaleLimit to limit the zooming. close #14599 add 8921fec4b feat(treemap): add scaleLimit to limit the zooming. close #14599 add 9f1d4fb14 fix: prototype _onZoom not effect add 0c5d5e791 feat(treemap):remove coordinateSystem add 4f0bb6527 feat(treemap): add scaleLimit with controllerHost add b0f77e880 feat(treemap): onZoom without controllerHost add 4dbfcfaa5 fix: custom onZoom add 91680313c feat(treemap): reset zoom when chart restore add 4b2d52fd0 Merge pull request #18304 from liuyizhou/fix-14599 add a20948618 Merge branch 'master' into fix/ts-type-visibility add b61f6c028 Merge pull request #20030 from apache/fix/ts-type-visibility add 7faa2e176 test(treemap): update test case for #18304 add 0ee94981f test(treemap): record test visual action for #18304 add 0ab5f7264 Merge pull request #20020 from apache/feat-treemap-test add 0c013fe71 feat(axis): custom axis tick/label positions. close #13627 add 952fa4523 chore: merge add 0c908241d fix: fix failed test cases and improve code add a2824713a Merge pull request #19919 from apache/dvdkon-fix-13627 add 562889eed chore(workflow): use forked workflow deps for timely update & fix typo add 40c2870d3 Merge pull request #20051 from apache/wokflow-deps add d3d974f7c feat: add role region to div tag when aria: true add b15b918b1 fix: change ARIA role from region to img for accessibility add 64539fed9 refactor: move dom.setAttribute('role', 'img') to reduce duplication add 32eeb07c7 Merge pull request #20050 from ViniciusCestarii/aria-role add 955762035 Merge pull request #20037 from apache/master add ca9ed741e chore: release 5.6.0 add 486f24f6d change version from 5.6.0 to 5.5.1 add 4c015dd9f chore(deps-dev): bump ws from 7.5.7 to 7.5.10 add 9d2bab0ea Merge pull request #20044 from apache/dependabot/npm_and_yarn/ws-7.5.10 add ad947d661 fix(tooltip): fix tooltip XSS issue when legend name is HTML string add c1727a65f refactor(tooltip): add `encodeHTMLContent` option to specify whether the content should be encoded by default add 62210761d test(tooltip): update test case for tooltip xss add efa3e5a8e Merge pull request #20045 from apache/fix/tooltip-xss add 34889d934 build release add 2caf68489 Merge pull request #20039 from apache/release-dev add a6d046302 Merge pull request #20084 from apache/release add 369cb0350 fix(custom): grid area clipping in custom series #19993 (#20043) new fdf2e4dcc Merge pull request #20100 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: .github/workflows/pr-preview.yml | 7 +- .github/workflows/teardown-pr-preview.yml | 2 +- dist/echarts.common.js | 114 ++--- dist/echarts.common.js.map | 2 +- dist/echarts.common.min.js | 4 +- dist/echarts.esm.js| 157 ++--- dist/echarts.esm.js.map| 2 +- dist/echarts.esm.min.js| 4 +- dist/echarts.esm.min.mjs | 4 +- dist/echarts.esm.mjs | 157 ++--- dist/echarts.esm.mjs.map | 2 +- dist/echarts.js| 157 ++--- dist/echarts.js.map| 2 +- dist/echarts.min.js| 4 +- dist/echarts.simple.js | 90 -- dist/echarts.simple.js.map | 2 +- dist/echarts.simple.min.js | 4 +- package-lock.json | 30 ++-- package.README.md |
(echarts) 01/01: Merge pull request #20101 from apache/master
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts.git commit 114df2836bffb7fcf65ba92455e6ab3124c3d623 Merge: a861bef15 369cb0350 Author: Wenli Zhang AuthorDate: Mon Jul 1 13:12:52 2024 +0800 Merge pull request #20101 from apache/master chore: merge master into v6 .github/workflows/pr-preview.yml | 7 +- .github/workflows/teardown-pr-preview.yml | 2 +- dist/echarts.common.js | 114 ++--- dist/echarts.common.js.map | 2 +- dist/echarts.common.min.js | 4 +- dist/echarts.esm.js| 157 ++--- dist/echarts.esm.js.map| 2 +- dist/echarts.esm.min.js| 4 +- dist/echarts.esm.min.mjs | 4 +- dist/echarts.esm.mjs | 157 ++--- dist/echarts.esm.mjs.map | 2 +- dist/echarts.js| 157 ++--- dist/echarts.js.map| 2 +- dist/echarts.min.js| 4 +- dist/echarts.simple.js | 90 -- dist/echarts.simple.js.map | 2 +- dist/echarts.simple.min.js | 4 +- package-lock.json | 30 ++-- package.README.md | 5 +- package.json | 12 +- src/chart/bar/BarSeries.ts | 2 + src/chart/helper/createClipPathFromCoordSys.ts | 2 +- src/chart/treemap/TreemapSeries.ts | 8 + src/chart/treemap/TreemapView.ts | 43 - src/component/tooltip/TooltipView.ts | 14 +- src/coord/axisCommonTypes.ts | 10 +- src/coord/axisTickLabelBuilder.ts | 32 src/coord/scaleRawExtentInfo.ts| 6 +- src/core/echarts.ts| 4 +- src/layout/barGrid.ts | 19 ++- src/layout/barPolar.ts | 6 +- src/util/graphic.ts| 2 +- src/util/types.ts | 6 + src/visual/aria.ts | 2 + test/axis-customTicks.html | 202 ++ test/bar-startValue.html | 225 + test/clip-custom.html | 127 ++ test/runTest/actions/__meta__.json | 3 +- test/runTest/actions/tooltip.json | 2 +- test/runTest/actions/treemap-scaleLimit.json | 1 + test/tooltip.html | 76 ++--- test/treemap-scaleLimit.html | 185 42 files changed, 1556 insertions(+), 182 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 #20100 from apache/master
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/echarts.git commit fdf2e4dcc7845c7398d8d55fb880cd55de7e2239 Merge: a861bef15 369cb0350 Author: Wenli Zhang AuthorDate: Mon Jul 1 13:13:03 2024 +0800 Merge pull request #20100 from apache/master chore: merge master into next .github/workflows/pr-preview.yml | 7 +- .github/workflows/teardown-pr-preview.yml | 2 +- dist/echarts.common.js | 114 ++--- dist/echarts.common.js.map | 2 +- dist/echarts.common.min.js | 4 +- dist/echarts.esm.js| 157 ++--- dist/echarts.esm.js.map| 2 +- dist/echarts.esm.min.js| 4 +- dist/echarts.esm.min.mjs | 4 +- dist/echarts.esm.mjs | 157 ++--- dist/echarts.esm.mjs.map | 2 +- dist/echarts.js| 157 ++--- dist/echarts.js.map| 2 +- dist/echarts.min.js| 4 +- dist/echarts.simple.js | 90 -- dist/echarts.simple.js.map | 2 +- dist/echarts.simple.min.js | 4 +- package-lock.json | 30 ++-- package.README.md | 5 +- package.json | 12 +- src/chart/bar/BarSeries.ts | 2 + src/chart/helper/createClipPathFromCoordSys.ts | 2 +- src/chart/treemap/TreemapSeries.ts | 8 + src/chart/treemap/TreemapView.ts | 43 - src/component/tooltip/TooltipView.ts | 14 +- src/coord/axisCommonTypes.ts | 10 +- src/coord/axisTickLabelBuilder.ts | 32 src/coord/scaleRawExtentInfo.ts| 6 +- src/core/echarts.ts| 4 +- src/layout/barGrid.ts | 19 ++- src/layout/barPolar.ts | 6 +- src/util/graphic.ts| 2 +- src/util/types.ts | 6 + src/visual/aria.ts | 2 + test/axis-customTicks.html | 202 ++ test/bar-startValue.html | 225 + test/clip-custom.html | 127 ++ test/runTest/actions/__meta__.json | 3 +- test/runTest/actions/tooltip.json | 2 +- test/runTest/actions/treemap-scaleLimit.json | 1 + test/tooltip.html | 76 ++--- test/treemap-scaleLimit.html | 185 42 files changed, 1556 insertions(+), 182 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat/break-axis updated (f5f246d8f -> 567331115)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat/break-axis in repository https://gitbox.apache.org/repos/asf/echarts.git from f5f246d8f Merge branch 'next' into feat/break-axis add 567331115 fix(break): fix category No new revisions were added by this update. Summary of changes: src/coord/Axis.ts | 5 +++-- src/coord/axisTickLabelBuilder.ts | 6 +++--- src/layout/barGrid.ts | 2 +- src/scale/Interval.ts | 2 +- src/scale/Ordinal.ts | 2 +- src/scale/Scale.ts| 7 --- src/scale/helper.ts | 4 +++- 7 files changed, 16 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) 01/01: Merge pull request #405 from hxada/master
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 commit 57c98e2386b04f86a673f5ed7058987ab9865f04 Merge: 7360f5f2 bc086363 Author: Wenli Zhang AuthorDate: Tue Jul 2 16:57:17 2024 +0800 Merge pull request #405 from hxada/master fix(doc): Modify selectedMode EN doc en/option/partial/selected-mode.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) branch master updated (7360f5f2 -> 57c98e23)
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 7360f5f2 fix(candlestick): update default itemStyle color & borderColor to v5 add bc086363 fix(doc): Modify selectedMode EN doc new 57c98e23 Merge pull request #405 from hxada/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: en/option/partial/selected-mode.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) branch feat/break-axis updated (567331115 -> e53f6cad3)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat/break-axis in repository https://gitbox.apache.org/repos/asf/echarts.git from 567331115 fix(break): fix category add 75e22aec1 feat(break-axis): fix margin cases add e53f6cad3 fix: disable category axes No new revisions were added by this update. Summary of changes: src/component/axis/CartesianAxisView.ts | 6 +++- src/component/axis/axisBreakHelper.ts | 6 ++-- src/coord/Axis.ts | 29 +-- src/coord/axisHelper.ts | 3 +- src/coord/axisTickLabelBuilder.ts | 4 +-- src/coord/cartesian/Cartesian2D.ts | 2 -- src/label/labelLayoutHelper.ts | 6 src/layout/barGrid.ts | 2 +- src/scale/Interval.ts | 2 +- src/scale/Ordinal.ts| 9 ++--- src/scale/Scale.ts | 4 ++- src/scale/helper.ts | 17 + test/axis-break.html| 63 +++-- 13 files changed, 105 insertions(+), 48 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (369cb0350 -> c3291928f)
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 369cb0350 fix(custom): grid area clipping in custom series #19993 (#20043) add 35fa0cb70 chore: enable prompt to use typescript from workspace new c3291928f Merge pull request #20123 from apache/workspace-ts-prompt 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: .vscode/settings.json | 5 +++-- 1 file changed, 3 insertions(+), 2 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 #20123 from apache/workspace-ts-prompt
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 c3291928f9a3a8ad59b88db390f14c7d344f2f17 Merge: 369cb0350 35fa0cb70 Author: Wenli Zhang AuthorDate: Thu Jul 11 14:58:55 2024 +0800 Merge pull request #20123 from apache/workspace-ts-prompt chore: enable prompt to use typescript from workspace .vscode/settings.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch workspace-ts-prompt deleted (was 35fa0cb70)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch workspace-ts-prompt in repository https://gitbox.apache.org/repos/asf/echarts.git was 35fa0cb70 chore: enable prompt to use typescript from workspace The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - 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 #20144 from apache/workflow/pr-preview
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 4d3cb2cc2d25cd89f5cb3e5c6e14f19ce7c81246 Merge: c3291928f 33249dcdc Author: Wenli Zhang AuthorDate: Mon Jul 15 15:49:40 2024 +0800 Merge pull request #20144 from apache/workflow/pr-preview chore(workflow): fix pr-preview workflow .github/workflows/pr-preview.yml | 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) branch master updated (c3291928f -> 4d3cb2cc2)
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 c3291928f Merge pull request #20123 from apache/workspace-ts-prompt add 33249dcdc chore(workflow): fix pr-preview workflow new 4d3cb2cc2 Merge pull request #20144 from apache/workflow/pr-preview 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: .github/workflows/pr-preview.yml | 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) branch workflow/pr-preview deleted (was 33249dcdc)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch workflow/pr-preview in repository https://gitbox.apache.org/repos/asf/echarts.git was 33249dcdc chore(workflow): fix pr-preview workflow The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/02: feat(marker): relativeTo
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat/stock-marker in repository https://gitbox.apache.org/repos/asf/echarts.git commit ec7d082293f7979b0c137a4fbcadf449c2e4999f Author: Ovilia AuthorDate: Thu Jul 11 18:28:19 2024 +0800 feat(marker): relativeTo --- src/component/marker/MarkPointModel.ts | 1 + src/component/marker/MarkPointView.ts | 22 -- src/component/marker/MarkerModel.ts| 1 + src/component/marker/markerHelper.ts | 2 +- src/coord/CoordinateSystem.ts | 6 +- src/coord/polar/Polar.ts | 9 - 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/component/marker/MarkPointModel.ts b/src/component/marker/MarkPointModel.ts index 1b672317c..5fc5c59f4 100644 --- a/src/component/marker/MarkPointModel.ts +++ b/src/component/marker/MarkPointModel.ts @@ -43,6 +43,7 @@ export interface MarkPointDataItemOption extends SymbolOptionMixin, MarkerPositionOption { name: string +relativeTo: 'screen' | 'coordinate' } export interface MarkPointOption extends MarkerOption, diff --git a/src/component/marker/MarkPointView.ts b/src/component/marker/MarkPointView.ts index 3e4499c0d..054c0a5d9 100644 --- a/src/component/marker/MarkPointView.ts +++ b/src/component/marker/MarkPointView.ts @@ -41,11 +41,29 @@ function updateMarkerLayout( api: ExtensionAPI ) { const coordSys = seriesModel.coordinateSystem; +const apiWidth = api.getWidth(); +const apiHeight = api.getHeight(); +const coordRect = coordSys.getArea && coordSys.getArea(); +console.log(coordSys) mpData.each(function (idx: number) { const itemModel = mpData.getItemModel(idx); +const relativeTo = itemModel.get('relativeTo'); +const width = relativeTo === 'coordinate' +? coordRect ? coordRect.width : 0 +: apiWidth; +const height = relativeTo === 'coordinate' +? coordRect ? coordRect.height : 0 +: apiHeight; +const left = relativeTo === 'coordinate' +? coordRect ? coordRect.x : 0 +: 0; +const top = relativeTo === 'coordinate' +? coordRect ? coordRect.y : 0 +: 0; + let point; -const xPx = numberUtil.parsePercent(itemModel.get('x'), api.getWidth()); -const yPx = numberUtil.parsePercent(itemModel.get('y'), api.getHeight()); +const xPx = numberUtil.parsePercent(itemModel.get('x'), width) + left; +const yPx = numberUtil.parsePercent(itemModel.get('y'), height) + top; if (!isNaN(xPx) && !isNaN(yPx)) { point = [xPx, yPx]; } diff --git a/src/component/marker/MarkerModel.ts b/src/component/marker/MarkerModel.ts index 28d29a576..9699278c3 100644 --- a/src/component/marker/MarkerModel.ts +++ b/src/component/marker/MarkerModel.ts @@ -53,6 +53,7 @@ export interface MarkerPositionOption { // Absolute position, px or percent string x?: number | string y?: number | string +relativeTo?: 'screen' | 'coordinate' /** * Coord on any coordinate system diff --git a/src/component/marker/markerHelper.ts b/src/component/marker/markerHelper.ts index f5e5b7ddf..61acfd4d6 100644 --- a/src/component/marker/markerHelper.ts +++ b/src/component/marker/markerHelper.ts @@ -144,7 +144,7 @@ export function dataTransform( } } // x y is provided -if (item.coord == null || !isArray(dims)) { +if ((item.coord == null || !isArray(dims)) && item.relativeTo === 'screen') { item.coord = []; } else { diff --git a/src/coord/CoordinateSystem.ts b/src/coord/CoordinateSystem.ts index 8c778ab83..ea17e8a9a 100644 --- a/src/coord/CoordinateSystem.ts +++ b/src/coord/CoordinateSystem.ts @@ -174,7 +174,11 @@ export interface CoordinateSystemHostModel extends ComponentModel { * It is used to clip the graphic elements with the contain methods. */ export interface CoordinateSystemClipArea { -contain(x: number, y: number): boolean +x: number; +y: number; +width: number; +height: number; +contain(x: number, y: number): boolean; } export function isCoordinateSystemType( diff --git a/src/coord/polar/Polar.ts b/src/coord/polar/Polar.ts index e7b9db6cc..9ff3fb0e4 100644 --- a/src/coord/polar/Polar.ts +++ b/src/coord/polar/Polar.ts @@ -25,6 +25,7 @@ import GlobalModel from '../../model/Global'; import { ParsedModelFinder, ParsedModelFinderKnown } from '../../util/model'; import { ScaleDataValue } from '../../util/types'; import ExtensionAPI from '../../core/ExtensionAPI'; +import { BoundingRect } from 'zrender'; export const polarDimensions = ['radius', 'angle']; @@
(echarts) branch feat/stock-marker created (now 8c4a2d83b)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat/stock-marker in repository https://gitbox.apache.org/repos/asf/echarts.git at 8c4a2d83b test(marker): add test case for markline This branch includes the following new commits: new ec7d08229 feat(marker): relativeTo new 8c4a2d83b test(marker): add test case for markline 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(marker): add test case for markline
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat/stock-marker in repository https://gitbox.apache.org/repos/asf/echarts.git commit 8c4a2d83b07143696dd8f9c4fdbbdc1d283503fb Author: Ovilia AuthorDate: Fri Jul 12 12:01:56 2024 +0800 test(marker): add test case for markline --- test/markPoint-stock.html | 123 ++ 1 file changed, 123 insertions(+) diff --git a/test/markPoint-stock.html b/test/markPoint-stock.html new file mode 100644 index 0..e91d9344f --- /dev/null +++ b/test/markPoint-stock.html @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +require([ +'echarts', +// 'map/js/china', +// './data/nutrients.json' +], function (echarts) { +var option; + +const data = []; +let date = new Date('2024-07-11 9:30:00'); +const endDate = new Date('2024-07-11 15:00:00'); +let value = 120; +for (; date <= endDate;) { +if (date < new Date('2024-07-11 11:30:00').getTime() +|| date > new Date('2024-07-11 13:00:00').getTime() +) { +value = value + Math.round((Math.random() - 0.5) * 20); +} +data.push([ +date, +value +]); +date = new Date(date.getTime() + 1000 * 60); +} + +option = { +xAxis: { +type: 'time', +axisLabel: { +showMinLabel: true, +showMaxLabel: true, +} +}, +yAxis: { +axisLabel: { +show: false, +}, +min: 'dataMin', +max: 'dataMax' +}, +series: { +type: 'line', +data, +showSymbol: false, +markPoint: { +data: [{ +type: 'min', +// x: 0, +// y: 0, +// relativeTo: 'coordinate' +}, { +type: 'max', +x: 0, +y: '100%', +// relativeTo: 'coordinate' +}] +} +} +}; + +var chart = testHelper.create(echarts, 'main0', { +title: [ +'Test Case Description of main0', +'(Muliple lines and **emphasis** are supported in description)' +], +option: option +// height: 300, +// buttons: [{text: 'btn-txt', onclick: function () {}}], +// recordCanvas: true, +}); +}); + + + + + + - 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 #20114 from adaelixir/feature-#20110
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 8e968f4f6dc9d42e27d0f2a2f58748467b766e67 Merge: 65f625543 a4d803f6c Author: Wenli Zhang AuthorDate: Thu Jul 18 12:26:31 2024 +0800 Merge pull request #20114 from adaelixir/feature-#20110 feature(axis): add showMin/MaxLine to splitline in coordinate axis src/component/axis/CartesianAxisView.ts | 11 - src/coord/Axis.ts | 4 +- src/coord/axisCommonTypes.ts| 6 ++- src/coord/axisDefault.ts| 2 + test/axis-splitLine.html| 83 + 5 files changed, 101 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (65f625543 -> 8e968f4f6)
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 65f625543 Merge pull request #20161 from apache/perf/line-memory-cost add a4d803f6c feature(axis): add feature to remove SplitLine on specified tick new 8e968f4f6 Merge pull request #20114 from adaelixir/feature-#20110 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/CartesianAxisView.ts | 11 ++- src/coord/Axis.ts| 4 +- src/coord/axisCommonTypes.ts | 6 +- src/coord/axisDefault.ts | 2 + test/{clip-line-cap.html => axis-splitLine.html} | 86 +++- 5 files changed, 56 insertions(+), 53 deletions(-) copy test/{clip-line-cap.html => axis-splitLine.html} (56%) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (8e968f4f6 -> 7a0663751)
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 8e968f4f6 Merge pull request #20114 from adaelixir/feature-#20110 add 769bfef71 fix(pie): Missing pie chart label display. close #20070 add 403dce221 fix(pie): fix some labels may not show #20074 new 7a0663751 Merge pull request #20074 from liuyunzidian/fix-20070 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/pie/labelLayout.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) 01/01: Merge pull request #20074 from liuyunzidian/fix-20070
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 7a0663751b3a21aa2e27e3c5db7537776f46d914 Merge: 8e968f4f6 403dce221 Author: Wenli Zhang AuthorDate: Thu Jul 18 12:29:43 2024 +0800 Merge pull request #20074 from liuyunzidian/fix-20070 fix(pie): fix some labels may not show src/chart/pie/labelLayout.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/polar created (now 645bd056d)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix/polar in repository https://gitbox.apache.org/repos/asf/echarts.git at 645bd056d test(polar): add test case for polar bars with boundaryGap false 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) branch fix/polar updated (645bd056d -> c36098a87)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix/polar in repository https://gitbox.apache.org/repos/asf/echarts.git from 645bd056d test(polar): add test case for polar bars with boundaryGap false add c36098a87 style(polar): fix lint No new revisions were added by this update. Summary of changes: src/coord/polar/polarCreator.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 dependabot/npm_and_yarn/test/runTest/socket.io-parser-3.3.4 deleted (was 72e3f8016)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch dependabot/npm_and_yarn/test/runTest/socket.io-parser-3.3.4 in repository https://gitbox.apache.org/repos/asf/echarts.git was 72e3f8016 chore(deps-dev): bump socket.io-parser in /test/runTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - 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 #20187 from apache/dependabot/npm_and_yarn/test/runTest/socket.io-parser-3.3.4
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 11c5a12fd738c9a468467f26b904073f1f6290e2 Merge: 7a0663751 72e3f8016 Author: Wenli Zhang AuthorDate: Tue Jul 23 10:45:18 2024 +0800 Merge pull request #20187 from apache/dependabot/npm_and_yarn/test/runTest/socket.io-parser-3.3.4 chore(deps-dev): bump socket.io-parser from 3.3.3 to 3.3.4 in /test/runTest test/runTest/package-lock.json | 12 ++-- 1 file changed, 6 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 (7a0663751 -> 11c5a12fd)
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 7a0663751 Merge pull request #20074 from liuyunzidian/fix-20070 add 72e3f8016 chore(deps-dev): bump socket.io-parser in /test/runTest new 11c5a12fd Merge pull request #20187 from apache/dependabot/npm_and_yarn/test/runTest/socket.io-parser-3.3.4 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: test/runTest/package-lock.json | 12 ++-- 1 file changed, 6 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/customValues created (now 5fb9e9d5e)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix/customValues in repository https://gitbox.apache.org/repos/asf/echarts.git at 5fb9e9d5e fix(axis): ticks overflowing grid area with dataZoom #20185 This branch includes the following new commits: new 5fb9e9d5e fix(axis): ticks overflowing grid area with dataZoom #20185 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: fix(axis): ticks overflowing grid area with dataZoom #20185
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch fix/customValues in repository https://gitbox.apache.org/repos/asf/echarts.git commit 5fb9e9d5ec4785a8da196b4e5208a7161251aa17 Author: Ovilia AuthorDate: Wed Jul 24 14:50:46 2024 +0800 fix(axis): ticks overflowing grid area with dataZoom #20185 --- src/coord/axisTickLabelBuilder.ts | 9 +- test/axis-customTicks.html| 186 ++ 2 files changed, 193 insertions(+), 2 deletions(-) diff --git a/src/coord/axisTickLabelBuilder.ts b/src/coord/axisTickLabelBuilder.ts index e7f7bbb08..329ad6447 100644 --- a/src/coord/axisTickLabelBuilder.ts +++ b/src/coord/axisTickLabelBuilder.ts @@ -84,8 +84,11 @@ export function createAxisLabels(axis: Axis): { const custom = axis.getLabelModel().get('customValues'); if (custom) { const labelFormatter = makeLabelFormatter(axis); +const extent = axis.scale.getExtent(); +const tickNumbers = tickValuesToNumbers(axis, custom); +const ticks = zrUtil.filter(tickNumbers, val => val >= extent[0] && val <= extent[1]); return { -labels: tickValuesToNumbers(axis, custom).map(numval => { +labels: zrUtil.map(ticks, numval => { const tick = {value: numval}; return { formattedLabel: labelFormatter(tick), @@ -115,8 +118,10 @@ export function createAxisTicks(axis: Axis, tickModel: AxisBaseModel): { } { const custom = axis.getTickModel().get('customValues'); if (custom) { +const extent = axis.scale.getExtent(); +const tickNumbers = tickValuesToNumbers(axis, custom); return { -ticks: tickValuesToNumbers(axis, custom) +ticks: zrUtil.filter(tickNumbers, val => val >= extent[0] && val <= extent[1]) }; } // Only ordinal scale support tick interval diff --git a/test/axis-customTicks.html b/test/axis-customTicks.html index 24f9c7dc9..7f79f099d 100644 --- a/test/axis-customTicks.html +++ b/test/axis-customTicks.html @@ -38,6 +38,8 @@ under the License. + + require(['echarts'], function (echarts) { @@ -198,5 +200,189 @@ under the License. + +require(['echarts'], function (echarts) { +var option = { +grid: { +left: 300 +}, +dataZoom: [ +{ +show: true, +realtime: true, +start: 20, +end: 100 +}, +{ +type: 'inside', +realtime: true, +start: 20, +end: 100 +} +], +xAxis: { +axisTick: { +alignWithLabel: false, +customValues: ['a', 'c', 'd'] +}, +axisLabel: { +customValues: ['a', 'c', 'd'] +}, +type: 'category', +data: ['a', 'b', 'c', 'd'] +}, +yAxis: {}, +series: [ +{ +symbolSize: 8, +data: [ +['a', 34], +['b', 20], +['c', 23] +], +type: 'scatter' +} +] +}; + + +var chart = testHelper.create(echarts, 'main4', { +title: [ +'customValues should not overflow the grid (category axis)', +'`a` in the axis label should not be displayed' +], +option: option +}); +}); + + + +require(['echarts'], function (echarts) { +var laData = [[1, 3.47], [2, 7.84], [3, 2.01], [4, 4.20], [5, 3.87], [6, 1.50], [7, 2.56], [8, 6.40], [9, 1.74], [10, 2.96]]; + +var option = { +grid: {}, +dataZoom: [ +{ +show: true, +realtime: true, +start: 10, +end: 100 +}, +{ +
(echarts) branch feat/k created (now 0ac383d51)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat/k in repository https://gitbox.apache.org/repos/asf/echarts.git at 0ac383d51 test(marker): update test case This branch includes the following new commits: new 9766e2f4c test(marker): relative to coordinate new 0ac383d51 test(marker): update 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(marker): update test case
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat/k in repository https://gitbox.apache.org/repos/asf/echarts.git commit 0ac383d51021c7be549a5a3e0b18bb13f74c4ec0 Author: Ovilia AuthorDate: Thu Jul 25 19:30:49 2024 +0800 test(marker): update test case --- test/markPoint-stock.html | 95 --- 1 file changed, 82 insertions(+), 13 deletions(-) diff --git a/test/markPoint-stock.html b/test/markPoint-stock.html index e831e3f6a..c21cc59f8 100644 --- a/test/markPoint-stock.html +++ b/test/markPoint-stock.html @@ -52,15 +52,25 @@ under the License. ], function (echarts) { var option; +const lastClose = 100; const data = []; let date = new Date('2024-07-11 9:30:00'); const endDate = new Date('2024-07-11 15:00:00'); -let value = 120; +let value = lastClose; +let max = -Number.MAX_VALUE; +let min = Number.MAX_VALUE; for (; date <= endDate;) { if (date < new Date('2024-07-11 11:30:00').getTime() || date > new Date('2024-07-11 13:00:00').getTime() ) { -value = value + Math.round((Math.random() - 0.5) * 20); +value = Math.max(0, value + Math.round((Math.random() - 0.5) * 20)); +} + +if (value > max) { +max = value; +} +if (value < min) { +min = value; } data.push([ date, @@ -79,7 +89,7 @@ under the License. }, yAxis: { axisLabel: { -// show: false, +show: false, }, min: 'dataMin', max: 'dataMax' @@ -89,32 +99,91 @@ under the License. data, showSymbol: false, markPoint: { +symbol: 'circle', +symbolSize: 0, +label: { +position: 'top', +distance: 0, +padding: 5, +textBorderColor: '#fff', +textBorderWidth: 2 +}, data: [{ type: 'min', x: 0, y: 0, -relativeTo: 'coordinate' +relativeTo: 'coordinate', +label: { +align: 'left', +verticalAlign: 'top', +color: min > lastClose ? 'red' : 'green', +} }, { type: 'max', x: 0, y: '100%', -relativeTo: 'coordinate' +relativeTo: 'coordinate', +label: { +align: 'left', +verticalAlign: 'bottom', +color: max > lastClose ? 'red' : 'green', +} +}, { +type: 'middle', +x: 0, +y: '50%', +relativeTo: 'coordinate', +label: { +align: 'left', +verticalAlign: 'middle', +formatter: () => { +return (max + min) / 2; +}, +color: (max + min) / 2 > lastClose ? 'red' : 'green', +} }, { type: 'min', x: '100%', y: 0, name: 'abcd', -relativeTo: 'coordinate' +relativeTo: 'coordinate', +label: { +align: 'right', +verticalAlign: 'top', +
(echarts) 01/02: test(marker): relative to coordinate
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch feat/k in repository https://gitbox.apache.org/repos/asf/echarts.git commit 9766e2f4c1e964fbc108b0f1370c4e6f547d89f1 Author: Ovilia AuthorDate: Tue Jul 16 19:07:37 2024 +0800 test(marker): relative to coordinate --- src/component/marker/MarkPointView.ts | 1 - src/component/marker/markerHelper.ts | 3 ++- src/coord/polar/Polar.ts | 1 - test/markPoint-stock.html | 25 - 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/component/marker/MarkPointView.ts b/src/component/marker/MarkPointView.ts index 054c0a5d9..0f8de138b 100644 --- a/src/component/marker/MarkPointView.ts +++ b/src/component/marker/MarkPointView.ts @@ -44,7 +44,6 @@ function updateMarkerLayout( const apiWidth = api.getWidth(); const apiHeight = api.getHeight(); const coordRect = coordSys.getArea && coordSys.getArea(); -console.log(coordSys) mpData.each(function (idx: number) { const itemModel = mpData.getItemModel(idx); const relativeTo = itemModel.get('relativeTo'); diff --git a/src/component/marker/markerHelper.ts b/src/component/marker/markerHelper.ts index 61acfd4d6..fdc6aedf0 100644 --- a/src/component/marker/markerHelper.ts +++ b/src/component/marker/markerHelper.ts @@ -144,8 +144,9 @@ export function dataTransform( } } // x y is provided -if ((item.coord == null || !isArray(dims)) && item.relativeTo === 'screen') { +if (item.coord == null || !isArray(dims)) { item.coord = []; +item.value = numCalculate(data, data.mapDimension(dims[1]), item.type); } else { // Each coord support max, min, average diff --git a/src/coord/polar/Polar.ts b/src/coord/polar/Polar.ts index 9ff3fb0e4..c70e1e81c 100644 --- a/src/coord/polar/Polar.ts +++ b/src/coord/polar/Polar.ts @@ -25,7 +25,6 @@ import GlobalModel from '../../model/Global'; import { ParsedModelFinder, ParsedModelFinderKnown } from '../../util/model'; import { ScaleDataValue } from '../../util/types'; import ExtensionAPI from '../../core/ExtensionAPI'; -import { BoundingRect } from 'zrender'; export const polarDimensions = ['radius', 'angle']; diff --git a/test/markPoint-stock.html b/test/markPoint-stock.html index e91d9344f..e831e3f6a 100644 --- a/test/markPoint-stock.html +++ b/test/markPoint-stock.html @@ -79,7 +79,7 @@ under the License. }, yAxis: { axisLabel: { -show: false, +// show: false, }, min: 'dataMin', max: 'dataMax' @@ -91,15 +91,30 @@ under the License. markPoint: { data: [{ type: 'min', -// x: 0, -// y: 0, -// relativeTo: 'coordinate' +x: 0, +y: 0, +relativeTo: 'coordinate' }, { type: 'max', x: 0, y: '100%', +relativeTo: 'coordinate' +}, { +type: 'min', +x: '100%', +y: 0, +name: 'abcd', +relativeTo: 'coordinate' +}, { +type: 'max', +// x: '100%', +// y: '100%', // relativeTo: 'coordinate' -}] +}], +// label: { +// show: true, +// formatter: 'x: {c}' +// } } } }; - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat/stock-marker updated (8c4a2d83b -> 0ac383d51)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat/stock-marker in repository https://gitbox.apache.org/repos/asf/echarts.git from 8c4a2d83b test(marker): add test case for markline add 9766e2f4c test(marker): relative to coordinate add 0ac383d51 test(marker): update test case No new revisions were added by this update. Summary of changes: src/component/marker/MarkPointView.ts | 1 - src/component/marker/markerHelper.ts | 3 +- src/coord/polar/Polar.ts | 1 - test/markPoint-stock.html | 98 --- 4 files changed, 93 insertions(+), 10 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org