[incubator-echarts] 01/04: feat: label and labelLine animation
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 34e4cb0f6a282b493abef79426cc09083780e8f7
Author: pissang
AuthorDate: Thu May 28 13:39:34 2020 +0800
feat: label and labelLine animation
---
src/chart/pie/PieView.ts | 31 ---
src/chart/pie/labelLayout.ts | 5 ++
src/echarts.ts| 15 +++---
src/label/LabelManager.ts | 118 ++
src/label/labelGuideHelper.ts | 2 +-
5 files changed, 120 insertions(+), 51 deletions(-)
diff --git a/src/chart/pie/PieView.ts b/src/chart/pie/PieView.ts
index 0f2865a..8187c6a 100644
--- a/src/chart/pie/PieView.ts
+++ b/src/chart/pie/PieView.ts
@@ -136,9 +136,7 @@ class PiePiece extends graphic.Sector {
const cursorStyle = itemModel.getShallow('cursor');
cursorStyle && sector.attr('cursor', cursorStyle);
-// Label and text animation should be applied only for transition type
animation when update
-const withAnimation = !firstCreate && animationTypeUpdate ===
'transition';
-this._updateLabel(data, idx, withAnimation);
+this._updateLabel(data, idx);
const emphasisState = sector.ensureState('emphasis');
emphasisState.shape = {
@@ -165,12 +163,11 @@ class PiePiece extends graphic.Sector {
(sector as ECElement).selected =
seriesModel.isSelected(data.getName(idx));
}
-private _updateLabel(data: List, idx: number, withAnimation: boolean):
void {
+private _updateLabel(data: List, idx: number): void {
const sector = this;
const labelLine = sector.getTextGuideLine();
const labelText = sector.getTextContent();
-const seriesModel = data.hostModel;
const itemModel = data.getItemModel(idx);
const layout = data.getItemLayout(idx);
const labelLayout = layout.label;
@@ -225,25 +222,15 @@ class PiePiece extends graphic.Sector {
outsideFill: visualColor
});
-const targetTextPos = {
+labelLine.attr({
+shape: targetLineShape
+});
+// Make sure update style on labelText after setLabelStyle.
+// Because setLabelStyle will replace a new style on it.
+labelText.attr({
x: labelLayout.x,
y: labelLayout.y
-};
-if (withAnimation) {
-graphic.updateProps(labelLine, {
-shape: targetLineShape
-}, seriesModel, idx);
-
-graphic.updateProps(labelText, targetTextPos, seriesModel, idx);
-}
-else {
-labelLine.attr({
-shape: targetLineShape
-});
-// Make sure update style on labelText after setLabelStyle.
-// Because setLabelStyle will replace a new style on it.
-labelText.attr(targetTextPos);
-}
+});
labelText.attr({
rotation: labelLayout.rotation,
diff --git a/src/chart/pie/labelLayout.ts b/src/chart/pie/labelLayout.ts
index 04542b5..d1da84d 100644
--- a/src/chart/pie/labelLayout.ts
+++ b/src/chart/pie/labelLayout.ts
@@ -323,6 +323,11 @@ export default function (
const text = seriesModel.getFormattedLabel(idx, 'normal')
|| data.getName(idx);
const textRect = textContain.getBoundingRect(text, font, textAlign,
'top');
+// Text has a default 1px stroke. Exclude this.
+textRect.x -= 1;
+textRect.y -= 1;
+textRect.width += 2.1;
+textRect.height += 2.1;
const isLabelInside = labelPosition === 'inside' || labelPosition ===
'inner';
if (labelPosition === 'center') {
diff --git a/src/echarts.ts b/src/echarts.ts
index 6723c9d..3a68ce7 100644
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@ -1097,6 +1097,7 @@ class ECharts extends Eventful {
const labelManager = this._labelManager;
labelManager.updateLayoutConfig(this._api);
labelManager.layout();
+labelManager.animateLabels();
}
appendData(params: {
@@ -1722,16 +1723,20 @@ class ECharts extends Eventful {
// Add labels.
labelManager.addLabelsOfSeries(chartView);
-// NOTE: Update states after label is added.
-// Because in LabelManager#addLabel. It will cache the
properties(transform, textConfig) of label.
-// We need to cache the normal state. Not other states.
-updateStates(seriesModel, chartView);
});
scheduler.unfinished = unfinished || scheduler.unfinished;
labelManager.updateLayoutConfig(api);
labelManager.layout();
+labelManager.animateLabels();
+
+ecModel.eachSeries(function (seriesModel) {
+const chartView =
[incubator-echarts] 02/04: fix: compat barBorderXXX in backgroundStyle
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 906e36324fa8677bfebfca574050d171b5496db3
Author: pissang
AuthorDate: Thu May 28 13:40:24 2020 +0800
fix: compat barBorderXXX in backgroundStyle
---
src/preprocessor/backwardCompat.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/preprocessor/backwardCompat.ts
b/src/preprocessor/backwardCompat.ts
index c303624..13c22a0 100644
--- a/src/preprocessor/backwardCompat.ts
+++ b/src/preprocessor/backwardCompat.ts
@@ -25,6 +25,7 @@ import {normalizeToArray} from '../util/model';
import { Dictionary } from 'zrender/src/core/types';
import { ECUnitOption, SeriesOption } from '../util/types';
import { __DEV__ } from '../config';
+import type { BarSeriesOption } from '../chart/bar/BarSeries';
function get(opt: Dictionary, path: string): any {
const pathArr = path.split(',');
@@ -129,6 +130,7 @@ export default function (option: ECUnitOption, isTheme?:
boolean) {
}
else if (seriesType === 'bar') {
compatBarItemStyle(seriesOpt);
+compatBarItemStyle((seriesOpt as BarSeriesOption).backgroundStyle);
// @ts-ignore
compatBarItemStyle(seriesOpt.emphasis);
const data = seriesOpt.data;
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 04/04: fix: fix not existed emphasis state caused error.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit fba40c7a5ef29381ccb6daabdd7ce1510b04698d
Author: pissang
AuthorDate: Thu May 28 13:43:05 2020 +0800
fix: fix not existed emphasis state caused error.
---
src/util/graphic.ts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/util/graphic.ts b/src/util/graphic.ts
index 72bf70e..36d7fd3 100644
--- a/src/util/graphic.ts
+++ b/src/util/graphic.ts
@@ -462,7 +462,9 @@ function elementStateProxy(this: Displayable, stateName:
string): DisplayableSta
state.style = emphasisStyle;
}
}
-state.z2 = this.z2 + Z2_EMPHASIS_LIFT;
+if (state) {
+state.z2 = this.z2 + Z2_EMPHASIS_LIFT;
+}
}
return state;
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch label-enhancement updated (6fa462f -> fba40c7)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch label-enhancement in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from 6fa462f fix: compat barBorderXXX in backgroundStyle. rename barBorderRadius to borderRadius new 34e4cb0 feat: label and labelLine animation new 906e363 fix: compat barBorderXXX in backgroundStyle new 678b42d fix: fix class error in ES6 built file new fba40c7 fix: fix not existed emphasis state caused error. The 4 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/PieView.ts | 31 +++--- src/chart/pie/labelLayout.ts | 5 ++ src/echarts.ts | 15 +++-- src/label/LabelManager.ts | 118 ++--- src/label/labelGuideHelper.ts | 2 +- src/preprocessor/backwardCompat.ts | 2 + src/util/clazz.ts | 26 +--- src/util/graphic.ts| 4 +- 8 files changed, 142 insertions(+), 61 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 03/04: fix: fix class error in ES6 built file
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 678b42d5797c3b975cdacef834e0aa6fffed078d
Author: pissang
AuthorDate: Thu May 28 13:41:56 2020 +0800
fix: fix class error in ES6 built file
---
src/util/clazz.ts | 26 +-
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/util/clazz.ts b/src/util/clazz.ts
index ddf3549..7507bdf 100644
--- a/src/util/clazz.ts
+++ b/src/util/clazz.ts
@@ -99,17 +99,25 @@ export function enableClassExtend(rootClz:
ExtendableConstructor, mandatoryMetho
// constructor.
// If this constructor/$constructor is declared, it is responsible for
// calling the super constructor.
-const ExtendedClass = (class {
-constructor() {
-if (!proto.$constructor) {
-superClass.apply(this, arguments);
+function ExtendedClass(this: any, ...args: any[]) {
+if (!proto.$constructor) {
+try {
+// Will throw error if superClass is a es6 native class.
+superClass.apply(this, args);
}
-else {
-proto.$constructor.apply(this, arguments);
+catch (e) {
+const ins = zrUtil.createObject(
+// @ts-ignore
+ExtendedClass.prototype, new superClass(...args)
+);
+return ins;
}
}
-static [IS_EXTENDED_CLASS] = true;
-}) as ExtendableConstructor;
+else {
+proto.$constructor.apply(this, arguments);
+}
+};
+ExtendedClass[IS_EXTENDED_CLASS] = true;
zrUtil.extend(ExtendedClass.prototype, proto);
@@ -119,7 +127,7 @@ export function enableClassExtend(rootClz:
ExtendableConstructor, mandatoryMetho
zrUtil.inherits(ExtendedClass, this);
ExtendedClass.superClass = superClass;
-return ExtendedClass as ExtendableConstructor;
+return ExtendedClass as unknown as ExtendableConstructor;
};
}
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] susiwen8 commented on issue #12642: tooltip.axisPointer.label 设置 lineHeight 无效果
susiwen8 commented on issue #12642: URL: https://github.com/apache/incubator-echarts/issues/12642#issuecomment-635087159 @214132049 Why closing this issue? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] wf123537200 opened a new pull request #12710: fix(tree):delete the edge when all the children nodes are deleted, cl…
wf123537200 opened a new pull request #12710: URL: https://github.com/apache/incubator-echarts/pull/12710 ## Brief Information This pull request is in the type of: - [x] bug fixing - [ ] new feature - [ ] others ### What does this PR do? delete the edge when all children nodes are deleted ### Fixed issues #12706 ## Details ### Before: What was the problem?  ### After: How is it fixed in this PR?  ## Usage ### Are there any API changes? - [ ] The API has been changed. ### Related test cases or examples to use the new APIs case 2 in tree-basic.html ## Others ### Merging options - [ ] Please squash the commits into a single one when merge. ### Other information This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] commented on pull request #12418: Fix 12109
echarts-bot[bot] commented on pull request #12418: URL: https://github.com/apache/incubator-echarts/pull/12418#issuecomment-635069642 Congratulations! Your PR has been merged. Thanks for your contribution! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] Ovilia merged pull request #12418: Fix 12109
Ovilia merged pull request #12418: URL: https://github.com/apache/incubator-echarts/pull/12418 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] plainheart commented on pull request #102: feat: added Chinese translation for coding-standard.
plainheart commented on pull request #102: URL: https://github.com/apache/incubator-echarts-doc/pull/102#issuecomment-635064058 BTW, in current English version, on [Statement ](https://echarts.apache.org/en/coding-standard.html#statement) block, comma `,` here should be semicolon `;` ?  This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts-doc] plainheart opened a new pull request #102: feat: added Chinese translation for coding-standard.
plainheart opened a new pull request #102: URL: https://github.com/apache/incubator-echarts-doc/pull/102 Chinese translation of `coding-standard` is currently missing, this PR provides the first version. Some reviews and suggestions are expected to make it better. There are also some work to be done on https://github.com/ecomfe/echarts-www. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] pissang commented on pull request #12702: feat(datastack):stack support positive add negative, close 12699
pissang commented on pull request #12702: URL: https://github.com/apache/incubator-echarts/pull/12702#issuecomment-635048349 Thanks for the contribution @wf123537200 ! Separated stacking on positive and negative values is by design. If necessary, we can make it configurable to support stacking positive values on negative values. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] zhangddjs commented on issue #12709: Disable or hide the chart when data is null
zhangddjs commented on issue #12709: URL: https://github.com/apache/incubator-echarts/issues/12709#issuecomment-635045778 The charts are all in one diagram, while the css can only control the visibility of charts in seperate diagrams. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] susiwen8 edited a comment on pull request #12673: Fix #12642, add line height for axispointer
susiwen8 edited a comment on pull request #12673: URL: https://github.com/apache/incubator-echarts/pull/12673#issuecomment-635037904 > Sorry, that's only my suggestion and I thought you would finish it. Now you have closed this issue, I have to open a new one for this later. Feel free to give some advice on rich label. Thank you! I agree with you. You solution is the right way to fix this issue, no hard feeling. And to be honesty, I have ton of work to do, so I might not have time for it :joy: :joy: :joy: This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] susiwen8 commented on pull request #12673: Fix #12642, add line height for axispointer
susiwen8 commented on pull request #12673: URL: https://github.com/apache/incubator-echarts/pull/12673#issuecomment-635037904 > Sorry, that's only my suggestion and I thought you would finish it. Now you have closed this issue, I have to open a new one for this later. Feel free to give some advice on rich label. Thank you! :smiley :smiley :smiley I agree with you. You solution is the right way to fix this issue, no hard feeling. And to be honesty, I have ton of work to do, so I might not have time for it :joy: :joy: :joy: This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart edited a comment on pull request #12673: Fix #12642, add line height for axispointer
plainheart edited a comment on pull request #12673: URL: https://github.com/apache/incubator-echarts/pull/12673#issuecomment-635035457 Sorry, that's only my suggestion and I thought you would finish it. Now you have closed this issue, I have to open a new one for this later. Feel free to give some advice on rich label. Thank you! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart commented on pull request #12673: Fix #12642, add line height for axispointer
plainheart commented on pull request #12673: URL: https://github.com/apache/incubator-echarts/pull/12673#issuecomment-635035457 Sorry, that's only my suggestions and I thought you would finish it. Now you have closed this issue, I have to open a new one for this later. Feel free to give some advice on rich label. Thank you! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] susiwen8 commented on pull request #12673: Fix #12642, add line height for axispointer
susiwen8 commented on pull request #12673: URL: https://github.com/apache/incubator-echarts/pull/12673#issuecomment-635028843 @plainheart Would you submit a new PR for it? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] susiwen8 closed pull request #12673: Fix #12642, add line height for axispointer
susiwen8 closed pull request #12673: URL: https://github.com/apache/incubator-echarts/pull/12673 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart edited a comment on pull request #12673: Fix #12642, add line height for axispointer
plainheart edited a comment on pull request #12673:
URL:
https://github.com/apache/incubator-echarts/pull/12673#issuecomment-634829856
Hi~ @susiwen8 Thanks for your fixing.
I've been inspired by following code lines from @Ovilia ~
Maybe we can make some changes like this
https://github.com/apache/incubator-echarts/blob/5a94212c43f0a4b5a8da7c26cf20192d29fb1d02/src/component/tooltip/TooltipRichContent.js#L139-L147
As mentioned above, there may be no need to solve this issue as present
scheme.
```js
var textRect = textContain.getBoundingRect(text, font, null, null, null,
labelModel.get('lineHeight'));
```
Some changes are as follows
```js
style: graphic.setTextStyle({}, labelModel, {
text: text,
fill: bgColor,
stroke: labelModel.get('borderColor') || 'transparent',
lineWidth: labelModel.get('borderWidth') || 0,
textFont: font,
textPosition: 'inside',
textPadding: paddings,
textFill: labelModel.getTextColor()
})
```
This can solve the issue that `lineHeight` is invalid and in the meanwhile,
there are more supported properties of label.(Note that some new supported
properties are now missing description in the official document)
```js
label: {
fontWeight: 'bold',
fontSize: 20,
textShadowBlur: 10,
textShadowOffsetX: 10,
textShadowOffsetY: 10,
textShadowColor: 'red',
backgroundColor: 'yellow',
textBorderColor: 'blue',
textBorderWidth: 5,
borderWidth: 2,
borderColor: 'cyan',
padding: [10, 20, 30, 40],
shadowColor: 'green',
shadowBlur: 5,
shadowOffsetX: 10,
shadowOffsetY: 10,
borderRadius: 20,
lineHeight: 40,
color: 'purple',
// width: 400, // rich is needed, but rich is TODO
// height: 200, // rich is needed, but rich is TODO
}
```
A test screenshot(Just for test, No beauty)
Looks good.
In the last, it's a pity that rich label is still a TODO. I have no idea
about it by now, but I think we can refer to implements of
[TooltipRichContent](https://github.com/apache/incubator-echarts/blob/5a94212c43f0a4b5a8da7c26cf20192d29fb1d02/src/component/tooltip/TooltipRichContent.js#L74-L108)
Let we make it right together~ : )
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart edited a comment on pull request #12673: Fix #12642, add line height for axispointer
plainheart edited a comment on pull request #12673:
URL:
https://github.com/apache/incubator-echarts/pull/12673#issuecomment-634829856
Hi~ @susiwen8 Thanks for your fixing.
I've been inspired by following code lines from @Ovilia ~
Maybe we can make some changes like this
https://github.com/apache/incubator-echarts/blob/5a94212c43f0a4b5a8da7c26cf20192d29fb1d02/src/component/tooltip/TooltipRichContent.js#L139-L147
As mentioned above, there may be no need to solve this issue as present
scheme.
```js
var textRect = textContain.getBoundingRect(text, font, null, null, null,
labelModel.get('lineHeight'));
```
Some changes are as follows
```js
style: graphic.setTextStyle({}, labelModel, {
text: text,
fill: bgColor,
stroke: labelModel.get('borderColor') || 'transparent',
lineWidth: labelModel.get('borderWidth') || 0,
textFont: font,
textPosition: 'inside',
textPadding: paddings,
textFill: labelModel.getTextColor()
})
```
This can solve the issue that `lineHeight` is invalid and in the meanwhile,
there are more supported properties of label.(Note that some new supported
properties are now missing description in the official document)
```js
label: {
fontWeight: 'bold',
fontSize: 20,
textShadowBlur: 10,
textShadowOffsetX: 10,
textShadowOffsetY: 10,
textShadowColor: 'red',
backgroundColor: 'yellow',
textBorderColor: 'blue',
textBorderWidth: 5,
borderWidth: 2,
borderColor: 'cyan',
padding: [10, 20, 30, 40],
shadowColor: 'green',
shadowBlur: 5,
shadowOffsetX: 10,
shadowOffsetY: 10,
borderRadius: 20,
lineHeight: 40,
color: 'purple',
// width: 400, // rich is needed, but rich is TODO
// height: 200, // rich is needed, but rich is TODO
}
```
A test screenshot(Just for test, No beauty)
Looks good.
In the last, that's a pity rich label is still a TODO. I have no idea about
it by now, but I think we can refer to implements of
[TooltipRichContent](https://github.com/apache/incubator-echarts/blob/5a94212c43f0a4b5a8da7c26cf20192d29fb1d02/src/component/tooltip/TooltipRichContent.js#L74-L108)
Let we make it right together~ : )
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart commented on pull request #12673: Fix #12642, add line height for axispointer
plainheart commented on pull request #12673:
URL:
https://github.com/apache/incubator-echarts/pull/12673#issuecomment-634829856
Hi~ @susiwen8 Thanks your fixing.
I've been inspired by following code lines from @Ovilia ~
Maybe we can make some changes like this
https://github.com/apache/incubator-echarts/blob/5a94212c43f0a4b5a8da7c26cf20192d29fb1d02/src/component/tooltip/TooltipRichContent.js#L139-L147
As mentioned above, there may be no need to solve this issue as present
scheme.
```js
var textRect = textContain.getBoundingRect(text, font, null, null, null,
labelModel.get('lineHeight'));
```
Some changes are as follows
```js
style: graphic.setTextStyle({}, labelModel, {
text: text,
fill: bgColor,
stroke: labelModel.get('borderColor') || 'transparent',
lineWidth: labelModel.get('borderWidth') || 0,
textFont: font,
textPosition: 'inside',
textPadding: paddings,
textFill: labelModel.getTextColor()
})
```
This can solve the issue that `lineHeight` is invalid and in the meanwhile,
there are more supported properties of label.(Note that some new supported
properties are now missing description in the official document)
```js
label: {
fontWeight: 'bold',
fontSize: 20,
textShadowBlur: 10,
textShadowOffsetX: 10,
textShadowOffsetY: 10,
textShadowColor: 'red',
backgroundColor: 'yellow',
textBorderColor: 'blue',
textBorderWidth: 5,
borderWidth: 2,
borderColor: 'cyan',
padding: [10, 20, 30, 40],
shadowColor: 'green',
shadowBlur: 5,
shadowOffsetX: 10,
shadowOffsetY: 10,
borderRadius: 20,
lineHeight: 40,
color: 'purple',
// width: 400, // rich is needed, but rich is TODO
// height: 200, // rich is needed, but rich is TODO
}
```
A test screenshot(Just for test, No beauty)
Looks good.
In the last, that's a pity rich label is still a TODO. I have no idea about
it by now, but I think we can refer to implements of
[TooltipRichContent](https://github.com/apache/incubator-echarts/blob/5a94212c43f0a4b5a8da7c26cf20192d29fb1d02/src/component/tooltip/TooltipRichContent.js#L74-L108)
Let we make it right together~ : )
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart commented on issue #12709: Disable or hide the chart when data is null
plainheart commented on issue #12709: URL: https://github.com/apache/incubator-echarts/issues/12709#issuecomment-634646363 Why not use css property `display` or `visibility` to control the visibility of chart? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] autukill closed pull request #12383: fix: Some styles of Tooltip is not working on RichText mode
autukill closed pull request #12383: URL: https://github.com/apache/incubator-echarts/pull/12383 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] autukill closed issue #12318: Tooltip 使用 richText 模式后, Tooltip的边框宽度和边框颜色失效了
autukill closed issue #12318: URL: https://github.com/apache/incubator-echarts/issues/12318 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] Ovilia commented on a change in pull request #12418: Fix 12109
Ovilia commented on a change in pull request #12418: URL: https://github.com/apache/incubator-echarts/pull/12418#discussion_r431009173 ## File path: test/bar-polar-stack.html ## @@ -91,5 +104,205 @@ window.onresize = chart.resize; }); +
[GitHub] [incubator-echarts] zhangddjs opened a new issue #12709: Disable or hide the chart when data is null
zhangddjs opened a new issue #12709: URL: https://github.com/apache/incubator-echarts/issues/12709 ### What problem does this feature solve? There are mutiple charts on the page, however, some of them have no data. We need to hide or disable those charts with no data. ### What does the proposed API look like? series.visible = true/false or series.display= true/false or series.show = true/false This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] commented on issue #12709: Disable or hide the chart when data is null
echarts-bot[bot] commented on issue #12709: URL: https://github.com/apache/incubator-echarts/issues/12709#issuecomment-634557472 Hi! We've received your issue and please be patient to get responded. The average response time is expected to be within one day for weekdays. In the meanwhile, please make sure that **you have posted enough image to demo your request**. You may also check out the [API](http://echarts.apache.org/api.html) and [chart option](http://echarts.apache.org/option.html) to get the answer. If you don't get helped for a long time (over a week) or have an urgent question to ask, you may also send an email to d...@echarts.apache.org. Please attach the issue link if it's a technical questions. If you are interested in the project, you may also subscribe our [mail list](https://echarts.apache.org/en/maillist.html). Have a nice day! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] Ling310 opened a new issue #12708: 当饼图label.alignTo == edge且在formatter中使用了rich时，labelLine与label间有不规则空隙
Ling310 opened a new issue #12708: URL: https://github.com/apache/incubator-echarts/issues/12708 ### Version 4.8.0 ### Reproduction link [https://gallery.echartsjs.com/editor.html?c=x7lnSN-OJe=1](https://gallery.echartsjs.com/editor.html?c=x7lnSN-OJe=1) ### Steps to reproduce label.alignTo == edge且在formatter中使用了rich ### What is expected? label与labelLine间没有不合理的空隙 ### What is actually happening? 如题 --- 相关issue：https://github.com/apache/incubator-echarts/issues/12148 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] commented on issue #12708: 当饼图label.alignTo == edge且在formatter中使用了rich时，labelLine与label间有不规则空隙
echarts-bot[bot] commented on issue #12708: URL: https://github.com/apache/incubator-echarts/issues/12708#issuecomment-634551104 Hi! We've received your issue and please be patient to get responded. The average response time is expected to be within one day for weekdays. In the meanwhile, please make sure that **you have posted enough image to demo your request**. You may also check out the [API](http://echarts.apache.org/api.html) and [chart option](http://echarts.apache.org/option.html) to get the answer. If you don't get helped for a long time (over a week) or have an urgent question to ask, you may also send an email to d...@echarts.apache.org. Please attach the issue link if it's a technical questions. If you are interested in the project, you may also subscribe our [mail list](https://echarts.apache.org/en/maillist.html). Have a nice day! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] wf123537200 commented on issue #12706: echarts树图的bug
wf123537200 commented on issue #12706: URL: https://github.com/apache/incubator-echarts/issues/12706#issuecomment-634510363 > 可以放截图  重现了下，还没来得及看为啥。。 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch master updated (7c3f189 -> bb1d16e)
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from 7c3f189 Merge pull request #12392 from plainheart/fix-12388 add ac9c8f5 Merge pull request #12478 from apache/master add 0f9f38b fix syntax error add a85a03d Merge pull request #12494 from apache/fix-syntax add 4a91a73 fix(axis): fix typo in #12371 add d7edf07 Merge pull request #12497 from apache/fix-12371 add 582cd73 fix(bar): fix bar background incorrect on polar add 911bd4b Merge pull request #12501 from apache/fix-polar-bar-background add 1360a8e fix(geo): fix default name property when parsing GeoJSON add 043ff9e Merge pull request #12500 from apache/fix-geo-name-property add ced2c23 release: 4.8.0 add 167ee79 release: upgrade zrender dep. add a74ce97 fix: zrender version should be fixed. add 3b61add Merge pull request #12574 from apache/release-dev new bb1d16e Merge pull request #12707 from apache/release 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: dist/echarts-en.common.js | 520 - dist/echarts-en.common.min.js | 2 +- dist/echarts-en.js| 737 +- dist/echarts-en.js.map| 2 +- dist/echarts-en.min.js| 2 +- dist/echarts-en.simple.js | 435 ++--- dist/echarts-en.simple.min.js | 2 +- dist/echarts.common.js| 494 +++- dist/echarts.common.min.js| 2 +- dist/echarts.js | 711 +++- dist/echarts.js.map | 2 +- dist/echarts.min.js | 2 +- dist/echarts.simple.js| 409 --- dist/echarts.simple.min.js| 2 +- dist/extension/bmap.js| 338 ++- dist/extension/bmap.js.map| 2 +- dist/extension/bmap.min.js| 2 +- extension/bmap/BMapView.js| 8 +- package-lock.json | 8 +- package.json | 4 +- src/chart/bar/BarView.js | 10 +- src/chart/pie/PieView.js | 2 +- src/coord/axisHelper.js | 2 +- src/coord/geo/parseGeoJson.js | 2 +- src/echarts.js| 4 +- test/bar-background.html | 10 +- 26 files changed, 2678 insertions(+), 1036 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 01/01: Merge pull request #12707 from apache/release
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git commit bb1d16e0994a8fe91e724a3bca84a5be049ecd37 Merge: 7c3f189 3b61add Author: sushuang AuthorDate: Wed May 27 16:03:52 2020 +0800 Merge pull request #12707 from apache/release Merge release 4.8.0 to master dist/echarts-en.common.js | 520 - dist/echarts-en.common.min.js | 2 +- dist/echarts-en.js| 737 +- dist/echarts-en.js.map| 2 +- dist/echarts-en.min.js| 2 +- dist/echarts-en.simple.js | 435 ++--- dist/echarts-en.simple.min.js | 2 +- dist/echarts.common.js| 494 +++- dist/echarts.common.min.js| 2 +- dist/echarts.js | 711 +++- dist/echarts.js.map | 2 +- dist/echarts.min.js | 2 +- dist/echarts.simple.js| 409 --- dist/echarts.simple.min.js| 2 +- dist/extension/bmap.js| 338 ++- dist/extension/bmap.js.map| 2 +- dist/extension/bmap.min.js| 2 +- extension/bmap/BMapView.js| 8 +- package-lock.json | 8 +- package.json | 4 +- src/chart/bar/BarView.js | 10 +- src/chart/pie/PieView.js | 2 +- src/coord/axisHelper.js | 2 +- src/coord/geo/parseGeoJson.js | 2 +- src/echarts.js| 4 +- test/bar-background.html | 10 +- 26 files changed, 2678 insertions(+), 1036 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] commented on pull request #12707: Merge release 4.8.0 to master
echarts-bot[bot] commented on pull request #12707: URL: https://github.com/apache/incubator-echarts/pull/12707#issuecomment-634498580 Congratulations! Your PR has been merged. Thanks for your contribution! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] 100pah merged pull request #12707: Merge release 4.8.0 to master
100pah merged pull request #12707: URL: https://github.com/apache/incubator-echarts/pull/12707 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] soopencool commented on issue #12706: echarts树图的bug
soopencool commented on issue #12706: URL: https://github.com/apache/incubator-echarts/issues/12706#issuecomment-634489443 重现步骤那写清楚了，不放截图，应该你们也能复现出来了，确定有这个bug --原始邮件-- 发件人:"Yi Shen"
[GitHub] [incubator-echarts] 100pah opened a new pull request #12707: Merge release 4.8.0 to master
100pah opened a new pull request #12707: URL: https://github.com/apache/incubator-echarts/pull/12707 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] echarts-bot[bot] commented on pull request #12707: Merge release 4.8.0 to master
echarts-bot[bot] commented on pull request #12707: URL: https://github.com/apache/incubator-echarts/pull/12707#issuecomment-634478194 Thanks for your contribution! The community will review it ASAP. In the meanwhile, please checkout [the coding standard](https://echarts.apache.org/en/coding-standard.html) and Wiki about [How to make a pull request](https://github.com/apache/incubator-echarts/wiki/How-to-make-a-pull-request). The pull request is marked to be `PR: author is committer` because you are a committer of this project. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next updated (285be45 -> 75d9cd8)
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a change to branch next in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from 285be45 chore: use trick to fix sourcemap instead of parsing full to add UMD wrapper. add 88a22eb Fix lint add 7d9e04b Merge pull request #12134 from susiwen8/lint add d252394 Update gansu.js add 86d1df7 Merge pull request #12139 from siminx/patch-1 add fa5952a fix(svg): download svg image with toolbox add 41da1fa feat(svg): support exporting svg with connected charts add 8028f41 fix(svg): rename function name add 055dea0 fix 11799 add new option 'nameProperty' in map series option to denote key in geoJSON add da128eb Merge pull request #12156 from alex2wong/fix-11799 add 4f0ec36 fix(toolbox): only change title of requested feature. closes #12162 add 331ac4a Merge pull request #12168 from nsmgr8/toolbox-title-12162 add ab47a24 Fix: minOpen is true will drop a piece add dbaa9bf Correction base on CR add 80d389f Merge pull request #12147 from susiwen8/#12121 add 63790c0 fix(sunburst): default sunburst downplay not work. add 077b739 Merge pull request #12264 from apache/fix-sunburst-default-downplay add f5f0585 Feat: use auto calculate if min /max is null add 12d1c0e add test case add c928a93 Revert some code due to failed test case add cf5812f Merge pull request #12215 from susiwen8/#11829 add 51925a0 fix(Series): check null pointer add 3754a24 Merge pull request #11718 from howel52/bug/null-pointer add d4f37c4 Merge pull request #12317 from apache/release add 58eec53 Fix: barBorderRadius didn't work add 0c85b83 add test case add b4b979a Remove useless code add c57507e Set bar background radius properly add fbe73ae Merge pull request #12331 from susiwen8/#12321 add ae07a9e fix(heatmap): 1px gap between rect add 22aef46 Merge pull request #12342 from SnailSword/master add a94123e fix(map): map animation when zoom and center change. fix #11947 add 37dfd89 Merge pull request #12340 from apache/fix-11947 add fdf240f feat(scatter): make `symbolRotate` functional for scatter series. add 6f81cbf Merge pull request #12348 from plainheart/feature/add_function_support_for_scatter_series add 4e2fe95 Merge pull request #1 from apache/master add 500157f fix(effectScatter): the ripple effect of effectScatter does not rotate as the rotation of scatter symbol when using functional `symbolRotate`. close apache#12353. add 50bab74 Merge pull request #12354 from plainheart/fix/effect-scatter-ripple-not-rotate-as-expected add fb72a4c fix: axis min/max function return null: The original PR is: #12215 cf5812f6aad64e433c0de89c62bd0d84b7f3f0cf Fix from that: (1) The min/max function call should not be called twice (necessary and probably wrong input params). (2) `fixMin` `fixMax` should cover function return. (3) Add more test cases. add 8e99715 fix: bar background border radius. The original PR is #12331 fbe73aec2b265c99e78aebcf575b23bc339b60c8 This commit fixes: also update `r` when "update" rather than only in "add". Add more test cases. add 5817659 fix: remove peerDep, which is not used correctly. add 9088d73 [#12386] Added series.typeNames values values to english lang. add 57dd7a3 Merge pull request #12387 from BrianGilbert/feature/12386-chart-types-english-translation add d0f9bc5 Fix potential security risk add da618e5 put window.open in util add 8cd0789 align with previous add 7887f27 Merge pull request #12380 from susiwen8/target add 796d386 fix(pie): label not show when animation is disabled. fix #12110 (#12243) add 39dc974 fix(line): fix line clip bug in chromium add 4d06b72 Merge pull request #12393 from zhanfang/master add defffbe fix(bmap): fix bmap style changed by the sdk and cause unexpected refresh bug. add 381b21e Merge pull request #12411 from apache/improve-bmap add e9a7b95 fix(line): fix memory explosion issue with gradient, shadow and animation. #12229 add d74fa6c fix(line): tweak the magic number add f6744f1 Merge pull request #12410 from apache/line-fix-memory-explode add ecb4de9 showLoading align center #11790 add b0c950b adapt pr: showLoading align center add 0f63426 update pr: change arc.shape.r to opts.spinnerRadius add 84b1066 update pr: change 4*r to 2*r add d26cd1a update pr: modify the __meta__.json add 8925f40 Merge pull request #12414 from apache/fix-11790 add 6aabb4a Calendar fix for DST add 630551b Merge pull request #12172 from mikeyshing88/calendar-dst-fix add 0c1b295 fix(sunburst): lift sunburst with higher z2 on emphasis add 878829b fix: calendar timezone bug in DST. Fix #12172. And add test cases.
[incubator-echarts] branch merge-release-to-next updated (ce9f1e5 -> 75d9cd8)
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a change to branch merge-release-to-next in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from ce9f1e5 fix: rollback 565535fc9906a78e701819f62de42a0ffb0f674a. That will be compat in preprocessor. add e0a31e3 chore: add sourcemap in esbuild add 1740726 chore: fix sourcemap after add umd wrapper in esbuild add 285be45 chore: use trick to fix sourcemap instead of parsing full to add UMD wrapper. new 75d9cd8 Merge branch 'next' into merge-release-to-next 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: build/dev-fast.js | 40 +++- package-lock.json | 30 +++--- package.json | 1 + 3 files changed, 59 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 01/01: Merge branch 'next' into merge-release-to-next
This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch merge-release-to-next in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git commit 75d9cd81d4c3ba748ecec13bf39c26a7e90ebde0 Merge: ce9f1e5 285be45 Author: 100pah AuthorDate: Wed May 27 15:17:44 2020 +0800 Merge branch 'next' into merge-release-to-next build/dev-fast.js | 40 +++- package-lock.json | 30 +++--- package.json | 1 + 3 files changed, 59 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch merge-release-to-next updated: fix: rollback 565535fc9906a78e701819f62de42a0ffb0f674a. That will be compat in preprocessor.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch merge-release-to-next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/merge-release-to-next by this
push:
new ce9f1e5 fix: rollback 565535fc9906a78e701819f62de42a0ffb0f674a. That
will be compat in preprocessor.
ce9f1e5 is described below
commit ce9f1e596747fdde5603389592c32af45a25cb6b
Author: 100pah
AuthorDate: Wed May 27 15:08:02 2020 +0800
fix: rollback 565535fc9906a78e701819f62de42a0ffb0f674a. That will be compat
in preprocessor.
---
src/chart/bar/BarSeries.ts| 6 +--
src/chart/bar/BarView.ts | 24 -
src/chart/bar/barItemStyle.ts | 117 --
3 files changed, 12 insertions(+), 135 deletions(-)
diff --git a/src/chart/bar/BarSeries.ts b/src/chart/bar/BarSeries.ts
index 206ad57..dad4736 100644
--- a/src/chart/bar/BarSeries.ts
+++ b/src/chart/bar/BarSeries.ts
@@ -19,7 +19,7 @@
import BaseBarSeriesModel, {BaseBarSeriesOption} from './BaseBarSeries';
import SeriesModel from '../../model/Series';
-import { ItemStyleOption, OptionDataValue, LabelOption,
SeriesStackOptionMixin, ZRColor } from '../../util/types';
+import { ItemStyleOption, OptionDataValue, LabelOption, SeriesStackOptionMixin
} from '../../util/types';
import type Cartesian2D from '../../coord/cartesian/Cartesian2D';
import type Polar from '../../coord/polar/Polar';
import { inheritDefaultOption } from '../../util/component';
@@ -31,10 +31,6 @@ type BarDataValue = OptionDataValue | OptionDataValue[];
export interface BarItemStyleOption extends ItemStyleOption {
// Border radius is not supported for bar on polar
borderRadius?: number | number[]
-// Compat. See `src/chart/bar/barItemStyle`.
-barBorderRadius?: number | number[]
-barBorderColor?: ItemStyleOption['borderColor']
-barBorderWidth?: ItemStyleOption['borderWidth']
}
export interface BarDataItemOption {
name?: string
diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index 2a5710e..299a46f 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -46,11 +46,9 @@ import type { RectLike } from
'zrender/src/core/BoundingRect';
import type Model from '../../model/Model';
import { isCoordinateSystemType } from '../../coord/CoordinateSystem';
import { getDefaultLabel } from '../helper/labelHelper';
-import {
-getBarItemStyle, fixBarItemStyle, getBarItemModelBorderWidth,
-getBarBorderColor, getBarBorderRadius, getBarItemModelBorderRadius
-} from './barItemStyle';
+const BAR_BORDER_WIDTH_QUERY = ['itemStyle', 'borderWidth'] as const;
+const BAR_BORDER_RADIUS_QUERY = ['itemStyle', 'borderRadius'] as const;
const _eventPos = [0, 0];
const mathMax = Math.max;
@@ -169,7 +167,7 @@ class BarView extends ChartView {
const drawBackground = seriesModel.get('showBackground', true);
const backgroundModel = seriesModel.getModel('backgroundStyle');
-const barBorderRadius = getBarBorderRadius(backgroundModel) || 0;
+const barBorderRadius = backgroundModel.get('borderRadius') || 0;
const bgEls: BarView['_backgroundEls'] = [];
const oldBgEls = this._backgroundEls;
@@ -182,7 +180,7 @@ class BarView extends ChartView {
if (drawBackground) {
const bgLayout = getLayout[coord.type](data, dataIndex);
const bgEl = createBackgroundEl(coord,
isHorizontalOrRadial, bgLayout);
-bgEl.useStyle(getBarItemStyle(backgroundModel));
+bgEl.useStyle(backgroundModel.getItemStyle());
// Only cartesian2d support borderRadius.
if (coord.type === 'cartesian2d') {
(bgEl as Rect).setShape('r', barBorderRadius);
@@ -222,7 +220,7 @@ class BarView extends ChartView {
if (drawBackground) {
const bgEl = oldBgEls[oldIndex];
-bgEl.useStyle(getBarItemStyle(backgroundModel));
+bgEl.useStyle(backgroundModel.getItemStyle());
// Only cartesian2d support borderRadius.
if (coord.type === 'cartesian2d') {
(bgEl as Rect).setShape('r', barBorderRadius);
@@ -556,13 +554,13 @@ function updateStyle(
isPolar: boolean
) {
const style = data.getItemVisual(dataIndex, 'style');
-const hoverStyle = getBarItemStyle(itemModel.getModel(['emphasis',
'itemStyle']));
+const hoverStyle = itemModel.getModel(['emphasis',
'itemStyle']).getItemStyle();
if (!isPolar) {
-(el as Rect).setShape('r', getBarItemModelBorderRadius(itemModel) ||
0);
+(el as Rect).setShape('r', itemModel.get(BAR_BORDER_RADIUS_QUERY) ||
0);
}
-el.useStyle(fixBarItemStyle(itemModel, style));
+el.useStyle(style);
el.ignore =
[GitHub] [incubator-echarts] lyc017 commented on pull request #11457: Fix #10412
lyc017 commented on pull request #11457: URL: https://github.com/apache/incubator-echarts/pull/11457#issuecomment-634471572 现在树图的symbol不支持image://形式了吗 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 01/02: Merge branch 'next' into label-enhancement
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch label-enhancement in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git commit bda15a29b7431ce833fcc58f1cceb5a720e9d57c Merge: 7f53a78 285be45 Author: pissang AuthorDate: Wed May 27 13:45:36 2020 +0800 Merge branch 'next' into label-enhancement build/dev-fast.js | 37 +++-- package.json | 1 - 2 files changed, 23 insertions(+), 15 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch label-enhancement updated (7f53a78 -> 6fa462f)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch label-enhancement in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from 7f53a78 Merge branch 'next' into label-enhancement add 285be45 chore: use trick to fix sourcemap instead of parsing full to add UMD wrapper. new bda15a2 Merge branch 'next' into label-enhancement new 6fa462f fix: compat barBorderXXX in backgroundStyle. rename barBorderRadius to borderRadius The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build/dev-fast.js | 37 +++-- package.json | 1 - src/chart/bar/BarSeries.ts | 2 +- src/chart/bar/BarView.ts | 2 +- 4 files changed, 25 insertions(+), 17 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 02/02: fix: compat barBorderXXX in backgroundStyle. rename barBorderRadius to borderRadius
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 6fa462fcdb712585164a41e3a0034cb4002ca73b
Author: pissang
AuthorDate: Wed May 27 14:57:55 2020 +0800
fix: compat barBorderXXX in backgroundStyle. rename barBorderRadius to
borderRadius
---
src/chart/bar/BarSeries.ts | 2 +-
src/chart/bar/BarView.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/chart/bar/BarSeries.ts b/src/chart/bar/BarSeries.ts
index 7d3c9b9..c21e0d5 100644
--- a/src/chart/bar/BarSeries.ts
+++ b/src/chart/bar/BarSeries.ts
@@ -32,7 +32,7 @@ export interface BarItemStyleOption extends ItemStyleOption {
/**
* Border radius is not supported for bar on polar
*/
-barBorderRadius?: number | number[]
+borderRadius?: number | number[]
}
export interface BarDataItemOption {
name?: string
diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index dd88cef..90b3777 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -543,7 +543,7 @@ function updateStyle(
const hoverStyle = itemModel.getModel(['emphasis',
'itemStyle']).getItemStyle();
if (!isPolar) {
-(el as Rect).setShape('r', itemModel.get(['itemStyle',
'barBorderRadius']) || 0);
+(el as Rect).setShape('r', itemModel.get(['itemStyle',
'borderRadius']) || 0);
}
el.useStyle(style);
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart removed a comment on issue #12703: 树图自定义symbol在firefox无法正常显示
plainheart removed a comment on issue #12703: URL: https://github.com/apache/incubator-echarts/issues/12703#issuecomment-634383709 如果可以显示 那应该是另外的Bug了~ This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[GitHub] [incubator-echarts] plainheart edited a comment on issue #12703: 树图自定义symbol在firefox无法正常显示
plainheart edited a comment on issue #12703: URL: https://github.com/apache/incubator-echarts/issues/12703#issuecomment-634383512 Chrome不用点击也能显示图标吗？如果可以显示 那应该是另外的Bug了~ This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
