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 2018/04/27 17:42:24 UTC
[incubator-echarts] 02/02: update build
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 40949ae5d19a6de64d4b5cd0fa109a4c04051e66
Author: sushuang <su...@gmail.com>
AuthorDate: Sat Apr 28 01:41:50 2018 +0800
update build
---
dist/echarts-en.common.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts-en.common.min.js | 2 +-
dist/echarts-en.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts-en.js.map | 2 +-
dist/echarts-en.min.js | 2 +-
dist/echarts-en.simple.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts-en.simple.min.js | 2 +-
dist/echarts.common.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts.common.min.js | 2 +-
dist/echarts.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 2 +-
dist/echarts.simple.js | 90 ++++++++++++++++++++++++-------------------
dist/echarts.simple.min.js | 2 +-
14 files changed, 314 insertions(+), 242 deletions(-)
diff --git a/dist/echarts-en.common.js b/dist/echarts-en.common.js
index 96e2ddd..8a6b06a 100644
--- a/dist/echarts-en.common.js
+++ b/dist/echarts-en.common.js
@@ -29659,10 +29659,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -34491,24 +34497,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -34523,29 +34535,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts-en.common.min.js b/dist/echarts-en.common.min.js
index 8852a36..8034e1e 100644
--- a/dist/echarts-en.common.min.js
+++ b/dist/echarts-en.common.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Ep=null),Op[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Cp.call(t);if("[object Array]"===i){if(!z(t)){e=[];for(var r=0,o=t.length;r<o;r++)e[r]=n(t[r])}}else if(Ip[i]){if(!z(t)){var a=t.constructor;if(t.constructor.from)e=a.from(t);else{e=new a( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(zp=null),Lp[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Ip.call(t);if("[object Array]"===i){if(!z(t)){e=[];for(var r=0,o=t.length;r<o;r++)e[r]=n(t[r])}}else if(Mp[i]){if(!z(t)){var a=t.constructor;if(t.constructor.from)e=a.from(t);else{e=new a( [...]
diff --git a/dist/echarts-en.js b/dist/echarts-en.js
index d55c22c..938eeef 100644
--- a/dist/echarts-en.js
+++ b/dist/echarts-en.js
@@ -29725,10 +29725,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -34584,24 +34590,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -34616,29 +34628,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts-en.js.map b/dist/echarts-en.js.map
index c2b980b..efc4447 100644
--- a/dist/echarts-en.js.map
+++ b/dist/echarts-en.js.map
@@ -1 +1 @@
-{"version":3,"file":"echarts-en.js","sources":["../src/config.js","../../zrender/src/core/guid.js","../../zrender/src/core/env.js","../../zrender/src/core/util.js","../../zrender/src/core/vector.js","../../zrender/src/mixin/Draggable.js","../../zrender/src/mixin/Eventful.js","../../zrender/src/Handler.js","../../zrender/src/core/matrix.js","../../zrender/src/mixin/Transformable.js","../../zrender/src/animation/easing.js","../../zrender/src/animation/Clip.js","../../zrender/src/core/LRU.j [...]
\ No newline at end of file
+{"version":3,"file":"echarts-en.js","sources":["../src/config.js","../../zrender/src/core/guid.js","../../zrender/src/core/env.js","../../zrender/src/core/util.js","../../zrender/src/core/vector.js","../../zrender/src/mixin/Draggable.js","../../zrender/src/mixin/Eventful.js","../../zrender/src/Handler.js","../../zrender/src/core/matrix.js","../../zrender/src/mixin/Transformable.js","../../zrender/src/animation/easing.js","../../zrender/src/animation/Clip.js","../../zrender/src/core/LRU.j [...]
\ No newline at end of file
diff --git a/dist/echarts-en.min.js b/dist/echarts-en.min.js
index 0cc5f5b..4e559ee 100644
--- a/dist/echarts-en.min.js
+++ b/dist/echarts-en.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(y_=null),m_[t]=e}function i(t){if(null==t||"object"!=typeof t)return t;var e=t,n=u_.call(t);if("[object Array]"===n){if(!O(t)){e=[];for(var o=0,a=t.length;o<a;o++)e[o]=i(t[o])}}else if(l_[n]){if(!O(t)){var r=t.constructor;if(t.constructor.from)e=r.from(t);else{e=new r( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(v_=null),g_[t]=e}function i(t){if(null==t||"object"!=typeof t)return t;var e=t,n=l_.call(t);if("[object Array]"===n){if(!O(t)){e=[];for(var o=0,a=t.length;o<a;o++)e[o]=i(t[o])}}else if(s_[n]){if(!O(t)){var r=t.constructor;if(t.constructor.from)e=r.from(t);else{e=new r( [...]
diff --git a/dist/echarts-en.simple.js b/dist/echarts-en.simple.js
index e41af00..e44b515 100644
--- a/dist/echarts-en.simple.js
+++ b/dist/echarts-en.simple.js
@@ -29089,10 +29089,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -30734,24 +30740,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -30766,29 +30778,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts-en.simple.min.js b/dist/echarts-en.simple.min.js
index 9da1c58..3af9587 100644
--- a/dist/echarts-en.simple.min.js
+++ b/dist/echarts-en.simple.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Ph=null),Ah[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Sh.call(t);if("[object Array]"===i){if(!E(t)){e=[];for(var r=0,a=t.length;r<a;r++)e[r]=n(t[r])}}else if(bh[i]){if(!E(t)){var o=t.constructor;if(t.constructor.from)e=o.from(t);else{e=new o( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Lh=null),kh[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=bh.call(t);if("[object Array]"===i){if(!E(t)){e=[];for(var r=0,a=t.length;r<a;r++)e[r]=n(t[r])}}else if(wh[i]){if(!E(t)){var o=t.constructor;if(t.constructor.from)e=o.from(t);else{e=new o( [...]
diff --git a/dist/echarts.common.js b/dist/echarts.common.js
index 4a2fbf6..f0dcd7b 100644
--- a/dist/echarts.common.js
+++ b/dist/echarts.common.js
@@ -29717,10 +29717,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -34549,24 +34555,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -34581,29 +34593,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts.common.min.js b/dist/echarts.common.min.js
index c9d7323..8b6b6dd 100644
--- a/dist/echarts.common.min.js
+++ b/dist/echarts.common.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Ep=null),Op[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Cp.call(t);if("[object Array]"===i){if(!z(t)){e=[];for(var r=0,o=t.length;r<o;r++)e[r]=n(t[r])}}else if(Ip[i]){if(!z(t)){var a=t.constructor;if(t.constructor.from)e=a.from(t);else{e=new a( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(zp=null),Lp[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Ip.call(t);if("[object Array]"===i){if(!z(t)){e=[];for(var r=0,o=t.length;r<o;r++)e[r]=n(t[r])}}else if(Sp[i]){if(!z(t)){var a=t.constructor;if(t.constructor.from)e=a.from(t);else{e=new a( [...]
diff --git a/dist/echarts.js b/dist/echarts.js
index c307c36..4fa898f 100644
--- a/dist/echarts.js
+++ b/dist/echarts.js
@@ -29783,10 +29783,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -34642,24 +34648,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -34674,29 +34686,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts.js.map b/dist/echarts.js.map
index 2bef076..3f4bcd2 100644
--- a/dist/echarts.js.map
+++ b/dist/echarts.js.map
@@ -1 +1 @@
-{"version":3,"file":"echarts.js","sources":["../src/config.js","../../zrender/src/core/guid.js","../../zrender/src/core/env.js","../../zrender/src/core/util.js","../../zrender/src/core/vector.js","../../zrender/src/mixin/Draggable.js","../../zrender/src/mixin/Eventful.js","../../zrender/src/Handler.js","../../zrender/src/core/matrix.js","../../zrender/src/mixin/Transformable.js","../../zrender/src/animation/easing.js","../../zrender/src/animation/Clip.js","../../zrender/src/core/LRU.js", [...]
\ No newline at end of file
+{"version":3,"file":"echarts.js","sources":["../src/config.js","../../zrender/src/core/guid.js","../../zrender/src/core/env.js","../../zrender/src/core/util.js","../../zrender/src/core/vector.js","../../zrender/src/mixin/Draggable.js","../../zrender/src/mixin/Eventful.js","../../zrender/src/Handler.js","../../zrender/src/core/matrix.js","../../zrender/src/mixin/Transformable.js","../../zrender/src/animation/easing.js","../../zrender/src/animation/Clip.js","../../zrender/src/core/LRU.js", [...]
\ No newline at end of file
diff --git a/dist/echarts.min.js b/dist/echarts.min.js
index 5407fb0..6aefcf6 100644
--- a/dist/echarts.min.js
+++ b/dist/echarts.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(y_=null),m_[t]=e}function i(t){if(null==t||"object"!=typeof t)return t;var e=t,n=u_.call(t);if("[object Array]"===n){if(!O(t)){e=[];for(var o=0,a=t.length;o<a;o++)e[o]=i(t[o])}}else if(l_[n]){if(!O(t)){var r=t.constructor;if(t.constructor.from)e=r.from(t);else{e=new r( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(v_=null),g_[t]=e}function i(t){if(null==t||"object"!=typeof t)return t;var e=t,n=l_.call(t);if("[object Array]"===n){if(!O(t)){e=[];for(var o=0,a=t.length;o<a;o++)e[o]=i(t[o])}}else if(s_[n]){if(!O(t)){var r=t.constructor;if(t.constructor.from)e=r.from(t);else{e=new r( [...]
diff --git a/dist/echarts.simple.js b/dist/echarts.simple.js
index fd516b1..d749c4d 100644
--- a/dist/echarts.simple.js
+++ b/dist/echarts.simple.js
@@ -29147,10 +29147,16 @@ function enableDataStack(seriesModel, dimensionInfoList, opt) {
}
});
+ if (stackedDimInfo && !byIndex && !stackedByDimInfo) {
+ // Compatible with previous design, value axis (time axis) only stack by index.
+ // It may make sense if the user provides elaborately constructed data.
+ byIndex = true;
+ }
+
// Add stack dimension, they can be both calculated by coordinate system in `unionExtent`.
// That put stack logic in List is for using conveniently in echarts extensions, but it
// might not be a good way.
- if (stackedDimInfo && (byIndex || stackedByDimInfo)) {
+ if (stackedDimInfo) {
// Use a weird name that not duplicated with other names.
stackResultDimension = '__\0ecstackresult';
stackedOverDimension = '__\0ecstackedover';
@@ -30792,24 +30798,30 @@ function drawSegment(
ctx, points, start, segLen, allLen,
dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
) {
- if (smoothMonotone == null) {
- if (isMono(points, 'x')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
- }
- else if (isMono(points, 'y')) {
- return drawMono(ctx, points, start, segLen, allLen,
- dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
- }
- else {
- return drawNonMono.apply(this, arguments);
- }
- }
- else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
- return drawMono.apply(this, arguments);
+ // if (smoothMonotone == null) {
+ // if (isMono(points, 'x')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'x', connectNulls);
+ // }
+ // else if (isMono(points, 'y')) {
+ // return drawMono(ctx, points, start, segLen, allLen,
+ // dir, smoothMin, smoothMax, smooth, 'y', connectNulls);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ // }
+ // else if (smoothMonotone !== 'none' && isMono(points, smoothMonotone)) {
+ // return drawMono.apply(this, arguments);
+ // }
+ // else {
+ // return drawNonMono.apply(this, arguments);
+ // }
+ if (smoothMonotone === 'none' || !smoothMonotone) {
+ return drawNonMono.apply(this, arguments);
}
else {
- return drawNonMono.apply(this, arguments);
+ return drawMono.apply(this, arguments);
}
}
@@ -30824,29 +30836,29 @@ function drawSegment(
* If is undefined, either being monotone
* in 'x' or 'y' will call `drawMono`.
*/
-function isMono(points, smoothMonotone) {
- if (points.length <= 1) {
- return true;
- }
+// function isMono(points, smoothMonotone) {
+// if (points.length <= 1) {
+// return true;
+// }
- var dim = smoothMonotone === 'x' ? 0 : 1;
- var last = points[0][dim];
- var lastDiff = 0;
- for (var i = 1; i < points.length; ++i) {
- var diff = points[i][dim] - last;
- if (!isNaN(diff) && !isNaN(lastDiff)
- && diff !== 0 && lastDiff !== 0
- && ((diff >= 0) !== (lastDiff >= 0))
- ) {
- return false;
- }
- if (!isNaN(diff) && diff !== 0) {
- lastDiff = diff;
- last = points[i][dim];
- }
- }
- return true;
-}
+// var dim = smoothMonotone === 'x' ? 0 : 1;
+// var last = points[0][dim];
+// var lastDiff = 0;
+// for (var i = 1; i < points.length; ++i) {
+// var diff = points[i][dim] - last;
+// if (!isNaN(diff) && !isNaN(lastDiff)
+// && diff !== 0 && lastDiff !== 0
+// && ((diff >= 0) !== (lastDiff >= 0))
+// ) {
+// return false;
+// }
+// if (!isNaN(diff) && diff !== 0) {
+// lastDiff = diff;
+// last = points[i][dim];
+// }
+// }
+// return true;
+// }
/**
* Draw smoothed line in monotone, in which only vertical or horizontal bezier
diff --git a/dist/echarts.simple.min.js b/dist/echarts.simple.min.js
index 36cb2fa..dda62be 100644
--- a/dist/echarts.simple.min.js
+++ b/dist/echarts.simple.min.js
@@ -18,4 +18,4 @@
* under the License.
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Ph=null),Ah[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Mh.call(t);if("[object Array]"===i){if(!E(t)){e=[];for(var r=0,a=t.length;r<a;r++)e[r]=n(t[r])}}else if(bh[i]){if(!E(t)){var o=t.constructor;if(t.constructor.from)e=o.from(t);else{e=new o( [...]
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Lh=null),kh[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=bh.call(t);if("[object Array]"===i){if(!E(t)){e=[];for(var r=0,a=t.length;r<a;r++)e[r]=n(t[r])}}else if(wh[i]){if(!E(t)){var o=t.constructor;if(t.constructor.from)e=o.from(t);else{e=new o( [...]
--
To stop receiving notification emails like this one, please contact
sushuang@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org