You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by wa...@apache.org on 2020/11/02 02:09:42 UTC
[incubator-echarts] branch fix-theme created (now 5cce192)
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a change to branch fix-theme
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
at 5cce192 fix(theme): fix deprecated usage.
This branch includes the following new commits:
new 5cce192 fix(theme): fix deprecated usage.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/01: fix(theme): fix deprecated usage.
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch fix-theme
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 5cce1921a5e769ec119e601e49193ebf46a1eee6
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Mon Nov 2 09:56:29 2020 +0800
fix(theme): fix deprecated usage.
---
src/theme/dark.ts | 6 ++----
theme/dark-blue.js | 8 ++------
theme/dark-bold.js | 8 ++------
theme/dark-digerati.js | 8 ++------
theme/dark-fresh-cut.js | 8 ++------
theme/dark-mushroom.js | 8 ++------
theme/dark.js | 8 ++------
theme/infographic.js | 4 +---
theme/macarons2.js | 36 +++++++++++++++++-------------------
theme/shine.js | 12 +++---------
10 files changed, 35 insertions(+), 71 deletions(-)
diff --git a/src/theme/dark.ts b/src/theme/dark.ts
index 5aa4c91..a4c6aa9 100644
--- a/src/theme/dark.ts
+++ b/src/theme/dark.ts
@@ -148,9 +148,7 @@ const theme = {
color: contrastColor
},
label: {
- textStyle: {
- color: contrastColor
- }
+ color: contrastColor
},
controlStyle: {
color: contrastColor,
@@ -209,4 +207,4 @@ const theme = {
};
(theme.categoryAxis.splitLine as any).show = false;
-export default theme;
\ No newline at end of file
+export default theme;
diff --git a/theme/dark-blue.js b/theme/dark-blue.js
index 44b89fb..3116bf4 100644
--- a/theme/dark-blue.js
+++ b/theme/dark-blue.js
@@ -55,9 +55,7 @@
}
},
axisLabel: {
- textStyle: {
- color: contrastColor
- }
+ color: contrastColor
},
splitLine: {
lineStyle: {
@@ -108,9 +106,7 @@
},
toolbox: {
iconStyle: {
- normal: {
- borderColor: contrastColor
- }
+ borderColor: contrastColor
}
},
diff --git a/theme/dark-bold.js b/theme/dark-bold.js
index b18de33..ad74d6a 100644
--- a/theme/dark-bold.js
+++ b/theme/dark-bold.js
@@ -55,9 +55,7 @@
}
},
axisLabel: {
- textStyle: {
- color: contrastColor
- }
+ color: contrastColor
},
splitLine: {
lineStyle: {
@@ -108,9 +106,7 @@
},
toolbox: {
iconStyle: {
- normal: {
- borderColor: contrastColor
- }
+ borderColor: contrastColor
}
},
diff --git a/theme/dark-digerati.js b/theme/dark-digerati.js
index fe3d102..1cbae57 100644
--- a/theme/dark-digerati.js
+++ b/theme/dark-digerati.js
@@ -55,9 +55,7 @@
}
},
axisLabel: {
- textStyle: {
- color: contrastColor
- }
+ color: contrastColor
},
splitLine: {
lineStyle: {
@@ -108,9 +106,7 @@
},
toolbox: {
iconStyle: {
- normal: {
- borderColor: contrastColor
- }
+ borderColor: contrastColor
}
},
diff --git a/theme/dark-fresh-cut.js b/theme/dark-fresh-cut.js
index af56c09..4c96d2e 100644
--- a/theme/dark-fresh-cut.js
+++ b/theme/dark-fresh-cut.js
@@ -55,9 +55,7 @@
}
},
axisLabel: {
- textStyle: {
- color: contrastColor
- }
+ color: contrastColor
},
splitLine: {
lineStyle: {
@@ -108,9 +106,7 @@
},
toolbox: {
iconStyle: {
- normal: {
- borderColor: contrastColor
- }
+ borderColor: contrastColor
}
},
diff --git a/theme/dark-mushroom.js b/theme/dark-mushroom.js
index 91219a1..fdbd8da 100644
--- a/theme/dark-mushroom.js
+++ b/theme/dark-mushroom.js
@@ -55,9 +55,7 @@
}
},
axisLabel: {
- textStyle: {
- color: contrastColor
- }
+ color: contrastColor
},
splitLine: {
lineStyle: {
@@ -108,9 +106,7 @@
},
toolbox: {
iconStyle: {
- normal: {
- borderColor: contrastColor
- }
+ borderColor: contrastColor
}
},
diff --git a/theme/dark.js b/theme/dark.js
index 708e3a3..dceda1f 100644
--- a/theme/dark.js
+++ b/theme/dark.js
@@ -172,9 +172,7 @@
color: contrastColor
},
label: {
- textStyle: {
- color: contrastColor
- }
+ color: contrastColor
},
controlStyle: {
color: contrastColor,
@@ -208,9 +206,7 @@
},
gauge: {
title: {
- textStyle: {
- color: contrastColor
- }
+ color: contrastColor
}
},
candlestick: {
diff --git a/theme/infographic.js b/theme/infographic.js
index 1cf29bf..1ee115c 100644
--- a/theme/infographic.js
+++ b/theme/infographic.js
@@ -218,9 +218,7 @@
}
},
axisLabel: {
- textStyle: {
- color: '#fff'
- }
+ color: '#fff'
},
splitLine: {
length: '5%',
diff --git a/theme/macarons2.js b/theme/macarons2.js
index 4cc66cc..7a69402 100644
--- a/theme/macarons2.js
+++ b/theme/macarons2.js
@@ -177,25 +177,23 @@
minAngle: 0, // 最小角度改为0
selectedOffset: 10, // 选中是扇区偏移量
itemStyle: {
- normal: {
- // color: 各异,
- borderColor: '#fff',
- borderWidth: 1,
- label: {
- show: true,
- position: 'outer',
- textStyle: { color: '#1b1b1b' },
- lineStyle: { color: '#1b1b1b' }
- // textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
- },
- labelLine: {
- show: true,
- length: 20,
- lineStyle: {
- // color: 各异,
- width: 1,
- type: 'solid'
- }
+ // 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'
}
}
}
diff --git a/theme/shine.js b/theme/shine.js
index 29296d4..1217a44 100644
--- a/theme/shine.js
+++ b/theme/shine.js
@@ -152,9 +152,7 @@
}
},
axisLabel: {
- textStyle: {
- color: 'auto'
- }
+ color: 'auto'
},
splitLine: {
length: 12,
@@ -168,14 +166,10 @@
color: 'auto'
},
title: {
- textStyle: {
- color: '#333'
- }
+ color: '#333'
},
detail: {
- textStyle: {
- color: 'auto'
- }
+ color: 'auto'
}
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org