diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 26760f9f72..07bc1f3b2a 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -2120,7 +2120,10 @@ export default {
table_field_total_label: 'Field Alias',
table_row_header_freeze: 'Row Header Freeze',
value_formatter_total_out_percent: 'Show percentage',
- enable_slider_tip: 'After enabling the slider, the carousel prompt will be disabled.'
+ enable_slider_tip: 'After enabling the slider, the carousel prompt will be disabled.',
+ liquid_show_border: 'Show Border',
+ liquid_border_width: 'Border Width',
+ liquid_border_distance: 'Border Distance'
},
dataset: {
field_value: 'Field Value',
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index 0aab576065..19e2ac4ed0 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -2061,7 +2061,10 @@ export default {
table_field_total_label: '字段別名',
table_row_header_freeze: '行頭凍結',
value_formatter_total_out_percent: '顯示佔比',
- enable_slider_tip: '開啟縮略軸後,輪播提示將會失效'
+ enable_slider_tip: '開啟縮略軸後,輪播提示將會失效',
+ liquid_show_border: '顯示邊框',
+ liquid_border_width: '邊框寬度',
+ liquid_border_distance: '邊框間距'
},
dataset: {
field_value: '欄位值',
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 455901d995..c2bb280be6 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2070,7 +2070,10 @@ export default {
table_field_total_label: '字段别名',
table_row_header_freeze: '行头冻结',
value_formatter_total_out_percent: '显示占比',
- enable_slider_tip: '开启缩略轴后,轮播提示将会失效'
+ enable_slider_tip: '开启缩略轴后,轮播提示将会失效',
+ liquid_show_border: '显示边框',
+ liquid_border_width: '边框宽度',
+ liquid_border_distance: '边框间距'
},
dataset: {
field_value: '字段值',
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 65cfa5e8d9..eeb7916a68 100644
--- a/core/core-frontend/src/models/chart/chart-attr.d.ts
+++ b/core/core-frontend/src/models/chart/chart-attr.d.ts
@@ -730,6 +730,18 @@ declare interface ChartMiscAttr {
* 水波图形状
*/
liquidShape: string
+ /**
+ * 水波图边框显示
+ */
+ liquidShowBorder: boolean
+ /**
+ * 水波图边框宽度
+ */
+ liquidBorderWidth: number
+ /**
+ * 水波图边框距离
+ */
+ liquidBorderDistance: number
/**
* 地图倾角
*/
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
index ee6ef95496..d01d2d5afe 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/MiscSelector.vue
@@ -553,6 +553,59 @@ onMounted(() => {
+
+
+ {{ t('chart.liquid_show_border') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
'border-style': ['all'],
'basic-style-selector': ['colors', 'alpha'],
'label-selector': ['fontSize', 'color', 'labelFormatter'],
- 'misc-selector': ['liquidShape', 'liquidSize', 'liquidMaxType', 'liquidMaxField'],
+ 'misc-selector': [
+ 'liquidShape',
+ 'liquidSize',
+ 'liquidMaxType',
+ 'liquidMaxField',
+ 'liquidShowBorder',
+ 'liquidBorderWidth',
+ 'liquidBorderDistance'
+ ],
'title-selector': [
'title',
'fontSize',
@@ -131,6 +140,15 @@ export class Liquid extends G2PlotChartView {
radius: radius,
shape: shape
}
+ const { misc } = customAttr
+ if (misc?.liquidShowBorder) {
+ defaultsDeep(size, {
+ outline: {
+ border: misc.liquidBorderWidth ?? DEFAULT_MISC.liquidBorderWidth,
+ distance: misc.liquidBorderDistance ?? DEFAULT_MISC.liquidBorderDistance
+ }
+ })
+ }
return { ...options, ...size }
}