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 2019/01/12 17:28:38 UTC
[incubator-echarts] branch release updated (03f5a98 -> 36a30df)
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a change to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from 03f5a98 Fix #9479 (Edge roam available)
add 660d213 Move 3a73d3a (Fix #9407) to release branch.
new 7d2908f (1) Fix map rich label missing when missing data (2) Fix map label miss to enter formatter when missing data. (3) Fix #9682
new 066d7c4 Fix that emphasis listener added repeatly.
new 36a30df Fix that emphasis listener added repeatly.
The 3 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.js | 1301 +++++++++++++--------------------------
dist/echarts.js.map | 2 +-
src/chart/map/MapSeries.js | 59 +-
src/chart/map/MapView.js | 134 ++--
src/component/helper/MapDraw.js | 6 +-
src/data/List.js | 129 +++-
src/model/Model.js | 2 +-
src/util/graphic.js | 7 +-
test/map.html | 199 +++++-
9 files changed, 827 insertions(+), 1012 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 02/03: Fix that emphasis listener added
repeatly.
Posted by su...@apache.org.
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
commit 066d7c4128dd6f1de80512bf084b9d37ea1e3d07
Author: sushuang <su...@gmail.com>
AuthorDate: Sun Jan 13 01:07:21 2019 +0800
Fix that emphasis listener added repeatly.
---
src/chart/map/MapView.js | 100 +++++++++++++++++++++++++++++++++--------------
test/map.html | 11 +++++-
2 files changed, 79 insertions(+), 32 deletions(-)
diff --git a/src/chart/map/MapView.js b/src/chart/map/MapView.js
index 5260f8a..b128f6a 100644
--- a/src/chart/map/MapView.js
+++ b/src/chart/map/MapView.js
@@ -22,6 +22,9 @@ import * as zrUtil from 'zrender/src/core/util';
import * as graphic from '../../util/graphic';
import MapDraw from '../../component/helper/MapDraw';
+var HIGH_DOWN_PROP = '__seriesMapHighDown';
+var RECORD_VERSION_PROP = '__seriesMapCallKey';
+
export default echarts.extendChartView({
type: 'map',
@@ -139,7 +142,7 @@ export default echarts.extendChartView({
var labelModel = itemModel.getModel('label');
var hoverLabelModel = itemModel.getModel('emphasis.label');
- var polygonGroups = fullData.getItemGraphicEl(fullIndex);
+ var regionGroup = fullData.getItemGraphicEl(fullIndex);
// `getFormattedLabel` needs to use `getData` inside. Here
// `mapModel.getData()` is shallow cloned from `mainSeries.getData()`.
@@ -157,37 +160,74 @@ export default echarts.extendChartView({
normalText
);
- var onEmphasis = function () {
- var hoverStyle = graphic.setTextStyle({}, hoverLabelModel, {
- text: hoverLabelModel.get('show') ? emphasisText : null
- }, {isRectText: true, useInsideStyle: false}, true);
- circle.style.extendFrom(hoverStyle);
- // Make label upper than others if overlaps.
- circle.__mapOriginalZ2 = circle.z2;
- circle.z2 += graphic.Z2_EMPHASIS_LIFT;
- };
-
- var onNormal = function () {
- graphic.setTextStyle(circle.style, labelModel, {
- text: labelModel.get('show') ? normalText : null,
- textPosition: labelModel.getShallow('position') || 'bottom'
- }, {isRectText: true, useInsideStyle: false});
-
- if (circle.__mapOriginalZ2 != null) {
- circle.z2 = circle.__mapOriginalZ2;
- circle.__mapOriginalZ2 = null;
- }
- };
-
- polygonGroups.on('mouseover', onEmphasis)
- .on('mouseout', onNormal)
- .on('emphasis', onEmphasis)
- .on('normal', onNormal);
-
- onNormal();
+ var highDownRecord = regionGroup[HIGH_DOWN_PROP];
+ var recordVersion = Math.random();
+
+ // Prevent from register listeners duplicatedly when roaming.
+ if (!highDownRecord) {
+ highDownRecord = regionGroup[HIGH_DOWN_PROP] = {};
+ var onEmphasis = zrUtil.curry(onRegionHighDown, true);
+ var onNormal = zrUtil.curry(onRegionHighDown, false);
+ regionGroup.on('mouseover', onEmphasis)
+ .on('mouseout', onNormal)
+ .on('emphasis', onEmphasis)
+ .on('normal', onNormal);
+ }
+
+ // Prevent removed regions effect current grapics.
+ regionGroup[RECORD_VERSION_PROP] = recordVersion;
+ zrUtil.extend(highDownRecord, {
+ recordVersion: recordVersion,
+ circle: circle,
+ labelModel: labelModel,
+ hoverLabelModel: hoverLabelModel,
+ emphasisText: emphasisText,
+ normalText: normalText
+ });
+
+ // FIXME
+ // Consider set option when emphasis.
+ enterRegionHighDown(highDownRecord, false);
}
group.add(circle);
});
}
-});
\ No newline at end of file
+});
+
+function onRegionHighDown(toHighOrDown) {
+ var highDownRecord = this[HIGH_DOWN_PROP];
+ if (highDownRecord && highDownRecord.recordVersion === this[RECORD_VERSION_PROP]) {
+ enterRegionHighDown(highDownRecord, toHighOrDown);
+ }
+}
+
+function enterRegionHighDown(highDownRecord, toHighOrDown) {
+ var circle = highDownRecord.circle;
+ var labelModel = highDownRecord.labelModel;
+ var hoverLabelModel = highDownRecord.hoverLabelModel;
+ var emphasisText = highDownRecord.emphasisText;
+ var normalText = highDownRecord.normalText;
+
+ if (toHighOrDown) {
+ circle.style.extendFrom(
+ graphic.setTextStyle({}, hoverLabelModel, {
+ text: hoverLabelModel.get('show') ? emphasisText : null
+ }, {isRectText: true, useInsideStyle: false}, true)
+ );
+ // Make label upper than others if overlaps.
+ circle.__mapOriginalZ2 = circle.z2;
+ circle.z2 += graphic.Z2_EMPHASIS_LIFT;
+ }
+ else {
+ graphic.setTextStyle(circle.style, labelModel, {
+ text: labelModel.get('show') ? normalText : null,
+ textPosition: labelModel.getShallow('position') || 'bottom'
+ }, {isRectText: true, useInsideStyle: false});
+
+ if (circle.__mapOriginalZ2 != null) {
+ circle.z2 = circle.__mapOriginalZ2;
+ circle.__mapOriginalZ2 = null;
+ }
+ }
+}
diff --git a/test/map.html b/test/map.html
index ab1d216..52ce549 100644
--- a/test/map.html
+++ b/test/map.html
@@ -310,7 +310,10 @@ under the License.
}
},
emphasis: {
- label: {show: true}
+ label: {
+ show: true,
+ backgroundColor: '#fcf'
+ },
},
data:[
{name: '北京',value: 234},
@@ -341,7 +344,10 @@ under the License.
}
},
emphasis: {
- label: {show: true}
+ label: {
+ show: true,
+ backgroundColor: '#ccc'
+ }
},
data:[
{name: '北京',value: 567},
@@ -357,6 +363,7 @@ under the License.
title: [
'1. 北京、天津、河北 rich text 正常倾斜（河北竖直）（其他 region 都没数据，显示 NaN）',
'2. selectedMode: "multiple"',
+ '3. hover 时标签底色变红',
'所有 label 样式一致（例外：没数据的 label 并不 rotate，因为这还没支持）'
]
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 03/03: Fix that emphasis listener added
repeatly.
Posted by su...@apache.org.
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
commit 36a30dfeedcfc536e6b1e4fd5bbe008c85e7dae4
Author: sushuang <su...@gmail.com>
AuthorDate: Sun Jan 13 01:28:17 2019 +0800
Fix that emphasis listener added repeatly.
---
src/chart/map/MapView.js | 2 ++
test/map.html | 21 +++++++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/chart/map/MapView.js b/src/chart/map/MapView.js
index b128f6a..bcf9694 100644
--- a/src/chart/map/MapView.js
+++ b/src/chart/map/MapView.js
@@ -224,6 +224,8 @@ function enterRegionHighDown(highDownRecord, toHighOrDown) {
text: labelModel.get('show') ? normalText : null,
textPosition: labelModel.getShallow('position') || 'bottom'
}, {isRectText: true, useInsideStyle: false});
+ // Trigger normalize style like padding.
+ circle.dirty(false);
if (circle.__mapOriginalZ2 != null) {
circle.z2 = circle.__mapOriginalZ2;
diff --git a/test/map.html b/test/map.html
index 52ce549..d3e8493 100644
--- a/test/map.html
+++ b/test/map.html
@@ -32,7 +32,7 @@ under the License.
</head>
<body>
- <!-- <div id="main0"></div> -->
+ <div id="main0"></div>
<div id="main1"></div>
@@ -61,8 +61,7 @@ under the License.
var option = {
tooltip: {},
title : {
- text: '内蒙古和青海没数据也要能被选中',
- subtext: '纯属虚构',
+ text: '内蒙古 青海 没数据也要能被选中',
left: 'center'
},
legend: {
@@ -182,7 +181,7 @@ under the License.
{name: '浙江',value: Math.round(Math.random()*1000)},
{name: '江西',value: Math.round(Math.random()*1000)},
{name: '山西',value: Math.round(Math.random()*1000)},
- {name: '内蒙古',value: Math.round(Math.random()*1000)},
+ // {name: '内蒙古',value: 891},
{name: '吉林',value: Math.round(Math.random()*1000)},
{name: '福建',value: Math.round(Math.random()*1000)},
{name: '广东',value: Math.round(Math.random()*1000)},
@@ -316,8 +315,11 @@ under the License.
},
},
data:[
- {name: '北京',value: 234},
- {name: '天津',value: 432}
+ {name: '北京', value: 234},
+ {name: '天津', value: 432},
+ {name: '新疆', value: 100},
+ {name: '陕西', value: 77},
+ {name: '西藏', value: 101},
]
},
{
@@ -346,12 +348,15 @@ under the License.
emphasis: {
label: {
show: true,
- backgroundColor: '#ccc'
+ backgroundColor: '#fcf'
}
},
data:[
{name: '北京',value: 567},
- {name: '河北',value: 321}
+ {name: '河北',value: 321},
+ {name: '新疆', value: 100},
+ {name: '内蒙古', value: 99},
+ {name: '西藏', value: 101}
]
}
]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/03: (1) Fix map rich label missing when
missing data (2) Fix map label miss to enter formatter when missing data.
(3) Fix #9682
Posted by su...@apache.org.
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
commit 7d2908fb3a430df976d3df56083aa10dafd3e32d
Author: sushuang <su...@gmail.com>
AuthorDate: Sun Jan 13 00:05:56 2019 +0800
(1) Fix map rich label missing when missing data
(2) Fix map label miss to enter formatter when missing data.
(3) Fix #9682
---
src/chart/map/MapSeries.js | 59 +++++++------
src/chart/map/MapView.js | 34 ++++++--
src/component/helper/MapDraw.js | 6 +-
src/data/List.js | 119 ++++++++++++++++++++------
src/model/Model.js | 2 +-
src/util/graphic.js | 7 +-
test/map.html | 181 +++++++++++++++++++++++++++++++++++-----
7 files changed, 318 insertions(+), 90 deletions(-)
diff --git a/src/chart/map/MapSeries.js b/src/chart/map/MapSeries.js
index 00b05da..3404495 100644
--- a/src/chart/map/MapSeries.js
+++ b/src/chart/map/MapSeries.js
@@ -23,7 +23,7 @@ import SeriesModel from '../../model/Series';
import {encodeHTML, addCommas} from '../../util/format';
import dataSelectableMixin from '../../component/helper/selectableMixin';
import {retrieveRawAttr} from '../../data/helper/dataProvider';
-import geoCreator from '../../coord/geo/geoCreator';
+import geoSourceManager from '../../coord/geo/geoSourceManager';
var MapSeries = SeriesModel.extend({
@@ -45,43 +45,40 @@ var MapSeries = SeriesModel.extend({
*/
seriesGroup: [],
- init: function (option) {
-
- // this._fillOption(option, this.getMapType());
- // this.option = option;
-
- MapSeries.superApply(this, 'init', arguments);
-
- this.updateSelectedMap(this._createSelectableList());
- },
-
getInitialData: function (option) {
- return createListSimply(this, ['value']);
- },
-
- mergeOption: function (newOption) {
- // this._fillOption(newOption, this.getMapType());
-
- MapSeries.superApply(this, 'mergeOption', arguments);
-
- this.updateSelectedMap(this._createSelectableList());
- },
-
- _createSelectableList: function () {
- var data = this.getRawData();
+ var data = createListSimply(this, ['value']);
var valueDim = data.mapDimension('value');
- var targetList = [];
+ var dataNameMap = zrUtil.createHashMap();
+ var selectTargetList = [];
+ var toAppendNames = [];
+
for (var i = 0, len = data.count(); i < len; i++) {
- targetList.push({
- name: data.getName(i),
+ var name = data.getName(i);
+ dataNameMap.set(name, true);
+ selectTargetList.push({
+ name: name,
value: data.get(valueDim, i),
selected: retrieveRawAttr(data, i, 'selected')
});
}
- targetList = geoCreator.getFilledRegions(targetList, this.getMapType(), this.option.nameMap);
+ var geoSource = geoSourceManager.load(this.getMapType(), this.option.nameMap);
+ zrUtil.each(geoSource.regions, function (region) {
+ var name = region.name;
+ if (!dataNameMap.get(name)) {
+ selectTargetList.push({name: name});
+ toAppendNames.push(name);
+ }
+ });
+
+ this.updateSelectedMap(selectTargetList);
- return targetList;
+ // Complete data with missing regions. The consequent processes (like visual
+ // map and render) can not be performed without a "full data". For example,
+ // find `dataIndex` by name.
+ data.appendValues([], toAppendNames);
+
+ return data;
},
/**
@@ -99,14 +96,14 @@ var MapSeries = SeriesModel.extend({
return (this.getHostGeoModel() || this).option.map;
},
- _fillOption: function (option, mapName) {
+ // _fillOption: function (option, mapName) {
// Shallow clone
// option = zrUtil.extend({}, option);
// option.data = geoCreator.getFilledRegions(option.data, mapName, option.nameMap);
// return option;
- },
+ // },
getRawValue: function (dataIndex) {
// Use value stored in data instead because it is calculated from multiple series
diff --git a/src/chart/map/MapView.js b/src/chart/map/MapView.js
index 565b0b2..5260f8a 100644
--- a/src/chart/map/MapView.js
+++ b/src/chart/map/MapView.js
@@ -85,12 +85,12 @@ export default echarts.extendChartView({
var originalData = mapModel.originalData;
var group = this.group;
- originalData.each(originalData.mapDimension('value'), function (value, idx) {
+ originalData.each(originalData.mapDimension('value'), function (value, originalDataIndex) {
if (isNaN(value)) {
return;
}
- var layout = originalData.getItemLayout(idx);
+ var layout = originalData.getItemLayout(originalDataIndex);
if (!layout || !layout.point) {
// Not exists in map
@@ -116,28 +116,44 @@ export default echarts.extendChartView({
},
silent: true,
// Do not overlap the first series, on which labels are displayed.
- z2: !offset ? 10 : 8
+ z2: 8 + (!offset ? graphic.Z2_EMPHASIS_LIFT + 1 : 0)
});
- // First data on the same region
+ // Only the series that has the first value on the same region is in charge of rendering the label.
+ // But consider the case:
+ // series: [
+ // {id: 'X', type: 'map', map: 'm', {data: [{name: 'A', value: 11}, {name: 'B', {value: 22}]},
+ // {id: 'Y', type: 'map', map: 'm', {data: [{name: 'A', value: 21}, {name: 'C', {value: 33}]}
+ // ]
+ // The offset `0` of item `A` is at series `X`, but of item `C` is at series `Y`.
+ // For backward compatibility, we follow the rule that render label `A` by the
+ // settings on series `X` but render label `C` by the settings on series `Y`.
if (!offset) {
+
var fullData = mapModel.mainSeries.getData();
- var name = originalData.getName(idx);
+ var name = originalData.getName(originalDataIndex);
var fullIndex = fullData.indexOfName(name);
- var itemModel = originalData.getItemModel(idx);
+ var itemModel = originalData.getItemModel(originalDataIndex);
var labelModel = itemModel.getModel('label');
var hoverLabelModel = itemModel.getModel('emphasis.label');
var polygonGroups = fullData.getItemGraphicEl(fullIndex);
+ // `getFormattedLabel` needs to use `getData` inside. Here
+ // `mapModel.getData()` is shallow cloned from `mainSeries.getData()`.
+ // FIXME
+ // If this is not the `mainSeries`, the item model (like label formatter)
+ // set on original data item will never get. But it has been working
+ // like that from the begining, and this scenario is rarely encountered.
+ // So it won't be fixed until have to.
var normalText = zrUtil.retrieve2(
- mapModel.getFormattedLabel(idx, 'normal'),
+ mapModel.getFormattedLabel(fullIndex, 'normal'),
name
);
var emphasisText = zrUtil.retrieve2(
- mapModel.getFormattedLabel(idx, 'emphasis'),
+ mapModel.getFormattedLabel(fullIndex, 'emphasis'),
normalText
);
@@ -148,7 +164,7 @@ export default echarts.extendChartView({
circle.style.extendFrom(hoverStyle);
// Make label upper than others if overlaps.
circle.__mapOriginalZ2 = circle.z2;
- circle.z2 += 1;
+ circle.z2 += graphic.Z2_EMPHASIS_LIFT;
};
var onNormal = function () {
diff --git a/src/component/helper/MapDraw.js b/src/component/helper/MapDraw.js
index b7b8ee7..70b0bd5 100644
--- a/src/component/helper/MapDraw.js
+++ b/src/component/helper/MapDraw.js
@@ -279,7 +279,7 @@ MapDraw.prototype = {
if (
(isGeo || isDataNaN && (showLabel || hoverShowLabel))
|| (itemLayout && itemLayout.showLabel)
- ) {
+ ) {
var query = !isGeo ? dataIdx : region.name;
var labelFetcher;
@@ -290,6 +290,10 @@ MapDraw.prototype = {
var textEl = new graphic.Text({
position: region.center.slice(),
+ // FIXME
+ // label rotation is not support yet in geo or regions of series-map
+ // that has no data. The rotation will be effected by this `scale`.
+ // So needed to change to RectText?
scale: [1 / scale[0], 1 / scale[1]],
z2: 10,
silent: true
diff --git a/src/data/List.js b/src/data/List.js
index 00d4927..5e095ab 100644
--- a/src/data/List.js
+++ b/src/data/List.js
@@ -416,10 +416,10 @@ listProto.initData = function (data, nameList, dimValueGetter) {
this.defaultDimValueGetter = defaultDimValueGetters[
this._rawData.getSource().sourceFormat
];
-
// Default dim value getter
this._dimValueGetter = dimValueGetter = dimValueGetter
|| this.defaultDimValueGetter;
+ this._dimValueGetterArrayRows = defaultDimValueGetters.arrayRows;
// Reset raw extent.
this._rawExtent = {};
@@ -436,6 +436,9 @@ listProto.getProvider = function () {
return this._rawData;
};
+/**
+ * Caution: Can be only called on raw data (before `this._indices` created).
+ */
listProto.appendData = function (data) {
if (__DEV__) {
zrUtil.assert(!this._indices, 'appendData can only be called on raw data.');
@@ -451,6 +454,71 @@ listProto.appendData = function (data) {
this._initDataFromProvider(start, end);
};
+/**
+ * Caution: Can be only called on raw data (before `this._indices` created).
+ * This method does not modify `rawData` (`dataProvider`), but only
+ * add values to storage.
+ *
+ * The final count will be increased by `Math.max(values.length, names.length)`.
+ *
+ * @param {Array.<Array.<*>>} values That is the SourceType: 'arrayRows', like
+ * [
+ * [12, 33, 44],
+ * [NaN, 43, 1],
+ * ['-', 'asdf', 0]
+ * ]
+ * Each item is exaclty cooresponding to a dimension.
+ * @param {Array.<string>} [names]
+ */
+listProto.appendValues = function (values, names) {
+ var chunkSize = this._chunkSize;
+ var storage = this._storage;
+ var dimensions = this.dimensions;
+ var dimLen = dimensions.length;
+ var rawExtent = this._rawExtent;
+
+ var start = this.count();
+ var end = start + Math.max(values.length, names ? names.length : 0);
+ var originalChunkCount = this._chunkCount;
+
+ for (var i = 0; i < dimLen; i++) {
+ var dim = dimensions[i];
+ prepareChunks(storage, this._dimensionInfos[dim], chunkSize, originalChunkCount, end);
+ this._chunkCount = storage[dim].length;
+ }
+
+ var emptyDataItem = new Array(dimLen);
+ for (var idx = start; idx < end; idx++) {
+ var sourceIdx = idx - start;
+ var chunkIndex = Math.floor(idx / chunkSize);
+ var chunkOffset = idx % chunkSize;
+
+ // Store the data by dimensions
+ for (var k = 0; k < dimLen; k++) {
+ var dim = dimensions[k];
+ var val = this._dimValueGetterArrayRows(
+ values[sourceIdx] || emptyDataItem, dim, sourceIdx, k
+ );
+ storage[dim][chunkIndex][chunkOffset] = val;
+
+ var dimRawExtent = rawExtent[dim];
+ val < dimRawExtent[0] && (dimRawExtent[0] = val);
+ val > dimRawExtent[1] && (dimRawExtent[1] = val);
+ }
+
+ if (names) {
+ this._nameList[idx] = names[sourceIdx];
+ }
+ }
+
+ this._rawCount = this._count = end;
+
+ // Reset data extent
+ this._extent = {};
+
+ prepareInvertedIndex(this);
+};
+
listProto._initDataFromProvider = function (start, end) {
// Optimize.
if (start >= end) {
@@ -469,8 +537,7 @@ listProto._initDataFromProvider = function (start, end) {
var nameRepeatCount = this._nameRepeatCount = {};
var nameDimIdx;
- var chunkCount = this._chunkCount;
- var lastChunkIndex = chunkCount - 1;
+ var originalChunkCount = this._chunkCount;
for (var i = 0; i < dimLen; i++) {
var dim = dimensions[i];
if (!rawExtent[dim]) {
@@ -484,26 +551,13 @@ listProto._initDataFromProvider = function (start, end) {
if (dimInfo.otherDims.itemId === 0) {
this._idDimIdx = i;
}
- var DataCtor = dataCtors[dimInfo.type];
if (!storage[dim]) {
storage[dim] = [];
}
- var resizeChunkArray = storage[dim][lastChunkIndex];
- if (resizeChunkArray && resizeChunkArray.length < chunkSize) {
- var newStore = new DataCtor(Math.min(end - lastChunkIndex * chunkSize, chunkSize));
- // The cost of the copy is probably inconsiderable
- // within the initial chunkSize.
- for (var j = 0; j < resizeChunkArray.length; j++) {
- newStore[j] = resizeChunkArray[j];
- }
- storage[dim][lastChunkIndex] = newStore;
- }
- // Create new chunks.
- for (var k = chunkCount * chunkSize; k < end; k += chunkSize) {
- storage[dim].push(new DataCtor(Math.min(end - k, chunkSize)));
- }
+ prepareChunks(storage, dimInfo, chunkSize, originalChunkCount, end);
+
this._chunkCount = storage[dim].length;
}
@@ -529,12 +583,8 @@ listProto._initDataFromProvider = function (start, end) {
dimStorage[chunkOffset] = val;
var dimRawExtent = rawExtent[dim];
- if (val < dimRawExtent[0]) {
- dimRawExtent[0] = val;
- }
- if (val > dimRawExtent[1]) {
- dimRawExtent[1] = val;
- }
+ val < dimRawExtent[0] && (dimRawExtent[0] = val);
+ val > dimRawExtent[1] && (dimRawExtent[1] = val);
}
// ??? FIXME not check by pure but sourceFormat?
@@ -593,6 +643,27 @@ listProto._initDataFromProvider = function (start, end) {
prepareInvertedIndex(this);
};
+function prepareChunks(storage, dimInfo, chunkSize, chunkCount, end) {
+ var DataCtor = dataCtors[dimInfo.type];
+ var lastChunkIndex = chunkCount - 1;
+ var dim = dimInfo.name;
+ var resizeChunkArray = storage[dim][lastChunkIndex];
+ if (resizeChunkArray && resizeChunkArray.length < chunkSize) {
+ var newStore = new DataCtor(Math.min(end - lastChunkIndex * chunkSize, chunkSize));
+ // The cost of the copy is probably inconsiderable
+ // within the initial chunkSize.
+ for (var j = 0; j < resizeChunkArray.length; j++) {
+ newStore[j] = resizeChunkArray[j];
+ }
+ storage[dim][lastChunkIndex] = newStore;
+ }
+
+ // Create new chunks.
+ for (var k = chunkCount * chunkSize; k < end; k += chunkSize) {
+ storage[dim].push(new DataCtor(Math.min(end - k, chunkSize)));
+ }
+}
+
function prepareInvertedIndex(list) {
var invertedIndicesMap = list._invertedIndicesMap;
zrUtil.each(invertedIndicesMap, function (invertedIndices, dim) {
diff --git a/src/model/Model.js b/src/model/Model.js
index abcc2ff..ee5c687 100644
--- a/src/model/Model.js
+++ b/src/model/Model.js
@@ -37,7 +37,7 @@ var inner = makeInner();
/**
* @alias module:echarts/model/Model
* @constructor
- * @param {Object} option
+ * @param {Object} [option]
* @param {module:echarts/model/Model} [parentModel]
* @param {module:echarts/model/Global} [ecModel]
*/
diff --git a/src/util/graphic.js b/src/util/graphic.js
index e490f76..f39d0e3 100644
--- a/src/util/graphic.js
+++ b/src/util/graphic.js
@@ -48,7 +48,8 @@ var mathMax = Math.max;
var mathMin = Math.min;
var EMPTY_OBJ = {};
-var Z2_LIFT_VALUE = 1;
+
+export var Z2_EMPHASIS_LIFT = 1;
/**
* Extend shape with parameters
@@ -344,7 +345,7 @@ function doSingleEnterHover(el) {
if (!useHoverLayer) {
el.dirty(false);
- el.z2 += Z2_LIFT_VALUE;
+ el.z2 += Z2_EMPHASIS_LIFT;
}
}
@@ -381,7 +382,7 @@ function doSingleLeaveHover(el) {
// when `el` is on emphasis state. So here by comparing with 1, we try
// hard to make the bug case rare.
var normalZ2 = el.__cachedNormalZ2;
- if (normalZ2 != null && el.z2 - normalZ2 === Z2_LIFT_VALUE) {
+ if (normalZ2 != null && el.z2 - normalZ2 === Z2_EMPHASIS_LIFT) {
el.z2 = normalZ2;
}
}
diff --git a/test/map.html b/test/map.html
index 3b05a2a..ab1d216 100644
--- a/test/map.html
+++ b/test/map.html
@@ -26,25 +26,25 @@ under the License.
<script src="lib/config.js"></script>
<script src="lib/jquery.min.js"></script>
<script src="lib/facePrint.js"></script>
+ <script src="lib/testHelper.js"></script>
+ <!-- <script src="ut/lib/canteen.js"></script> -->
+ <link rel="stylesheet" href="lib/reset.css" />
</head>
<body>
- <style>
- html, body, #main {
- width: 100%;
- height: 100%;
- margin: 0;
- }
- </style>
- <div id="main"></div>
- <script>
+ <!-- <div id="main0"></div> -->
+ <div id="main1"></div>
+
+
+
+
+
+ <script>
require([
'echarts'
], function (echarts) {
require(['map/js/china'], function () {
- var chart = echarts.init(document.getElementById('main'));
-
var itemStyle = {
normal:{
borderColor: 'rgba(0, 0, 0, 0.2)'
@@ -58,7 +58,7 @@ under the License.
}
};
- chart.setOption({
+ var option = {
tooltip: {},
title : {
text: '内蒙古和青海没数据也要能被选中',
@@ -75,7 +75,7 @@ under the License.
max: 1500,
left: 'left',
top: 'bottom',
- text:['高','低'], // 文本，默认为数值文本
+ text: ['高','低'],
calculable : true
},
selectedMode: 'single',
@@ -218,21 +218,160 @@ under the License.
]
}
]
+ };
+
+ var chart = testHelper.create(echarts, 'main0', {
+ option: option,
+ height: 550
});
- chart.on('click', function (param) {
+ if (chart) {
+ chart.on('click', function (param) {
+ console.log(param);
+ });
+ }
+ });
+ });
+
+ </script>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <script>
+
+ require([
+ 'echarts'
+ ], function (echarts) {
+
+ require(['map/js/china'], function () {
+ var itemStyle = {
+ normal:{
+ borderColor: 'rgba(0, 0, 0, 0.2)'
+ },
+ emphasis:{
+ shadowOffsetX: 0,
+ shadowOffsetY: 0,
+ shadowBlur: 20,
+ borderWidth: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ };
+ var option = {
+ tooltip: {},
+ legend: {
+ orient: 'vertical',
+ left: 'left',
+ data:['iphone3','iphone4','iphone5']
+ },
+ visualMap: {
+ min: 0,
+ max: 1500,
+ left: 'left',
+ top: 'bottom',
+ text:['高','低'],
+ calculable : true
+ },
+ selectedMode: 'multiple',
+ series: [
+ {
+ name: 'iphone3',
+ type: 'map',
+ map: 'china',
+ itemStyle: itemStyle,
+ showLegendSymbol: true,
+ // zoom: 10,
+ // center: [115.97, 29.71],
+ roam: true,
+ label: {
+ show: true,
+ rotate: 40,
+ formatter: '{b}：{value|{c}}',
+ backgroundColor: '#fff',
+ padding: [3, 5],
+ borderRadius: 3,
+ borderWidth: 1,
+ borderColor: 'rgba(0,0,0,0.5)',
+ color: '#934',
+ rich: {
+ value: {
+ color: '#019D2D',
+ fontSize: 14
+ }
+ }
+ },
+ emphasis: {
+ label: {show: true}
+ },
+ data:[
+ {name: '北京',value: 234},
+ {name: '天津',value: 432}
+ ]
+ },
+ {
+ name: 'iphone4',
+ type: 'map',
+ mapType: 'china',
+ itemStyle: itemStyle,
+ showLegendSymbol: true,
+ label: {
+ show: true,
+ rotate: 90,
+ formatter: '{b}：{value|{c}}',
+ backgroundColor: '#fff',
+ padding: [3, 5],
+ borderRadius: 3,
+ borderWidth: 1,
+ borderColor: 'rgba(0,0,0,0.5)',
+ color: '#934',
+ rich: {
+ value: {
+ color: '#019D2D',
+ fontSize: 14
+ }
+ }
+ },
+ emphasis: {
+ label: {show: true}
+ },
+ data:[
+ {name: '北京',value: 567},
+ {name: '河北',value: 321}
+ ]
+ }
+ ]
+ };
+
+ var chart = testHelper.create(echarts, 'main1', {
+ option: option,
+ // recordCanvas: true,
+ title: [
+ '1. 北京、天津、河北 rich text 正常倾斜（河北竖直）（其他 region 都没数据，显示 NaN）',
+ '2. selectedMode: "multiple"',
+ '所有 label 样式一致（例外：没数据的 label 并不 rotate，因为这还没支持）'
+ ]
+ });
+
+ chart && chart.on('click', function (param) {
console.log(param);
});
- // setTimeout(function () {
- // chart.setOption({
- // series: [{
- // zoom: 5
- // }]
- // });
- // }, 2000);
});
+
});
</script>
+
+
+
+
</body>
</html>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org