提交 e4c13082 编写于 作者: P pissang

fix: still compat barBorderRadius, barBorderColor

上级 0d467b1e
......@@ -19,11 +19,12 @@
// Compatitable with 2.0
import {each, isArray, isObject} from 'zrender/src/core/util';
import compatStyle from './helper/compatStyle';
import {each, isArray, isObject, isTypedArray} from 'zrender/src/core/util';
import compatStyle, {deprecateLog} from './helper/compatStyle';
import {normalizeToArray} from '../util/model';
import { Dictionary } from 'zrender/src/core/types';
import { ECUnitOption, SeriesOption } from '../util/types';
import { __DEV__ } from '../config';
function get(opt: Dictionary<any>, path: string): any {
const pathArr = path.split(',');
......@@ -70,6 +71,24 @@ const COMPATITABLE_COMPONENTS = [
'grid', 'geo', 'parallel', 'legend', 'toolbox', 'title', 'visualMap', 'dataZoom', 'timeline'
];
function compatBarItemStyle(option: Dictionary<any>) {
const itemStyle = option && option.itemStyle;
if (itemStyle) {
if (itemStyle.barBorderRadius != null) {
itemStyle.barderRadius = itemStyle.barBorderRadius;
if (__DEV__) {
deprecateLog('barBorderRadius has been changed to borderRadius.');
}
}
if (itemStyle.barBorderColor != null) {
itemStyle.borderColor = itemStyle.barBorderColor;
if (__DEV__) {
deprecateLog('barBorderColor has been changed to borderColor.');
}
}
}
}
export default function (option: ECUnitOption, isTheme?: boolean) {
compatStyle(option, isTheme);
......@@ -88,6 +107,7 @@ export default function (option: ECUnitOption, isTheme?: boolean) {
if (seriesOpt.clipOverflow != null) {
// @ts-ignore
seriesOpt.clip = seriesOpt.clipOverflow;
deprecateLog('clipOverflow has been changed to clip.');
}
}
else if (seriesType === 'pie' || seriesType === 'gauge') {
......@@ -95,6 +115,7 @@ export default function (option: ECUnitOption, isTheme?: boolean) {
if (seriesOpt.clockWise != null) {
// @ts-ignore
seriesOpt.clockwise = seriesOpt.clockWise;
deprecateLog('clockWise has been changed to clockwise.');
}
}
else if (seriesType === 'gauge') {
......@@ -102,6 +123,20 @@ export default function (option: ECUnitOption, isTheme?: boolean) {
pointerColor != null
&& set(seriesOpt, 'itemStyle.color', pointerColor);
}
else if (seriesType === 'bar') {
compatBarItemStyle(seriesOpt);
// @ts-ignore
compatBarItemStyle(seriesOpt.emphasis);
const data = seriesOpt.data;
if (data && !isTypedArray(data)) {
for (let i = 0; i < data.length; i++) {
if (data[i]) {
compatBarItemStyle(data[i]);
compatBarItemStyle(data[i] && data[i].emphasis);
}
}
}
}
compatLayoutProperties(seriesOpt);
});
......
......@@ -31,7 +31,7 @@ const POSSIBLE_STYLES = [
];
const storedLogs: Dictionary<boolean> = {};
function deprecateLog(str: string) {
export function deprecateLog(str: string) {
if (storedLogs[str]) { // Not display duplicate message.
return;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册