diff --git a/src/component/dataZoom/DataZoomView.js b/src/component/dataZoom/DataZoomView.js index 8a0141e01a30ccac50eb14041bf07eea44e677b6..149300ac8d536bf99874301d92d0717df7202499 100644 --- a/src/component/dataZoom/DataZoomView.js +++ b/src/component/dataZoom/DataZoomView.js @@ -77,7 +77,7 @@ define(function (require) { // FIXME // zlevel: this.getZlevelBase(), // z: this.getZBase(), - hoverable: false, + silent: true, shape: { x: 0, y: 0, @@ -97,7 +97,7 @@ define(function (require) { // FIXME // zlevel: this.getZlevelBase(), // z: this.getZBase(), - hoverable: false, + silent: true, style: { stroke: this.dataZoomModel.get('handleColor'), lineWidth: DEFAULT_FRAME_BORDER_WIDTH, diff --git a/src/data/List.js b/src/data/List.js index cd96913fe1be150b49cdacd7841b2f017d6f9adb..07c08f4bca9714c3aff3122c59d6f557f601214c 100644 --- a/src/data/List.js +++ b/src/data/List.js @@ -626,7 +626,7 @@ define(function (require) { if (isObject(key)) { for (var name in key) { if (key.hasOwnProperty(name)) { - itemVisual[key] = key[name]; + itemVisual[name] = key[name]; } } return; @@ -709,11 +709,10 @@ define(function (require) { else { // PENDING var dimSize = data[0] && data[0].length; - if (dimSize === 2) { - dimensions = ['x', 'y']; - } - else if (dimSize === 3) { - dimensions = ['x', 'y', 'z']; + // FIXME + var dimensionNames = ['x', 'y', 'z', 'a', 'b', 'c', 'd', 'e']; + if (dimSize >= 2) { + dimensions = dimensionNames.slice(0, dimSize); } } } diff --git a/src/model/Global.js b/src/model/Global.js index c4a9a379793a261e80220f9b2fde9560eb98963c..7e3e04d547f0929eca269a9ebdaa6fa9d01bfcc1 100644 --- a/src/model/Global.js +++ b/src/model/Global.js @@ -170,12 +170,14 @@ define(function (require) { * @private */ _determineSubType: function (componentType, newCptOption, existComponent) { - return newCptOption.type + var subType = newCptOption.type ? newCptOption.type : existComponent ? existComponent.option.type // Use determinSubType only when there is no existComponent. : ComponentModel.determineSubType(componentType, newCptOption); + + return newCptOption.type = subType; }, /**