提交 83df54fa 编写于 作者: P pissang

fix(label): label color is dark by default in pie and sunburst.

上级 27c3cce8
......@@ -244,7 +244,7 @@ class PieSeriesModel extends SeriesModel<PieSeriesOption> {
height: null,
label: {
color: 'inherit',
// color: 'inherit',
// If rotate around circle
rotate: 0,
show: true,
......
......@@ -26,9 +26,10 @@ import GlobalModel from '../../model/Global';
import ExtensionAPI from '../../ExtensionAPI';
import { Payload, ColorString, ECElement } from '../../util/types';
import List from '../../data/List';
import PieSeriesModel, {PieDataItemOption} from './PieSeries';
import PieSeriesModel, {PieDataItemOption, PieSeriesOption} from './PieSeries';
import labelLayout from './labelLayout';
import { setLabelLineStyle } from '../../label/labelGuideHelper';
import Model from '../../model/Model';
function updateDataSelected(
this: PiePiece,
......@@ -176,9 +177,9 @@ class PiePiece extends graphic.Sector {
const visualColor = style && style.fill as ColorString;
graphic.setLabelStyle(
labelText,
labelModel,
labelHoverModel,
sector,
labelModel as Model<Omit<PieSeriesOption['label'], 'position' | 'rotate'>>, // position / rotate won't be used.
labelHoverModel as Model<Omit<PieSeriesOption['label'], 'position' | 'rotate'>>,
{
labelFetcher: data.hostModel as PieSeriesModel,
labelDataIndex: idx,
......@@ -193,8 +194,9 @@ class PiePiece extends graphic.Sector {
// Set textConfig on sector.
sector.setTextConfig({
local: true,
outsideFill: labelModel.get('color') === 'inherit' ? visualColor : 'auto'
// reset position, rotation
position: null,
rotation: null
});
// Make sure update style on labelText after setLabelStyle.
......
......@@ -231,11 +231,9 @@ class SunburstPiece extends graphic.Sector {
const sectorState = isNormal ? sector : sector.states[stateName];
const labelColor = sectorState.style.fill as ColorString;
sectorState.textConfig = {
outsideFill: labelStateModel.get('color') === 'inherit' ? labelColor : null,
inside: labelPosition !== 'outside'
};
if (labelColor) {
sectorState.textConfig.insideStroke = sectorState.textConfig.outsideFill = labelColor;
}
let r;
const labelPadding = getLabelAttr(labelStateModel, 'distance') || 0;
......
......@@ -98,6 +98,7 @@ under the License.
type: 'pie',
radius : '55%',
center: ['50%', '60%'],
selectedMode: 'single',
data:[
{value:335, name:'直接访问'},
{value:310, name:'邮件营销'},
......
......@@ -307,6 +307,7 @@ under the License.
type: 'pie',
radius: ['50%', '70%'],
label: {
color: 'inherit',
show: false
},
emphasis: {
......@@ -450,7 +451,6 @@ under the License.
formatter: function (param) {
return param.data[3];
},
color: '#333',
textBorderColor: '#fff',
textBorderWidth: 1,
position: 'top'
......
......@@ -713,6 +713,9 @@ under the License.
data: data,
radius: [0, '95%'],
sort: null,
label: {
color: 'inherit'
},
levels: [{}, {
r0: '15%',
r: '35%',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册