Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
b24a46e6
提交
b24a46e6
authored
3月 10, 2022
作者:
junjun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: 颜色优化
上级
8b6dc5c0
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
16 行增加
和
16 行删除
+16
-16
bar.js
frontend/src/views/chart/chart/bar/bar.js
+2
-2
funnel.js
frontend/src/views/chart/chart/funnel/funnel.js
+1
-1
gauge.js
frontend/src/views/chart/chart/gauge/gauge.js
+2
-2
gauge_antv.js
frontend/src/views/chart/chart/gauge/gauge_antv.js
+2
-2
line.js
frontend/src/views/chart/chart/line/line.js
+1
-1
map.js
frontend/src/views/chart/chart/map/map.js
+1
-1
mix.js
frontend/src/views/chart/chart/mix/mix.js
+1
-1
mix_antv.js
frontend/src/views/chart/chart/mix/mix_antv.js
+1
-1
pie.js
frontend/src/views/chart/chart/pie/pie.js
+2
-2
radar.js
frontend/src/views/chart/chart/radar/radar.js
+1
-1
scatter.js
frontend/src/views/chart/chart/scatter/scatter.js
+1
-1
treemap.js
frontend/src/views/chart/chart/treemap/treemap.js
+1
-1
没有找到文件。
frontend/src/views/chart/chart/bar/bar.js
浏览文件 @
b24a46e6
...
@@ -25,7 +25,7 @@ export function baseBarOption(chart_option, chart) {
...
@@ -25,7 +25,7 @@ export function baseBarOption(chart_option, chart) {
const
y
=
chart
.
data
.
series
[
i
]
const
y
=
chart
.
data
.
series
[
i
]
// color
// color
y
.
itemStyle
=
{
y
.
itemStyle
=
{
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
)
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
)
}
}
// size
// size
if
(
customAttr
.
size
)
{
if
(
customAttr
.
size
)
{
...
@@ -88,7 +88,7 @@ export function horizontalBarOption(chart_option, chart) {
...
@@ -88,7 +88,7 @@ export function horizontalBarOption(chart_option, chart) {
const
y
=
chart
.
data
.
series
[
i
]
const
y
=
chart
.
data
.
series
[
i
]
// color
// color
y
.
itemStyle
=
{
y
.
itemStyle
=
{
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
)
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
)
}
}
// size
// size
if
(
customAttr
.
size
)
{
if
(
customAttr
.
size
)
{
...
...
frontend/src/views/chart/chart/funnel/funnel.js
浏览文件 @
b24a46e6
...
@@ -40,7 +40,7 @@ export function baseFunnelOption(chart_option, chart) {
...
@@ -40,7 +40,7 @@ export function baseFunnelOption(chart_option, chart) {
y
.
name
=
chart
.
data
.
x
[
i
]
y
.
name
=
chart
.
data
.
x
[
i
]
// color
// color
y
.
itemStyle
=
{
y
.
itemStyle
=
{
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
)
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
)
}
}
// y.type = 'funnel'
// y.type = 'funnel'
chart_option
.
series
[
0
].
data
.
push
(
y
)
chart_option
.
series
[
0
].
data
.
push
(
y
)
...
...
frontend/src/views/chart/chart/gauge/gauge.js
浏览文件 @
b24a46e6
...
@@ -63,7 +63,7 @@ export function baseGaugeOption(chart_option, chart) {
...
@@ -63,7 +63,7 @@ export function baseGaugeOption(chart_option, chart) {
for
(
let
i
=
0
;
i
<
arr
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
arr
.
length
;
i
++
)
{
const
ele
=
arr
[
i
]
const
ele
=
arr
[
i
]
const
p
=
parseInt
(
ele
)
/
100
const
p
=
parseInt
(
ele
)
/
100
range
.
push
([
p
,
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
)])
range
.
push
([
p
,
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
)])
if
(
!
flag
&&
per
<=
p
)
{
if
(
!
flag
&&
per
<=
p
)
{
flag
=
true
flag
=
true
index
=
i
index
=
i
...
@@ -73,7 +73,7 @@ export function baseGaugeOption(chart_option, chart) {
...
@@ -73,7 +73,7 @@ export function baseGaugeOption(chart_option, chart) {
index
=
arr
.
length
index
=
arr
.
length
}
}
range
.
push
([
1
,
hexColorToRGBA
(
customAttr
.
color
.
colors
[
arr
.
length
%
9
],
customAttr
.
color
.
alpha
)])
range
.
push
([
1
,
hexColorToRGBA
(
customAttr
.
color
.
colors
[
arr
.
length
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
)])
chart_option
.
series
[
0
].
axisLine
=
{
chart_option
.
series
[
0
].
axisLine
=
{
lineStyle
:
{
lineStyle
:
{
color
:
range
color
:
range
...
...
frontend/src/views/chart/chart/gauge/gauge_antv.js
浏览文件 @
b24a46e6
...
@@ -88,12 +88,12 @@ export function baseGaugeOptionAntV(plot, container, chart, action) {
...
@@ -88,12 +88,12 @@ export function baseGaugeOptionAntV(plot, container, chart, action) {
options
.
indicator
=
{
options
.
indicator
=
{
pointer
:
{
pointer
:
{
style
:
{
style
:
{
stroke
:
theme
.
styleSheet
.
paletteQualitative10
[
index
%
9
]
stroke
:
theme
.
styleSheet
.
paletteQualitative10
[
index
%
theme
.
styleSheet
.
paletteQualitative10
.
length
]
}
}
},
},
pin
:
{
pin
:
{
style
:
{
style
:
{
stroke
:
theme
.
styleSheet
.
paletteQualitative10
[
index
%
9
]
stroke
:
theme
.
styleSheet
.
paletteQualitative10
[
index
%
theme
.
styleSheet
.
paletteQualitative10
.
length
]
}
}
}
}
}
}
...
...
frontend/src/views/chart/chart/line/line.js
浏览文件 @
b24a46e6
...
@@ -25,7 +25,7 @@ export function baseLineOption(chart_option, chart) {
...
@@ -25,7 +25,7 @@ export function baseLineOption(chart_option, chart) {
const
y
=
chart
.
data
.
series
[
i
]
const
y
=
chart
.
data
.
series
[
i
]
// color
// color
y
.
itemStyle
=
{
y
.
itemStyle
=
{
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
)
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
)
}
}
// size
// size
if
(
customAttr
.
size
)
{
if
(
customAttr
.
size
)
{
...
...
frontend/src/views/chart/chart/map/map.js
浏览文件 @
b24a46e6
...
@@ -73,7 +73,7 @@ export function baseMapOption(chart_option, chart) {
...
@@ -73,7 +73,7 @@ export function baseMapOption(chart_option, chart) {
y
.
name
=
chart
.
data
.
x
[
i
]
y
.
name
=
chart
.
data
.
x
[
i
]
// color
// color
// y.itemStyle = {
// y.itemStyle = {
// color: hexColorToRGBA(customAttr.color.colors[i %
9
], customAttr.color.alpha),
// color: hexColorToRGBA(customAttr.color.colors[i %
customAttr.color.colors.length
], customAttr.color.alpha),
// borderRadius: 0
// borderRadius: 0
// }
// }
chart_option
.
series
[
0
].
data
.
push
(
y
)
chart_option
.
series
[
0
].
data
.
push
(
y
)
...
...
frontend/src/views/chart/chart/mix/mix.js
浏览文件 @
b24a46e6
...
@@ -27,7 +27,7 @@ export function baseMixOption(chart_option, chart) {
...
@@ -27,7 +27,7 @@ export function baseMixOption(chart_option, chart) {
y
.
type
=
y
.
type
?
y
.
type
:
'bar'
y
.
type
=
y
.
type
?
y
.
type
:
'bar'
// color
// color
y
.
itemStyle
=
{
y
.
itemStyle
=
{
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
)
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
)
}
}
// size
// size
if
(
customAttr
.
size
)
{
if
(
customAttr
.
size
)
{
...
...
frontend/src/views/chart/chart/mix/mix_antv.js
浏览文件 @
b24a46e6
...
@@ -43,7 +43,7 @@ export function baseMixOptionAntV(plot, container, chart, action) {
...
@@ -43,7 +43,7 @@ export function baseMixOptionAntV(plot, container, chart, action) {
const
o
=
{
const
o
=
{
type
:
''
,
type
:
''
,
options
:
{
options
:
{
color
:
colors
[
i
%
9
],
color
:
colors
[
i
%
colors
.
length
],
data
:
d
.
data
,
data
:
d
.
data
,
xField
:
'field'
,
xField
:
'field'
,
yField
:
'value'
,
yField
:
'value'
,
...
...
frontend/src/views/chart/chart/pie/pie.js
浏览文件 @
b24a46e6
...
@@ -41,7 +41,7 @@ export function basePieOption(chart_option, chart) {
...
@@ -41,7 +41,7 @@ export function basePieOption(chart_option, chart) {
y
.
name
=
chart
.
data
.
x
[
i
]
y
.
name
=
chart
.
data
.
x
[
i
]
// color
// color
y
.
itemStyle
=
{
y
.
itemStyle
=
{
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
),
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
),
borderRadius
:
0
borderRadius
:
0
}
}
y
.
type
=
'pie'
y
.
type
=
'pie'
...
@@ -94,7 +94,7 @@ export function rosePieOption(chart_option, chart) {
...
@@ -94,7 +94,7 @@ export function rosePieOption(chart_option, chart) {
y
.
name
=
chart
.
data
.
x
[
i
]
y
.
name
=
chart
.
data
.
x
[
i
]
// color
// color
y
.
itemStyle
=
{
y
.
itemStyle
=
{
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
),
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
),
borderRadius
:
customAttr
.
size
.
pieRoseRadius
borderRadius
:
customAttr
.
size
.
pieRoseRadius
}
}
y
.
type
=
'pie'
y
.
type
=
'pie'
...
...
frontend/src/views/chart/chart/radar/radar.js
浏览文件 @
b24a46e6
...
@@ -33,7 +33,7 @@ export function baseRadarOption(chart_option, chart) {
...
@@ -33,7 +33,7 @@ export function baseRadarOption(chart_option, chart) {
}
}
// color
// color
y
.
itemStyle
=
{
y
.
itemStyle
=
{
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
)
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
)
}
}
// label
// label
if
(
customAttr
.
label
)
{
if
(
customAttr
.
label
)
{
...
...
frontend/src/views/chart/chart/scatter/scatter.js
浏览文件 @
b24a46e6
...
@@ -30,7 +30,7 @@ export function baseScatterOption(chart_option, chart, terminal = 'pc') {
...
@@ -30,7 +30,7 @@ export function baseScatterOption(chart_option, chart, terminal = 'pc') {
const
y
=
chart
.
data
.
series
[
i
]
const
y
=
chart
.
data
.
series
[
i
]
// color
// color
y
.
itemStyle
=
{
y
.
itemStyle
=
{
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
)
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
)
}
}
// size
// size
if
(
customAttr
.
size
)
{
if
(
customAttr
.
size
)
{
...
...
frontend/src/views/chart/chart/treemap/treemap.js
浏览文件 @
b24a46e6
...
@@ -49,7 +49,7 @@ export function baseTreemapOption(chart_option, chart) {
...
@@ -49,7 +49,7 @@ export function baseTreemapOption(chart_option, chart) {
y
.
name
=
chart
.
data
.
x
[
i
]
y
.
name
=
chart
.
data
.
x
[
i
]
// color
// color
y
.
itemStyle
=
{
y
.
itemStyle
=
{
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
9
],
customAttr
.
color
.
alpha
)
color
:
hexColorToRGBA
(
customAttr
.
color
.
colors
[
i
%
customAttr
.
color
.
colors
.
length
],
customAttr
.
color
.
alpha
)
}
}
// y.type = 'treemap'
// y.type = 'treemap'
chart_option
.
series
[
0
].
data
.
push
(
y
)
chart_option
.
series
[
0
].
data
.
push
(
y
)
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论