Skip to content

fix(theme): fix the abandoned normal level in the theme file #17482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plainheart merged 2 commits into from
Aug 9, 2022
Merged

fix(theme): fix the abandoned normal level in the theme file #17482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08eb9a8
fix(theme): fix the abandoned normal level in the theme file. close #…
Liangism Aug 8, 2022
1e7f3b8
fix(theme): move the label block to the outside.
Liangism Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions theme/infographic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@

toolbox: {
iconStyle: {
normal: {
borderColor: colorPalette[0]
}
borderColor: colorPalette[0]
}
},

Expand Down Expand Up @@ -152,8 +150,10 @@
borderColor: '#fff',
lineStyle: {
width: 3
},
emphasis: {
}
},
emphasis: {
itemStyle: {
borderWidth: 0
}
},
Expand Down
4 changes: 1 addition & 3 deletions theme/macarons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,7 @@

toolbox: {
iconStyle: {
normal: {
borderColor: colorPalette[0]
}
borderColor: colorPalette[0]
}
},

Expand Down
119 changes: 58 additions & 61 deletions theme/macarons2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,70 +88,67 @@
// barWidth: null, // 默认自适应
barGap: '30%', // 柱间距离，默认为柱形宽度的30%，可设固定值
barCategoryGap: '20%', // 类目间柱形距离，默认为类目间距的20%，可设固定值
label: {
show: false
// position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
// 'inside'|'left'|'right'|'top'|'bottom'
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
},
itemStyle: {
normal: {
// color: '各异',
barBorderColor: '#fff', // 柱条边线
barBorderRadius: 0, // 柱条边线圆角，单位px，默认为0
barBorderWidth: 1, // 柱条边线线宽，单位px，默认为1
label: {
show: false
// position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
// 'inside'|'left'|'right'|'top'|'bottom'
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
}
},
emphasis: {
// color: '各异',
barBorderColor: '#fff', // 柱条边线
barBorderRadius: 0, // 柱条边线圆角，单位px，默认为0
barBorderWidth: 1 // 柱条边线线宽，单位px，默认为1
},
emphasis: {
itemStyle: {
// color: '各异',
barBorderColor: 'rgba(0,0,0,0)', // 柱条边线
barBorderRadius: 0, // 柱条边线圆角，单位px，默认为0
barBorderWidth: 1, // 柱条边线线宽，单位px，默认为1
label: {
show: false
// position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
// 'inside'|'left'|'right'|'top'|'bottom'
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
}
},
label: {
show: false
// position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
// 'inside'|'left'|'right'|'top'|'bottom'
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
}
}
},

line: {
label: {
show: false
// position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
// 'inside'|'left'|'right'|'top'|'bottom'
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
},
itemStyle: {
normal: {
// color: 各异,
label: {
show: false
// position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
// 'inside'|'left'|'right'|'top'|'bottom'
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
},
lineStyle: {
width: 2,
type: 'solid',
shadowColor: 'rgba(0,0,0,0)', //默认透明
shadowBlur: 5,
shadowOffsetX: 3,
shadowOffsetY: 3
}
},
emphasis: {
// color: 各异,
label: {
show: false
// position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
// 'inside'|'left'|'right'|'top'|'bottom'
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
}
// color: 各异,
},
emphasis: {
// color: 各异,
label: {
show: false
// position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
// 'inside'|'left'|'right'|'top'|'bottom'
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
}
},
lineStyle: {
width: 2,
type: 'solid',
shadowColor: 'rgba(0,0,0,0)', //默认透明
shadowBlur: 5,
shadowOffsetX: 3,
shadowOffsetY: 3
},
//smooth : false,
//symbol: null, // 拐点图形类型
symbolSize: 2, // 拐点图形大小
//symbolRotate : null, // 拐点图形旋转控制
showAllSymbol: false // 标志图形默认只有主轴显示（随主轴标签间隔隐藏策略）
},

candlestick: {
itemStyle: {
color: '#fe9778',
Expand All @@ -176,25 +173,25 @@
startAngle: 90,
minAngle: 0, // 最小角度改为0
selectedOffset: 10, // 选中是扇区偏移量
label: {
show: true,
position: 'outer',
color: '#1b1b1b',
lineStyle: { color: '#1b1b1b' }
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
},
itemStyle: {
// color: 各异,
borderColor: '#fff',
borderWidth: 1,
label: {
show: true,
position: 'outer',
color: '#1b1b1b',
lineStyle: { color: '#1b1b1b' }
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
},
labelLine: {
show: true,
length: 20,
lineStyle: {
// color: 各异,
width: 1,
type: 'solid'
}
borderWidth: 1
},
labelLine: {
show: true,
length: 20,
lineStyle: {
// color: 各异,
width: 1,
type: 'solid'
}
}
},
Expand Down
4 changes: 1 addition & 3 deletions theme/shine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@

toolbox: {
iconStyle: {
normal: {
borderColor: '#06467c'
}
borderColor: '#06467c'
}
},

Expand Down
8 changes: 6 additions & 2 deletions theme/tech-blue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,12 @@
color: '#00aecd'
},
controlStyle: {
normal: { color: '#00aecd' },
emphasis: { color: '#00aecd' }
color: '#00aecd',
},
emphasis: {
controlStyle: {
color: '#00aecd'
}
}
},

Expand Down
16 changes: 7 additions & 9 deletions theme/tool/option/area.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,41 +49,39 @@ export default {
name:'Email',
type:'line',
stack: '总量',
areaStyle: {normal: {}},
areaStyle: {},
data:[120, 132, 101, 134, 90, 230, 210]
},
{
name:'联盟广告',
type:'line',
stack: '总量',
areaStyle: {normal: {}},
areaStyle: {},
data:[220, 182, 191, 234, 290, 330, 310]
},
{
name:'视频广告',
type:'line',
stack: '总量',
areaStyle: {normal: {}},
areaStyle: {},
data:[150, 232, 201, 154, 190, 330, 410]
},
{
name:'直接访问',
type:'line',
stack: '总量',
areaStyle: {normal: {}},
areaStyle: {},
data:[320, 332, 301, 334, 390, 330, 320]
},
{
name:'搜索引擎',
type:'line',
stack: '总量',
label: {
normal: {
show: true,
position: 'top'
}
show: true,
position: 'top'
},
areaStyle: {normal: {}},
areaStyle: {},
data:[820, 932, 901, 934, 1290, 1330, 1320]
}
]
Expand Down
32 changes: 11 additions & 21 deletions theme/tool/option/bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ export default {
type:'bar',
stack: '总量',
label: {
normal: {
show: true,
position: 'insideRight'
}
show: true,
position: 'insideRight'
},
data:[320, 302, 301, 334, 390, 330, 320]
},
Expand All @@ -70,10 +68,8 @@ export default {
type:'bar',
stack: '总量',
label: {
normal: {
show: true,
position: 'insideRight'
}
show: true,
position: 'insideRight'
},
data:[120, 132, 101, 134, 90, 230, 210]
},
Expand All @@ -82,10 +78,8 @@ export default {
type:'bar',
stack: '总量',
label: {
normal: {
show: true,
position: 'insideRight'
}
show: true,
position: 'insideRight'
},
data:[220, 182, 191, 234, 290, 330, 310]
},
Expand All @@ -94,10 +88,8 @@ export default {
type:'bar',
stack: '总量',
label: {
normal: {
show: true,
position: 'insideRight'
}
show: true,
position: 'insideRight'
},
data:[150, 212, 201, 154, 190, 330, 410]
},
Expand All @@ -106,12 +98,10 @@ export default {
type:'bar',
stack: '总量',
label: {
normal: {
show: true,
position: 'insideRight'
}
show: true,
position: 'insideRight'
},
data:[820, 832, 901, 934, 1290, 1330, 1320]
}
]
};
};
Loading