提交 5fab961b 编写于 作者: L lang

List entry name optimization

上级 4a7e92c5
...@@ -8,7 +8,7 @@ define(function(require) { ...@@ -8,7 +8,7 @@ define(function(require) {
type: 'bar', type: 'bar',
getInitialData: function (option) { getInitialData: function (option, ecModel) {
var list = List.fromArray(option.data, 1, this); var list = List.fromArray(option.data, 1, this);
return list; return list;
}, },
......
...@@ -5,8 +5,6 @@ define(function (require) { ...@@ -5,8 +5,6 @@ define(function (require) {
type: 'bar', type: 'bar',
render: function (seriesModel, ecModel, api) { render: function (seriesModel, ecModel, api) {
this.group.clear();
var coordinateSystemType = seriesModel.get('coordinateSystem'); var coordinateSystemType = seriesModel.get('coordinateSystem');
if (coordinateSystemType === 'cartesian2d') { if (coordinateSystemType === 'cartesian2d') {
...@@ -37,7 +35,7 @@ define(function (require) { ...@@ -37,7 +35,7 @@ define(function (require) {
.update(function (newData, oldData) { .update(function (newData, oldData) {
// TODO DONT ANIMATE WHEN PROPERTIES ARE EQUAL // TODO DONT ANIMATE WHEN PROPERTIES ARE EQUAL
oldData.__el.animateShape() oldData.__el.animateShape()
.when(500, newData.layout) .when(200, newData.layout)
.start(); .start();
newData.__el = oldData.__el; newData.__el = oldData.__el;
......
...@@ -140,6 +140,7 @@ define(function(require) { ...@@ -140,6 +140,7 @@ define(function(require) {
var entry = new Entry( var entry = new Entry(
this.option, this.parentModel, this.dataIndex this.option, this.parentModel, this.dataIndex
); );
entry.name = this.name;
entry.dimension = this.dimension; entry.dimension = this.dimension;
return entry; return entry;
} }
...@@ -263,6 +264,10 @@ define(function(require) { ...@@ -263,6 +264,10 @@ define(function(require) {
// Normalize data // Normalize data
list.elements = zrUtil.map(data, function (dataItem, index) { list.elements = zrUtil.map(data, function (dataItem, index) {
var entry = new Entry(dataItem, parentModel, index); var entry = new Entry(dataItem, parentModel, index);
// TODO
if (! dataItem.name) {
entry.name = index;
}
entry.dimension = dimension || 1; entry.dimension = dimension || 1;
return entry; return entry;
}); });
......
...@@ -106,7 +106,7 @@ define(function (require) { ...@@ -106,7 +106,7 @@ define(function (require) {
var seriesMap = this._seriesMap; var seriesMap = this._seriesMap;
var seriesModel = seriesMap[seriesName]; var seriesModel = seriesMap[seriesName];
if (seriesModel) { if (seriesModel) {
seriesModel.mergeOption(series); seriesModel.mergeOption(series, this);
} }
else { else {
seriesModel = SeriesModel.create(series, this, idx); seriesModel = SeriesModel.create(series, this, idx);
......
...@@ -38,13 +38,13 @@ define(function(require) { ...@@ -38,13 +38,13 @@ define(function(require) {
* @type {module:echarts/data/List|module:echarts/data/Tree|module:echarts/data/Graph} * @type {module:echarts/data/List|module:echarts/data/Tree|module:echarts/data/Graph}
* @private * @private
*/ */
this._data = this.getInitialData(seriesOption); this._data = this.getInitialData(seriesOption, ecModel);
this._stack = []; this._stack = [];
}, },
mergeOption: function (newSeriesOption) { mergeOption: function (newSeriesOption, ecModel) {
this._data = this.getInitialData(newSeriesOption); this._data = this.getInitialData(newSeriesOption, ecModel);
}, },
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册