提交 d2f2dcf2 编写于 作者: P pah100

datazoom, list, global, a bit fix

上级 58e5ee38
...@@ -77,7 +77,7 @@ define(function (require) { ...@@ -77,7 +77,7 @@ define(function (require) {
// FIXME // FIXME
// zlevel: this.getZlevelBase(), // zlevel: this.getZlevelBase(),
// z: this.getZBase(), // z: this.getZBase(),
hoverable: false, silent: true,
shape: { shape: {
x: 0, x: 0,
y: 0, y: 0,
...@@ -97,7 +97,7 @@ define(function (require) { ...@@ -97,7 +97,7 @@ define(function (require) {
// FIXME // FIXME
// zlevel: this.getZlevelBase(), // zlevel: this.getZlevelBase(),
// z: this.getZBase(), // z: this.getZBase(),
hoverable: false, silent: true,
style: { style: {
stroke: this.dataZoomModel.get('handleColor'), stroke: this.dataZoomModel.get('handleColor'),
lineWidth: DEFAULT_FRAME_BORDER_WIDTH, lineWidth: DEFAULT_FRAME_BORDER_WIDTH,
......
...@@ -626,7 +626,7 @@ define(function (require) { ...@@ -626,7 +626,7 @@ define(function (require) {
if (isObject(key)) { if (isObject(key)) {
for (var name in key) { for (var name in key) {
if (key.hasOwnProperty(name)) { if (key.hasOwnProperty(name)) {
itemVisual[key] = key[name]; itemVisual[name] = key[name];
} }
} }
return; return;
...@@ -709,11 +709,10 @@ define(function (require) { ...@@ -709,11 +709,10 @@ define(function (require) {
else { else {
// PENDING // PENDING
var dimSize = data[0] && data[0].length; var dimSize = data[0] && data[0].length;
if (dimSize === 2) { // FIXME
dimensions = ['x', 'y']; var dimensionNames = ['x', 'y', 'z', 'a', 'b', 'c', 'd', 'e'];
} if (dimSize >= 2) {
else if (dimSize === 3) { dimensions = dimensionNames.slice(0, dimSize);
dimensions = ['x', 'y', 'z'];
} }
} }
} }
......
...@@ -170,12 +170,14 @@ define(function (require) { ...@@ -170,12 +170,14 @@ define(function (require) {
* @private * @private
*/ */
_determineSubType: function (componentType, newCptOption, existComponent) { _determineSubType: function (componentType, newCptOption, existComponent) {
return newCptOption.type var subType = newCptOption.type
? newCptOption.type ? newCptOption.type
: existComponent : existComponent
? existComponent.option.type ? existComponent.option.type
// Use determinSubType only when there is no existComponent. // Use determinSubType only when there is no existComponent.
: ComponentModel.determineSubType(componentType, newCptOption); : ComponentModel.determineSubType(componentType, newCptOption);
return newCptOption.type = subType;
}, },
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册