You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2018/09/11 18:50:21 UTC
[incubator-echarts] branch release updated: Fix default text style
bug (brought by previous optimize).
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/release by this push:
new 229e15a Fix default text style bug (brought by previous optimize).
229e15a is described below
commit 229e15a66043eaaf20be74246d8c038ca9261b2a
Author: sushuang <su...@gmail.com>
AuthorDate: Wed Sep 12 02:50:00 2018 +0800
Fix default text style bug (brought by previous optimize).
---
src/util/graphic.js | 7 +++++--
test/axis-interval.html | 4 +++-
test/bar.html | 5 ++++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/util/graphic.js b/src/util/graphic.js
index 2f73fd2..97bc53e 100644
--- a/src/util/graphic.js
+++ b/src/util/graphic.js
@@ -811,11 +811,14 @@ function getAutoColor(color, opt) {
// text position changing when hovering or being emphasis should be
// considered, where the `insideRollback` enables to restore the style.
function applyDefaultTextStyle(textStyle) {
- if (textStyle.textFill != null) {
+ var opt = textStyle.insideRollbackOpt;
+
+ // Only insideRollbackOpt create (setTextStyleCommon used),
+ // applyDefaultTextStyle works.
+ if (!opt || textStyle.textFill != null) {
return;
}
- var opt = textStyle.insideRollbackOpt;
var useInsideStyle = opt.useInsideStyle;
var textPosition = textStyle.insideRawTextPosition;
var insideRollback;
diff --git a/test/axis-interval.html b/test/axis-interval.html
index 70ae3ab..a5c49ba 100644
--- a/test/axis-interval.html
+++ b/test/axis-interval.html
@@ -100,7 +100,9 @@ under the License.
},
xAxis: {
type: 'time',
- splitNumber: 7
+ minInterval: 3600 * 1000,
+ maxInterval: 3600 * 1000
+ // splitNumber: 7
},
yAxis: {},
series: [
diff --git a/test/bar.html b/test/bar.html
index d0a1cde..a92e5fd 100644
--- a/test/bar.html
+++ b/test/bar.html
@@ -138,7 +138,7 @@ under the License.
xAxisIndex: 0
},
toolbox: {
- top: 25,
+ top: 50,
// right: 20,
feature: {
magicType: {
@@ -179,6 +179,9 @@ under the License.
}
},
tooltip: {},
+ grid: {
+ top: 100
+ },
xAxis: {
data: xAxisData,
name: '横轴',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org