diff --git a/core/core-frontend/src/custom-component/common/CommonAttr.vue b/core/core-frontend/src/custom-component/common/CommonAttr.vue
index 5aaf95972e..c12579e11e 100644
--- a/core/core-frontend/src/custom-component/common/CommonAttr.vue
+++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue
@@ -143,7 +143,7 @@ const stopEvent = e => {
name="style"
class="common-style-area"
>
-
+
diff --git a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue
index dc1c7146ec..89460beb24 100644
--- a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue
+++ b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue
@@ -2,68 +2,128 @@
-
-
-
-
-
-
+ {{ t('chart.text_color') }}
+
-
-
-
+
+
-
-
+ 头部字体颜色
+
-
-
-
-
-
+
+
+
+ 头部激活字体颜色
+
+
+
+
+
+ {{ t('chart.text_fontsize') }}
+
+
+
+
+
+
+
+ 激活字体大小
+
+
+
+
+
+
+
+ 透明度
+
+
+
+
+
+
+
{{ t('chart.bolder') }}
@@ -78,7 +138,7 @@
-
+
{{ t('chart.italic') }}
@@ -92,46 +152,98 @@
-
-
-
-
+
+
{{ t('chart.text_pos_left') }}
-
+
{{ t('chart.text_pos_center') }}
-
+
{{ t('chart.text_pos_right') }}
+
+
+
+
+
+
+
+
+
+
+ {{ t('chart.text_pos_left') }}
+
+
+
+
+
+
+
+
+
+ {{ t('chart.text_pos_center') }}
+
+
+
+
+
+
+
+
+
+ {{ t('chart.text_pos_right') }}
+
+
@@ -173,6 +285,7 @@ const emits = defineEmits(['onTextChange'])
const styleMounted = ref({
opacity: 1,
fontSize: 22,
+ activeFontSize: 22,
fontWeight: 'normal',
fontStyle: 'normal',
textAlign: 'center',
@@ -237,8 +350,8 @@ const checkItalic = () => {
changeStyle()
}
-function setPosition(p: 'left' | 'center' | 'right') {
- styleForm.value.textAlign = p
+function setPosition(key, p: 'left' | 'center' | 'right') {
+ styleForm.value[key] = p
changeStyle()
}
@@ -353,6 +466,14 @@ watch(
height: 18px;
background: rgba(31, 35, 41, 0.15);
}
+
+.custom-divider-light {
+ background-color: rgba(31, 35, 41, 0.15);
+}
+
+.custom-divider-dark {
+ background-color: #757575;
+}
.form-item {
&.no-margin-bottom {
margin-bottom: 0 !important;
diff --git a/core/core-frontend/src/custom-component/de-time-clock/TimeDefault.vue b/core/core-frontend/src/custom-component/de-time-clock/TimeDefault.vue
index 2643e1835e..6d78612df6 100644
--- a/core/core-frontend/src/custom-component/de-time-clock/TimeDefault.vue
+++ b/core/core-frontend/src/custom-component/de-time-clock/TimeDefault.vue
@@ -1,5 +1,8 @@
-