chore: merge master branch

Author: plainheart

src/component/dataZoom/SliderZoomView.ts

@@ -17,12 +17,12 @@
 * under the License.
 */
 
-import {bind, each, isFunction, isString, indexOf} from 'zrender/src/core/util';
+import { bind, each, isFunction, isString, indexOf } from 'zrender/src/core/util';
 import * as eventTool from 'zrender/src/core/event';
 import * as graphic from '../../util/graphic';
 import * as throttle from '../../util/throttle';
 import DataZoomView from './DataZoomView';
-import {linearMap, asc, parsePercent} from '../../util/number';
+import { linearMap, asc, parsePercent } from '../../util/number';
 import * as layout from '../../util/layout';
 import sliderMove from '../helper/sliderMove';
 import GlobalModel from '../../model/Global';
@@ -41,7 +41,7 @@ import { createSymbol, symbolBuildProxies } from '../../util/symbol';
 import { deprecateLog } from '../../util/log';
 import { PointLike } from 'zrender/src/core/Point';
 import Displayable from 'zrender/src/graphic/Displayable';
-import {createTextStyle} from '../../label/labelStyle';
+import { createTextStyle } from '../../label/labelStyle';
 import SeriesData from '../../data/SeriesData';
 
 const Rect = graphic.Rect;
@@ -227,7 +227,7 @@ class SliderZoomView extends DataZoomView {
         // If some of x/y/width/height are not specified,
         // auto-adapt according to target grid.
         const coordRect = this._findCoordRect();
-        const ecSize = {width: api.getWidth(), height: api.getHeight()};
+        const ecSize = { width: api.getWidth(), height: api.getHeight() };
         // Default align by coordinate system rect.
         const positionInfo = this._orient === HORIZONTAL
             ? {
@@ -261,7 +261,7 @@ class SliderZoomView extends DataZoomView {
             ecSize
         );
 
-        this._location = {x: layoutRect.x, y: layoutRect.y};
+        this._location = { x: layoutRect.x, y: layoutRect.y };
         this._size = [layoutRect.width, layoutRect.height];
         this._orient === VERTICAL && this._size.reverse();
     }
@@ -375,6 +375,7 @@ class SliderZoomView extends DataZoomView {
             data !== this._shadowData || otherDim !== this._shadowDim
             || size[0] !== oldSize[0] || size[1] !== oldSize[1]
         ) {
+            const thisDataExtent = data.getDataExtent(info.thisDim);
             let otherDataExtent = data.getDataExtent(otherDim);
             // Nice extent.
             const otherOffset = (otherDataExtent[1] - otherDataExtent[0]) * 0.3;
@@ -388,26 +389,35 @@ class SliderZoomView extends DataZoomView {
             const areaPoints = [[size[0], 0], [0, 0]];
             const linePoints: number[][] = [];
             const step = thisShadowExtent[1] / (data.count() - 1);
-            let thisCoord = 0;
+            const normalizationConstant = size[0] / (thisDataExtent[1] - thisDataExtent[0]);
+            const isTimeAxis = info.thisAxis.type === 'time';
+            let thisCoord = -step;
 
             // Optimize for large data shadow
             const stride = Math.round(data.count() / size[0]);
             let lastIsEmpty: boolean;
-            data.each([otherDim], function (value: ParsedValue, index) {
+
+            data.each([info.thisDim, otherDim], function (thisValue: ParsedValue, otherValue: ParsedValue, index) {
                 if (stride > 0 && (index % stride)) {
-                    thisCoord += step;
+                    if (!isTimeAxis) {
+                        thisCoord += step;
+                    }
                     return;
                 }
 
+                thisCoord = isTimeAxis
+                    ? (+thisValue - thisDataExtent[0]) * normalizationConstant
+                    : thisCoord + step;
+
                 // FIXME
                 // Should consider axis.min/axis.max when drawing dataShadow.
 
                 // FIXME
                 // 应该使用统一的空判断？还是在list里进行空判断？
-                const isEmpty = value == null || isNaN(value as number) || value === '';
+                const isEmpty = otherValue == null || isNaN(otherValue as number) || otherValue === '';
                 // See #4235.
                 const otherCoord = isEmpty
-                    ? 0 : linearMap(value as number, otherDataExtent, otherShadowExtent, true);
+                    ? 0 : linearMap(otherValue as number, otherDataExtent, otherShadowExtent, true);
 
                 // Attempt to draw data shadow precisely when there are empty value.
                 if (isEmpty && !lastIsEmpty && index) {
@@ -422,7 +432,6 @@ class SliderZoomView extends DataZoomView {
                 areaPoints.push([thisCoord, otherCoord]);
                 linePoints.push([thisCoord, otherCoord]);
 
-                thisCoord += step;
                 lastIsEmpty = isEmpty;
             });
 
@@ -440,14 +449,14 @@ class SliderZoomView extends DataZoomView {
             const model = dataZoomModel.getModel(isSelectedArea ? 'selectedDataBackground' : 'dataBackground');
             const group = new graphic.Group();
             const polygon = new graphic.Polygon({
-                shape: {points: polygonPts},
+                shape: { points: polygonPts },
                 segmentIgnoreThreshold: 1,
                 style: model.getModel('areaStyle').getAreaStyle(),
                 silent: true,
                 z2: -20
             });
             const polyline = new graphic.Polyline({
-                shape: {points: polylinePts},
+                shape: { points: polylinePts },
                 segmentIgnoreThreshold: 1,
                 style: model.getModel('lineStyle').getLineStyle(),
                 silent: true,
@@ -489,8 +498,8 @@ class SliderZoomView extends DataZoomView {
                 }
 
                 if (showDataShadow !== true && indexOf(
-                        SHOW_DATA_SHADOW_SERIES_TYPE, seriesModel.get('type')
-                    ) < 0
+                    SHOW_DATA_SHADOW_SERIES_TYPE, seriesModel.get('type')
+                ) < 0
                 ) {
                     return;
                 }
@@ -675,8 +684,8 @@ class SliderZoomView extends DataZoomView {
             });
 
             actualMoveZone.on('mouseover', () => {
-                    api.enterEmphasis(moveHandle);
-                })
+                api.enterEmphasis(moveHandle);
+            })
                 .on('mouseout', () => {
                     api.leaveEmphasis(moveHandle);
                 });
@@ -882,8 +891,8 @@ class SliderZoomView extends DataZoomView {
         return isFunction(labelFormatter)
             ? labelFormatter(value as number, valueStr)
             : isString(labelFormatter)
-            ? labelFormatter.replace('{value}', valueStr)
-            : valueStr;
+                ? labelFormatter.replace('{value}', valueStr)
+                : valueStr;
     }
 
     /**
@@ -1103,7 +1112,7 @@ class SliderZoomView extends DataZoomView {
 function getOtherDim(thisDim: 'x' | 'y' | 'radius' | 'angle' | 'single' | 'z') {
     // FIXME
     // 这个逻辑和getOtherAxis里一致，但是写在这里是否不好
-    const map = {x: 'y', y: 'x', radius: 'angle', angle: 'radius'};
+    const map = { x: 'y', y: 'x', radius: 'angle', angle: 'radius' };
     return map[thisDim as 'x' | 'y' | 'radius' | 'angle'];
 }
 

src/component/visualMap/ContinuousView.ts

@@ -191,8 +191,10 @@ class ContinuousView extends VisualMapView {
             style: createTextStyle(textStyleModel, {
                 x: position[0],
                 y: position[1],
-                verticalAlign: orient === 'horizontal' ? 'middle' : align as TextVerticalAlign,
-                align: orient === 'horizontal' ? align as TextAlign : 'center',
+                verticalAlign: textStyleModel.get('verticalAlign')
+                    || (orient === 'horizontal' ? 'middle' : align as TextVerticalAlign),
+                align: textStyleModel.get('align')
+                    || (orient === 'horizontal' ? align as TextAlign : 'center'),
                 text
             })
         }));

src/component/visualMap/PiecewiseView.ts

@@ -44,8 +44,6 @@ class PiecewiseVisualMapView extends VisualMapView {
         const visualMapModel = this.visualMapModel;
         const textGap = visualMapModel.get('textGap');
         const textStyleModel = visualMapModel.textStyleModel;
-        const textFont = textStyleModel.getFont();
-        const textFill = textStyleModel.getTextColor();
         const itemAlign = this._getItemAlign();
         const itemSize = visualMapModel.itemSize;
         const viewData = this._getViewData();
@@ -74,17 +72,19 @@ class PiecewiseVisualMapView extends VisualMapView {
 
             if (showLabel) {
                 const visualState = this.visualMapModel.getValueState(representValue);
+                const align = textStyleModel.get('align') || itemAlign as TextAlign;
                 itemGroup.add(new graphic.Text({
-                    style: {
-                        x: itemAlign === 'right' ? -textGap : itemSize[0] + textGap,
+                    style: createTextStyle(textStyleModel, {
+                        x: align === 'right' ? -textGap : itemSize[0] + textGap,
                         y: itemSize[1] / 2,
                         text: piece.text,
-                        verticalAlign: 'middle',
-                        align: itemAlign as TextAlign,
-                        font: textFont,
-                        fill: textFill,
-                        opacity: visualState === 'outOfRange' ? 0.5 : 1,
-                    },
+                        verticalAlign: textStyleModel.get('verticalAlign') || 'middle',
+                        align,
+                        opacity: zrUtil.retrieve2(
+                            textStyleModel.get('opacity'),
+                            visualState === 'outOfRange' ? 0.5 : 1
+                        ),
+                    }),
                     silent
                 }));
             }

src/label/labelStyle.ts

@@ -395,15 +395,25 @@ function setTextStyleCommon(
     let richResult: TextStyleProps['rich'];
     if (richItemNames) {
         richResult = {};
+        const richInheritPlainLabelOptionName = 'richInheritPlainLabel' as const;
+        const richInheritPlainLabel = retrieve2(
+            textStyleModel.get(richInheritPlainLabelOptionName),
+            ecModel && ecModel.get(richInheritPlainLabelOptionName)
+        );
         for (const name in richItemNames) {
             if (richItemNames.hasOwnProperty(name)) {
                 // Cascade is supported in rich.
-                const richTextStyle = textStyleModel.getModel(['rich', name]);
+                const richTextStyle = textStyleModel.getModel(
+                    ['rich', name],
+                    richInheritPlainLabel !== false ? textStyleModel : void 0
+                );
                 // In rich, never `disableBox`.
-                // FIXME: consider `label: {formatter: '{a|xx}', color: 'blue', rich: {a: {}}}`,
+                // consider `label: {formatter: '{a|xx}', color: 'blue', rich: {a: {}}}`,
                 // the default color `'blue'` will not be adopted if no color declared in `rich`.
                 // That might confuses users. So probably we should put `textStyleModel` as the
                 // root ancestor of the `richTextStyle`. But that would be a break change.
+                // Since v6, the rich style inherits plain label by default
+                // but this behavior can be disabled by setting `richInheritPlainLabel` to `false`.
                 setTokenTextStyle(
                     richResult[name] = {}, richTextStyle, globalTextStyle, opt, isNotNormal, isAttached, false, true
                 );