diff --git a/core/core-frontend/src/components/collapse-switch-item/src/CollapseSwitchItem.vue b/core/core-frontend/src/components/collapse-switch-item/src/CollapseSwitchItem.vue index 4476ca562f..e46fd207b6 100644 --- a/core/core-frontend/src/components/collapse-switch-item/src/CollapseSwitchItem.vue +++ b/core/core-frontend/src/components/collapse-switch-item/src/CollapseSwitchItem.vue @@ -13,6 +13,11 @@ const props = defineProps({ themes: { type: String as PropType, default: 'dark' + }, + showSwitch: { + type: Boolean, + required: false, + default: true } }) const emit = defineEmits(['update:modelValue', 'modelChange']) @@ -45,12 +50,15 @@ const switchValue = computed({ {{ title }} - +
+ +
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index a85fa55c7b..1906e84237 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -1167,7 +1167,8 @@ export default { progress_target: '目标值', progress_current: '实际值', gauge_axis_label: '显示刻度', - gauge_percentage_tick: '百分比刻度' + gauge_percentage_tick: '百分比刻度', + add_style: '添加样式' }, dataset: { scope_edit: '仅编辑时生效', diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts index 4dd8778dac..aecc541928 100644 --- a/core/core-frontend/src/models/chart/chart-attr.d.ts +++ b/core/core-frontend/src/models/chart/chart-attr.d.ts @@ -286,6 +286,10 @@ declare interface ChartTableHeaderAttr { * 列头鼠标悬浮提示开关 */ showColTooltip: boolean + /** + * 表头显示开关 + */ + showTableHeader: boolean } /** * 单元格属性 diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue index c7049ae8c9..91157a90b7 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue @@ -257,7 +257,7 @@ init() @@ -292,7 +292,7 @@ init() @@ -370,7 +370,7 @@ init()
- 阈值设置 + 条件样式设置
- 阈值设置 + 条件样式设置 - {{ t('chart.add_condition') }} + {{ t('chart.add_style') }}
@@ -451,7 +451,7 @@ init() - {{ t('chart.add_threshold') }} + {{ t('chart.add_condition') }}
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue index eb18ae6c5d..9c9e73a427 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue @@ -371,11 +371,15 @@ watch( @onExtTooltipChange="onExtTooltipChange" /> - - + {