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 2020/01/06 20:10:06 UTC
[incubator-echarts] branch fix/some-codestyle created (now fc76747)
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a change to branch fix/some-codestyle
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
at fc76747 fix: tweak code for 9269cf35 and add remove handle.
This branch includes the following new commits:
new 7e4b4d6 fix: tweak some code style.
new fc76747 fix: tweak code for 9269cf35 and add remove handle.
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-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 02/02: fix: tweak code for 9269cf35 and add
remove handle.
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch fix/some-codestyle
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit fc76747933d47ee365c821c720af28997d5a042a
Author: 100pah <su...@gmail.com>
AuthorDate: Tue Jan 7 03:57:03 2020 +0800
fix: tweak code for 9269cf35 and add remove handle.
---
src/component/axis/CartesianAxisView.js | 89 +------------------------
src/component/axis/SingleAxisView.js | 101 +++-------------------------
src/component/axis/axisSplitHelper.js | 114 ++++++++++++++++++++++++++++++++
test/singleAxisScales.html | 14 +++-
4 files changed, 138 insertions(+), 180 deletions(-)
diff --git a/src/component/axis/CartesianAxisView.js b/src/component/axis/CartesianAxisView.js
index 28e80b4..25cb65a 100644
--- a/src/component/axis/CartesianAxisView.js
+++ b/src/component/axis/CartesianAxisView.js
@@ -22,6 +22,7 @@ import * as graphic from '../../util/graphic';
import AxisBuilder from './AxisBuilder';
import AxisView from './AxisView';
import * as cartesianAxisHelper from '../../coord/cartesian/cartesianAxisHelper';
+import {rectCoordAxisBuildSplitArea, rectCoordAxisHandleRemove} from './axisSplitHelper';
var axisBuilderAttrs = [
'axisLine', 'axisTickLabel', 'axisName'
@@ -74,7 +75,7 @@ var CartesianAxisView = AxisView.extend({
},
remove: function () {
- this._splitAreaColors = null;
+ rectCoordAxisHandleRemove(this);
},
/**
@@ -206,91 +207,7 @@ var CartesianAxisView = AxisView.extend({
* @private
*/
_splitArea: function (axisModel, gridModel) {
- var axis = axisModel.axis;
-
- if (axis.scale.isBlank()) {
- return;
- }
-
- var splitAreaModel = axisModel.getModel('splitArea');
- var areaStyleModel = splitAreaModel.getModel('areaStyle');
- var areaColors = areaStyleModel.get('color');
-
- var gridRect = gridModel.coordinateSystem.getRect();
-
- var ticksCoords = axis.getTicksCoords({
- tickModel: splitAreaModel,
- clamp: true
- });
-
- if (!ticksCoords.length) {
- return;
- }
-
- // For Making appropriate splitArea animation, the color and anid
- // should be corresponding to previous one if possible.
- var areaColorsLen = areaColors.length;
- var lastSplitAreaColors = this._splitAreaColors;
- var newSplitAreaColors = zrUtil.createHashMap();
- var colorIndex = 0;
- if (lastSplitAreaColors) {
- for (var i = 0; i < ticksCoords.length; i++) {
- var cIndex = lastSplitAreaColors.get(ticksCoords[i].tickValue);
- if (cIndex != null) {
- colorIndex = (cIndex + (areaColorsLen - 1) * i) % areaColorsLen;
- break;
- }
- }
- }
-
- var prev = axis.toGlobalCoord(ticksCoords[0].coord);
-
- var areaStyle = areaStyleModel.getAreaStyle();
- areaColors = zrUtil.isArray(areaColors) ? areaColors : [areaColors];
-
- for (var i = 1; i < ticksCoords.length; i++) {
- var tickCoord = axis.toGlobalCoord(ticksCoords[i].coord);
-
- var x;
- var y;
- var width;
- var height;
- if (axis.isHorizontal()) {
- x = prev;
- y = gridRect.y;
- width = tickCoord - x;
- height = gridRect.height;
- prev = x + width;
- }
- else {
- x = gridRect.x;
- y = prev;
- width = gridRect.width;
- height = tickCoord - y;
- prev = y + height;
- }
-
- var tickValue = ticksCoords[i - 1].tickValue;
- tickValue != null && newSplitAreaColors.set(tickValue, colorIndex);
-
- this._axisGroup.add(new graphic.Rect({
- anid: tickValue != null ? 'area_' + tickValue : null,
- shape: {
- x: x,
- y: y,
- width: width,
- height: height
- },
- style: zrUtil.defaults({
- fill: areaColors[colorIndex]
- }, areaStyle),
- silent: true
- }));
-
- colorIndex = (colorIndex + 1) % areaColorsLen;
- }
-
- this._splitAreaColors = newSplitAreaColors;
+ rectCoordAxisBuildSplitArea(this, this._axisGroup, axisModel, gridModel);
}
});
diff --git a/src/component/axis/SingleAxisView.js b/src/component/axis/SingleAxisView.js
index fac2662..cec2c1f 100644
--- a/src/component/axis/SingleAxisView.js
+++ b/src/component/axis/SingleAxisView.js
@@ -23,6 +23,7 @@ import AxisBuilder from './AxisBuilder';
import * as graphic from '../../util/graphic';
import * as singleAxisHelper from '../../coord/single/singleAxisHelper';
import AxisView from './AxisView';
+import {rectCoordAxisBuildSplitArea, rectCoordAxisHandleRemove} from './axisSplitHelper';
var axisBuilderAttrs = [
'axisLine', 'axisTickLabel', 'axisName'
@@ -54,10 +55,9 @@ var SingleAxisView = AxisView.extend({
group.add(this._axisGroup);
group.add(axisBuilder.getGroup());
- var gridModel = axisModel.getCoordSysModel();
zrUtil.each(selfBuilderAttrs, function (name) {
if (axisModel.get(name + '.show')) {
- this['_' + name](axisModel, gridModel);
+ this['_' + name](axisModel);
}
}, this);
@@ -66,6 +66,10 @@ var SingleAxisView = AxisView.extend({
SingleAxisView.superCall(this, 'render', axisModel, ecModel, api, payload);
},
+ remove: function () {
+ rectCoordAxisHandleRemove(this);
+ },
+
_splitLine: function (axisModel) {
var axis = axisModel.axis;
@@ -136,97 +140,8 @@ var SingleAxisView = AxisView.extend({
}
},
- /**
- * @param {module:echarts/coord/cartesian/AxisModel} axisModel
- * @param {module:echarts/coord/cartesian/GridModel} gridModel
- * @private
- */
- _splitArea: function (axisModel, gridModel) {
- var axis = axisModel.axis;
-
- if (axis.scale.isBlank()) {
- return;
- }
-
- var splitAreaModel = axisModel.getModel('splitArea');
- var areaStyleModel = splitAreaModel.getModel('areaStyle');
- var areaColors = areaStyleModel.get('color');
-
- var gridRect = gridModel.coordinateSystem.getRect();
-
- var ticksCoords = axis.getTicksCoords({
- tickModel: splitAreaModel,
- clamp: true
- });
-
- if (!ticksCoords.length) {
- return;
- }
-
- // For Making appropriate splitArea animation, the color and anid
- // should be corresponding to previous one if possible.
- var areaColorsLen = areaColors.length;
- var lastSplitAreaColors = this._splitAreaColors;
- var newSplitAreaColors = zrUtil.createHashMap();
- var colorIndex = 0;
- if (lastSplitAreaColors) {
- for (var i = 0; i < ticksCoords.length; i++) {
- var cIndex = lastSplitAreaColors.get(ticksCoords[i].tickValue);
- if (cIndex != null) {
- colorIndex = (cIndex + (areaColorsLen - 1) * i) % areaColorsLen;
- break;
- }
- }
- }
-
- var prev = axis.toGlobalCoord(ticksCoords[0].coord);
-
- var areaStyle = areaStyleModel.getAreaStyle();
- areaColors = zrUtil.isArray(areaColors) ? areaColors : [areaColors];
-
- for (var i = 1; i < ticksCoords.length; i++) {
- var tickCoord = axis.toGlobalCoord(ticksCoords[i].coord);
-
- var x;
- var y;
- var width;
- var height;
- if (axis.isHorizontal()) {
- x = prev;
- y = gridRect.y;
- width = tickCoord - x;
- height = gridRect.height;
- prev = x + width;
- }
- else {
- x = gridRect.x;
- y = prev;
- width = gridRect.width;
- height = tickCoord - y;
- prev = y + height;
- }
-
- var tickValue = ticksCoords[i - 1].tickValue;
- tickValue != null && newSplitAreaColors.set(tickValue, colorIndex);
-
- this._axisGroup.add(new graphic.Rect({
- anid: tickValue != null ? 'area_' + tickValue : null,
- shape: {
- x: x,
- y: y,
- width: width,
- height: height
- },
- style: zrUtil.defaults({
- fill: areaColors[colorIndex]
- }, areaStyle),
- silent: true
- }));
-
- colorIndex = (colorIndex + 1) % areaColorsLen;
- }
-
- this._splitAreaColors = newSplitAreaColors;
+ _splitArea: function (axisModel) {
+ rectCoordAxisBuildSplitArea(this, this._axisGroup, axisModel, axisModel);
}
});
diff --git a/src/component/axis/axisSplitHelper.js b/src/component/axis/axisSplitHelper.js
new file mode 100644
index 0000000..34ef562
--- /dev/null
+++ b/src/component/axis/axisSplitHelper.js
@@ -0,0 +1,114 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+import * as zrUtil from 'zrender/src/core/util';
+import * as graphic from '../../util/graphic';
+
+
+export function rectCoordAxisBuildSplitArea(axisView, axisGroup, axisModel, gridModel) {
+ var axis = axisModel.axis;
+
+ if (axis.scale.isBlank()) {
+ return;
+ }
+
+ var splitAreaModel = axisModel.getModel('splitArea');
+ var areaStyleModel = splitAreaModel.getModel('areaStyle');
+ var areaColors = areaStyleModel.get('color');
+
+ var gridRect = gridModel.coordinateSystem.getRect();
+
+ var ticksCoords = axis.getTicksCoords({
+ tickModel: splitAreaModel,
+ clamp: true
+ });
+
+ if (!ticksCoords.length) {
+ return;
+ }
+
+ // For Making appropriate splitArea animation, the color and anid
+ // should be corresponding to previous one if possible.
+ var areaColorsLen = areaColors.length;
+ var lastSplitAreaColors = axisView.__splitAreaColors;
+ var newSplitAreaColors = zrUtil.createHashMap();
+ var colorIndex = 0;
+ if (lastSplitAreaColors) {
+ for (var i = 0; i < ticksCoords.length; i++) {
+ var cIndex = lastSplitAreaColors.get(ticksCoords[i].tickValue);
+ if (cIndex != null) {
+ colorIndex = (cIndex + (areaColorsLen - 1) * i) % areaColorsLen;
+ break;
+ }
+ }
+ }
+
+ var prev = axis.toGlobalCoord(ticksCoords[0].coord);
+
+ var areaStyle = areaStyleModel.getAreaStyle();
+ areaColors = zrUtil.isArray(areaColors) ? areaColors : [areaColors];
+
+ for (var i = 1; i < ticksCoords.length; i++) {
+ var tickCoord = axis.toGlobalCoord(ticksCoords[i].coord);
+
+ var x;
+ var y;
+ var width;
+ var height;
+ if (axis.isHorizontal()) {
+ x = prev;
+ y = gridRect.y;
+ width = tickCoord - x;
+ height = gridRect.height;
+ prev = x + width;
+ }
+ else {
+ x = gridRect.x;
+ y = prev;
+ width = gridRect.width;
+ height = tickCoord - y;
+ prev = y + height;
+ }
+
+ var tickValue = ticksCoords[i - 1].tickValue;
+ tickValue != null && newSplitAreaColors.set(tickValue, colorIndex);
+
+ axisGroup.add(new graphic.Rect({
+ anid: tickValue != null ? 'area_' + tickValue : null,
+ shape: {
+ x: x,
+ y: y,
+ width: width,
+ height: height
+ },
+ style: zrUtil.defaults({
+ fill: areaColors[colorIndex]
+ }, areaStyle),
+ silent: true
+ }));
+
+ colorIndex = (colorIndex + 1) % areaColorsLen;
+ }
+
+ axisView.__splitAreaColors = newSplitAreaColors;
+}
+
+export function rectCoordAxisHandleRemove(axisView) {
+ axisView.__splitAreaColors = null;
+}
diff --git a/test/singleAxisScales.html b/test/singleAxisScales.html
index 63a9895..eb5a995 100644
--- a/test/singleAxisScales.html
+++ b/test/singleAxisScales.html
@@ -108,7 +108,10 @@ under the License.
singleAxis: [{
type: 'value',
id: 'a',
- height: height
+ height: height,
+ splitArea: {
+ show: true
+ }
}, {
type: 'category',
id: 'b',
@@ -117,6 +120,9 @@ under the License.
axisPointer: {
type: 'shadow'
},
+ splitArea: {
+ show: true
+ },
top: '27%'
}, {
type: 'log',
@@ -128,10 +134,16 @@ under the License.
show: true
}
},
+ splitArea: {
+ show: true
+ },
top: '55%'
}, {
type: 'time',
id: 'd',
+ splitArea: {
+ show: true
+ },
height: height,
top: '77%'
}],
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/02: fix: tweak some code style.
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch fix/some-codestyle
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 7e4b4d67f8c38978b3e5a1b9126141b59a75ed32
Author: 100pah <su...@gmail.com>
AuthorDate: Tue Jan 7 03:25:00 2020 +0800
fix: tweak some code style.
---
src/component/legend/ScrollableLegendView.js | 37 ++++++++++++++--------------
src/component/marker/markerHelper.js | 6 ++---
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/component/legend/ScrollableLegendView.js b/src/component/legend/ScrollableLegendView.js
index 668f2dc..8962f6b 100644
--- a/src/component/legend/ScrollableLegendView.js
+++ b/src/component/legend/ScrollableLegendView.js
@@ -459,29 +459,28 @@ var ScrollableLegendView = LegendView.extend({
},
_findTargetItemIndex: function (targetDataIndex) {
+ if (!this._showController) {
+ return 0;
+ }
+
var index;
var contentGroup = this.getContentGroup();
var defaultIndex;
- if (this._showController) {
- contentGroup.eachChild(function (child, idx) {
- var legendDataIdx = child.__legendDataIndex;
- // FIXME
- // If the given targetDataIndex (from model) is illegal,
- // we use defualtIndex. But the index on the legend model and
- // action payload is still illegal. That case will not be
- // changed until some scenario requires.
- if (defaultIndex == null && legendDataIdx != null) {
- defaultIndex = idx;
- }
- if (legendDataIdx === targetDataIndex) {
- index = idx;
- }
- });
- }
- else {
- return 0;
- }
+ contentGroup.eachChild(function (child, idx) {
+ var legendDataIdx = child.__legendDataIndex;
+ // FIXME
+ // If the given targetDataIndex (from model) is illegal,
+ // we use defualtIndex. But the index on the legend model and
+ // action payload is still illegal. That case will not be
+ // changed until some scenario requires.
+ if (defaultIndex == null && legendDataIdx != null) {
+ defaultIndex = idx;
+ }
+ if (legendDataIdx === targetDataIndex) {
+ index = idx;
+ }
+ });
return index != null ? index : defaultIndex;
}
diff --git a/src/component/marker/markerHelper.js b/src/component/marker/markerHelper.js
index 01f67ed..85308b0 100644
--- a/src/component/marker/markerHelper.js
+++ b/src/component/marker/markerHelper.js
@@ -78,7 +78,7 @@ function markerTypeCalculatorWithExtent(
coordArr[targetCoordIndex] = +coordArr[targetCoordIndex].toFixed(precision);
}
- return [coordArr,coordArrValue];
+ return [coordArr, coordArrValue];
}
var curry = zrUtil.curry;
@@ -146,8 +146,8 @@ export function dataTransform(seriesModel, item) {
otherCoordIndex, targetCoordIndex
);
item.coord = coordInfo[0]
- // Force to use the value of calculated value.
- // let item use the value without stack.
+ // Force to use the value of calculated value.
+ // let item use the value without stack.
item.value = coordInfo[1]
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org