|
9609 | 9609 | ], upstreamSignList = [];
|
9610 | 9610 | assert(resultSourceList && upstreamSignList), this._setLocalSource(resultSourceList, upstreamSignList);
|
9611 | 9611 | }, SourceManager.prototype._applyTransform = function(upMgrList) {
|
9612 |
| - var encodeDefine, source, sourceList, datasetModel = this._sourceHost, transformOption = datasetModel.get('transform', !0), fromTransformResult = datasetModel.get('fromTransformResult', !0); |
| 9612 | + var source, encodeDefine, sourceList, datasetModel = this._sourceHost, transformOption = datasetModel.get('transform', !0), fromTransformResult = datasetModel.get('fromTransformResult', !0); |
9613 | 9613 | assert(null != fromTransformResult || null != transformOption), null != fromTransformResult && 1 !== upMgrList.length && doThrow('When using `fromTransformResult`, there should be only one upstream dataset');
|
9614 | 9614 | var upSourceList = [], upstreamSignList = [];
|
9615 | 9615 | return (each(upMgrList, function(upMgr) {
|
@@ -15070,10 +15070,10 @@
|
15070 | 15070 | return null == precision ? precision = getPrecisionSafe(data.value) || 0 : 'auto' === precision && (precision = this._intervalPrecision), addCommas(round(data.value, precision, !0));
|
15071 | 15071 | }, IntervalScale.prototype.niceTicks = function(splitNumber, minInterval, maxInterval) {
|
15072 | 15072 | splitNumber = splitNumber || 5;
|
15073 |
| - var splitNumber1, result, span, interval, precision, extent = this._extent, span1 = extent[1] - extent[0]; |
| 15073 | + var splitNumber1, result, span, interval, precision, niceTickExtent, extent = this._extent, span1 = extent[1] - extent[0]; |
15074 | 15074 | if (isFinite(span1)) {
|
15075 | 15075 | span1 < 0 && (span1 = -span1, extent.reverse());
|
15076 |
| - var niceTickExtent, result1 = (splitNumber1 = splitNumber, result = {}, span = extent[1] - extent[0], interval = result.interval = nice(span / splitNumber1, !0), null != minInterval && interval < minInterval && (interval = result.interval = minInterval), null != maxInterval && interval > maxInterval && (interval = result.interval = maxInterval), precision = result.intervalPrecision = getPrecisionSafe(interval) + 2, isFinite((niceTickExtent = result.niceTickExtent = [ |
| 15076 | + var result1 = (splitNumber1 = splitNumber, result = {}, span = extent[1] - extent[0], interval = result.interval = nice(span / splitNumber1, !0), null != minInterval && interval < minInterval && (interval = result.interval = minInterval), null != maxInterval && interval > maxInterval && (interval = result.interval = maxInterval), precision = result.intervalPrecision = getPrecisionSafe(interval) + 2, isFinite((niceTickExtent = result.niceTickExtent = [ |
15077 | 15077 | round(Math.ceil(extent[0] / interval) * interval, precision),
|
15078 | 15078 | round(Math.floor(extent[1] / interval) * interval, precision)
|
15079 | 15079 | ])[0]) || (niceTickExtent[0] = extent[0]), isFinite(niceTickExtent[1]) || (niceTickExtent[1] = extent[1]), clamp(niceTickExtent, 0, extent), clamp(niceTickExtent, 1, extent), niceTickExtent[0] > niceTickExtent[1] && (niceTickExtent[0] = niceTickExtent[1]), result);
|
|
16083 | 16083 | return ('category' === this.type ? (result = makeCategoryLabelsActually(this, labelModel = this.getLabelModel()), !labelModel.get('show') || this.scale.isBlank() ? {
|
16084 | 16084 | labels: [],
|
16085 | 16085 | labelCategoryInterval: result.labelCategoryInterval
|
16086 |
| - } : result) : (axis = this, ticks = axis.scale.getTicks(), labelFormatter = makeLabelFormatter(axis), { |
| 16086 | + } : result) : (ticks = (axis = this).scale.getTicks(), labelFormatter = makeLabelFormatter(axis), { |
16087 | 16087 | labels: map(ticks, function(tick, idx) {
|
16088 | 16088 | return {
|
16089 | 16089 | formattedLabel: labelFormatter(tick, idx),
|
@@ -19281,13 +19281,13 @@
|
19281 | 19281 | this._ctx = null;
|
19282 | 19282 | for(var i = 0; i < points.length;){
|
19283 | 19283 | var x = points[i++], y = points[i++];
|
19284 |
| - !(isNaN(x) || isNaN(y)) && (!this.softClipShape || this.softClipShape.contain(x, y)) && (symbolProxyShape.x = x - size[0] / 2, symbolProxyShape.y = y - size[1] / 2, symbolProxyShape.width = size[0], symbolProxyShape.height = size[1], symbolProxy.buildPath(path, symbolProxyShape, !0)); |
| 19284 | + isNaN(x) || isNaN(y) || this.softClipShape && !this.softClipShape.contain(x, y) || (symbolProxyShape.x = x - size[0] / 2, symbolProxyShape.y = y - size[1] / 2, symbolProxyShape.width = size[0], symbolProxyShape.height = size[1], symbolProxy.buildPath(path, symbolProxyShape, !0)); |
19285 | 19285 | }
|
19286 | 19286 | }, LargeSymbolPath.prototype.afterBrush = function() {
|
19287 | 19287 | var shape = this.shape, points = shape.points, size = shape.size, ctx = this._ctx;
|
19288 | 19288 | if (ctx) for(var i = 0; i < points.length;){
|
19289 | 19289 | var x = points[i++], y = points[i++];
|
19290 |
| - !(isNaN(x) || isNaN(y)) && (!this.softClipShape || this.softClipShape.contain(x, y)) && ctx.fillRect(x - size[0] / 2, y - size[1] / 2, size[0], size[1]); |
| 19290 | + isNaN(x) || isNaN(y) || this.softClipShape && !this.softClipShape.contain(x, y) || ctx.fillRect(x - size[0] / 2, y - size[1] / 2, size[0], size[1]); |
19291 | 19291 | }
|
19292 | 19292 | }, LargeSymbolPath.prototype.findDataIndex = function(x, y) {
|
19293 | 19293 | for(var shape = this.shape, points = shape.points, size = shape.size, w = Math.max(size[0], 4), h = Math.max(size[1], 4), idx = points.length / 2 - 1; idx >= 0; idx--){
|
@@ -20188,11 +20188,11 @@
|
20188 | 20188 | axisName: function(opt, axisModel, group, transformGroup) {
|
20189 | 20189 | var labelLayout, axisNameAvailableWidth, name = retrieve(opt.axisName, axisModel.get('name'));
|
20190 | 20190 | if (name) {
|
20191 |
| - var rotation, textAlign, textVerticalAlign, rotationDiff, inverse, onLeft, nameLocation = axisModel.get('nameLocation'), nameDirection = opt.nameDirection, textStyleModel = axisModel.getModel('nameTextStyle'), gap = axisModel.get('nameGap') || 0, extent = axisModel.axis.getExtent(), gapSignal = extent[0] > extent[1] ? -1 : 1, pos = [ |
| 20191 | + var textAlign, textVerticalAlign, rotationDiff, inverse, onLeft, nameLocation = axisModel.get('nameLocation'), nameDirection = opt.nameDirection, textStyleModel = axisModel.getModel('nameTextStyle'), gap = axisModel.get('nameGap') || 0, extent = axisModel.axis.getExtent(), gapSignal = extent[0] > extent[1] ? -1 : 1, pos = [ |
20192 | 20192 | 'start' === nameLocation ? extent[0] - gapSignal * gap : 'end' === nameLocation ? extent[1] + gapSignal * gap : (extent[0] + extent[1]) / 2,
|
20193 | 20193 | isNameLocationCenter(nameLocation) ? opt.labelOffset + nameDirection * gap : 0
|
20194 | 20194 | ], nameRotation = axisModel.get('nameRotate');
|
20195 |
| - null != nameRotation && (nameRotation = nameRotation * PI$5 / 180), isNameLocationCenter(nameLocation) ? labelLayout = AxisBuilder.innerTextLayout(opt.rotation, null != nameRotation ? nameRotation : opt.rotation, nameDirection) : (rotation = opt.rotation, rotationDiff = remRadian((nameRotation || 0) - rotation), inverse = extent[0] > extent[1], onLeft = 'start' === nameLocation && !inverse || 'start' !== nameLocation && inverse, isRadianAroundZero(rotationDiff - PI$5 / 2) ? (textVerticalAlign = onLeft ? 'bottom' : 'top', textAlign = 'center') : isRadianAroundZero(rotationDiff - 1.5 * PI$5) ? (textVerticalAlign = onLeft ? 'top' : 'bottom', textAlign = 'center') : (textVerticalAlign = 'middle', textAlign = rotationDiff < 1.5 * PI$5 && rotationDiff > PI$5 / 2 ? onLeft ? 'left' : 'right' : onLeft ? 'right' : 'left'), labelLayout = { |
| 20195 | + null != nameRotation && (nameRotation = nameRotation * PI$5 / 180), isNameLocationCenter(nameLocation) ? labelLayout = AxisBuilder.innerTextLayout(opt.rotation, null != nameRotation ? nameRotation : opt.rotation, nameDirection) : (rotationDiff = remRadian((nameRotation || 0) - opt.rotation), inverse = extent[0] > extent[1], onLeft = 'start' === nameLocation && !inverse || 'start' !== nameLocation && inverse, isRadianAroundZero(rotationDiff - PI$5 / 2) ? (textVerticalAlign = onLeft ? 'bottom' : 'top', textAlign = 'center') : isRadianAroundZero(rotationDiff - 1.5 * PI$5) ? (textVerticalAlign = onLeft ? 'top' : 'bottom', textAlign = 'center') : (textVerticalAlign = 'middle', textAlign = rotationDiff < 1.5 * PI$5 && rotationDiff > PI$5 / 2 ? onLeft ? 'left' : 'right' : onLeft ? 'right' : 'left'), labelLayout = { |
20196 | 20196 | rotation: rotationDiff,
|
20197 | 20197 | textAlign: textAlign,
|
20198 | 20198 | textVerticalAlign: textVerticalAlign
|
@@ -22924,19 +22924,19 @@
|
22924 | 22924 | ],
|
22925 | 22925 | [
|
22926 | 22926 | x + itemWidth,
|
22927 |
| - y + itemHeight |
| 22927 | + 0 + itemHeight |
22928 | 22928 | ],
|
22929 | 22929 | [
|
22930 | 22930 | head ? x : x - 5,
|
22931 |
| - y + itemHeight |
| 22931 | + 0 + itemHeight |
22932 | 22932 | ]
|
22933 | 22933 | ];
|
22934 | 22934 | return tail || points.splice(2, 0, [
|
22935 | 22935 | x + itemWidth + 5,
|
22936 |
| - y + itemHeight / 2 |
| 22936 | + 0 + itemHeight / 2 |
22937 | 22937 | ]), head || points.push([
|
22938 | 22938 | x,
|
22939 |
| - y + itemHeight / 2 |
| 22939 | + 0 + itemHeight / 2 |
22940 | 22940 | ]), points;
|
22941 | 22941 | }(lastX, 0, itemWidth, height, i === renderList.length - 1, 0 === i)
|
22942 | 22942 | },
|
|
28681 | 28681 | ]);
|
28682 | 28682 | }, LinesView.prototype._clearLayer = function(api) {
|
28683 | 28683 | var zr = api.getZr();
|
28684 |
| - 'svg' !== zr.painter.getType() && null != this._lastZlevel && zr.painter.getLayer(this._lastZlevel).clear(!0); |
| 28684 | + 'svg' === zr.painter.getType() || null == this._lastZlevel || zr.painter.getLayer(this._lastZlevel).clear(!0); |
28685 | 28685 | }, LinesView.prototype.remove = function(ecModel, api) {
|
28686 | 28686 | this._lineDraw && this._lineDraw.remove(), this._lineDraw = null, this._clearLayer(api);
|
28687 | 28687 | }, LinesView.type = 'lines', LinesView;
|
|
34689 | 34689 | return null !== _super && _super.apply(this, arguments) || this;
|
34690 | 34690 | }
|
34691 | 34691 | return __extends(DataView, _super), DataView.prototype.onclick = function(ecModel, api) {
|
34692 |
| - var seriesGroupByCategoryAxis, otherSeries, meta, groups, tables, result, container = api.getDom(), model = this.model; |
| 34692 | + var seriesGroupByCategoryAxis, otherSeries, meta, result, groups, tables, container = api.getDom(), model = this.model; |
34693 | 34693 | this._dom && container.removeChild(this._dom);
|
34694 | 34694 | var root = document.createElement('div');
|
34695 | 34695 | root.style.cssText = 'position:absolute;left:5px;top:5px;bottom:5px;right:5px;', root.style.backgroundColor = model.get('backgroundColor') || '#fff';
|
|
35481 | 35481 | }, TooltipHTMLContent.prototype.show = function(tooltipModel, nearPointColor) {
|
35482 | 35482 | clearTimeout(this._hideTimeout), clearTimeout(this._longHideTimeout);
|
35483 | 35483 | var enableTransition, onlyFade, cssText, transitionDuration, backgroundColor, shadowBlur, shadowColor, shadowOffsetX, shadowOffsetY, textStyleModel, padding, transitionCurve, transitionOption, transitionText, cssText1, fontSize, color, shadowColor1, shadowBlur1, shadowOffsetX1, shadowOffsetY1, el = this.el, style = el.style, styleCoord = this._styleCoord;
|
35484 |
| - el.innerHTML ? style.cssText = gCssText + (enableTransition = !this._firstShow, onlyFade = this._longHide, cssText = [], transitionDuration = tooltipModel.get('transitionDuration'), backgroundColor = tooltipModel.get('backgroundColor'), shadowBlur = tooltipModel.get('shadowBlur'), shadowColor = tooltipModel.get('shadowColor'), shadowOffsetX = tooltipModel.get('shadowOffsetX'), shadowOffsetY = tooltipModel.get('shadowOffsetY'), textStyleModel = tooltipModel.getModel('textStyle'), padding = getPaddingFromTooltipModel(tooltipModel, 'html'), cssText.push('box-shadow:' + (shadowOffsetX + "px " + shadowOffsetY + "px ") + shadowBlur + "px " + shadowColor), enableTransition && transitionDuration && cssText.push((transitionText = "opacity" + (transitionOption = " " + transitionDuration / 2 + "s " + (transitionCurve = 'cubic-bezier(0.23,1,0.32,1)')) + ",visibility" + transitionOption, onlyFade || (transitionOption = " " + transitionDuration + "s " + transitionCurve, transitionText += env.transformSupported ? "," + TRANSFORM_VENDOR + transitionOption : ",left" + transitionOption + ",top" + transitionOption), CSS_TRANSITION_VENDOR + ':' + transitionText)), backgroundColor && (env.canvasSupported ? cssText.push('background-color:' + backgroundColor) : (cssText.push('background-color:#' + toHex(backgroundColor)), cssText.push('filter:alpha(opacity=70)'))), each([ |
| 35484 | + el.innerHTML ? style.cssText = gCssText + (enableTransition = !this._firstShow, onlyFade = this._longHide, cssText = [], transitionDuration = tooltipModel.get('transitionDuration'), backgroundColor = tooltipModel.get('backgroundColor'), shadowBlur = tooltipModel.get('shadowBlur'), shadowColor = tooltipModel.get('shadowColor'), shadowOffsetX = tooltipModel.get('shadowOffsetX'), shadowOffsetY = tooltipModel.get('shadowOffsetY'), textStyleModel = tooltipModel.getModel('textStyle'), padding = getPaddingFromTooltipModel(tooltipModel, 'html'), cssText.push('box-shadow:' + shadowOffsetX + "px " + shadowOffsetY + "px " + shadowBlur + "px " + shadowColor), enableTransition && transitionDuration && cssText.push((transitionText = "opacity" + (transitionOption = " " + transitionDuration / 2 + "s " + (transitionCurve = 'cubic-bezier(0.23,1,0.32,1)')) + ",visibility" + transitionOption, onlyFade || (transitionOption = " " + transitionDuration + "s " + transitionCurve, transitionText += env.transformSupported ? "," + TRANSFORM_VENDOR + transitionOption : ",left" + transitionOption + ",top" + transitionOption), CSS_TRANSITION_VENDOR + ':' + transitionText)), backgroundColor && (env.canvasSupported ? cssText.push('background-color:' + backgroundColor) : (cssText.push('background-color:#' + toHex(backgroundColor)), cssText.push('filter:alpha(opacity=70)'))), each([ |
35485 | 35485 | 'width',
|
35486 | 35486 | 'color',
|
35487 | 35487 | 'radius'
|
|
0 commit comments