diff --git a/core/core-frontend/src/assets/svg/bubble-map-dark.svg b/core/core-frontend/src/assets/svg/bubble-map-dark.svg
index d9d5147e94..18e8ad129f 100644
--- a/core/core-frontend/src/assets/svg/bubble-map-dark.svg
+++ b/core/core-frontend/src/assets/svg/bubble-map-dark.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/bubble-map-origin.svg b/core/core-frontend/src/assets/svg/bubble-map-origin.svg
index 3ca5414790..e400ccbc23 100644
--- a/core/core-frontend/src/assets/svg/bubble-map-origin.svg
+++ b/core/core-frontend/src/assets/svg/bubble-map-origin.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/bubble-map.svg b/core/core-frontend/src/assets/svg/bubble-map.svg
index 9137455e4e..beaff8c273 100644
--- a/core/core-frontend/src/assets/svg/bubble-map.svg
+++ b/core/core-frontend/src/assets/svg/bubble-map.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/flow-map-dark.svg b/core/core-frontend/src/assets/svg/flow-map-dark.svg
index 35d88664ce..ab44292e3d 100644
--- a/core/core-frontend/src/assets/svg/flow-map-dark.svg
+++ b/core/core-frontend/src/assets/svg/flow-map-dark.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/flow-map-origin.svg b/core/core-frontend/src/assets/svg/flow-map-origin.svg
index 1ab1cd253b..5651cb02f1 100644
--- a/core/core-frontend/src/assets/svg/flow-map-origin.svg
+++ b/core/core-frontend/src/assets/svg/flow-map-origin.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/flow-map.svg b/core/core-frontend/src/assets/svg/flow-map.svg
index 7dac663297..72469aac7d 100644
--- a/core/core-frontend/src/assets/svg/flow-map.svg
+++ b/core/core-frontend/src/assets/svg/flow-map.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/heat-map-dark.svg b/core/core-frontend/src/assets/svg/heat-map-dark.svg
index e024a30f37..a5aff12a20 100644
--- a/core/core-frontend/src/assets/svg/heat-map-dark.svg
+++ b/core/core-frontend/src/assets/svg/heat-map-dark.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/heat-map-origin.svg b/core/core-frontend/src/assets/svg/heat-map-origin.svg
index f2d9ce0558..3bf0491062 100644
--- a/core/core-frontend/src/assets/svg/heat-map-origin.svg
+++ b/core/core-frontend/src/assets/svg/heat-map-origin.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/heat-map.svg b/core/core-frontend/src/assets/svg/heat-map.svg
index 407bff1cd6..7e8a1c8dec 100644
--- a/core/core-frontend/src/assets/svg/heat-map.svg
+++ b/core/core-frontend/src/assets/svg/heat-map.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/map-dark.svg b/core/core-frontend/src/assets/svg/map-dark.svg
index 5e2f2f1c62..cc136f38ac 100644
--- a/core/core-frontend/src/assets/svg/map-dark.svg
+++ b/core/core-frontend/src/assets/svg/map-dark.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/map-origin.svg b/core/core-frontend/src/assets/svg/map-origin.svg
index f80a57b984..3c37937e31 100644
--- a/core/core-frontend/src/assets/svg/map-origin.svg
+++ b/core/core-frontend/src/assets/svg/map-origin.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/map.svg b/core/core-frontend/src/assets/svg/map.svg
index ff2b8a3606..34578f577e 100644
--- a/core/core-frontend/src/assets/svg/map.svg
+++ b/core/core-frontend/src/assets/svg/map.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/symbolic-map-dark.svg b/core/core-frontend/src/assets/svg/symbolic-map-dark.svg
index f8c6e89af7..87d9516401 100644
--- a/core/core-frontend/src/assets/svg/symbolic-map-dark.svg
+++ b/core/core-frontend/src/assets/svg/symbolic-map-dark.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/symbolic-map-origin.svg b/core/core-frontend/src/assets/svg/symbolic-map-origin.svg
index 71a0c1b036..0198307802 100644
--- a/core/core-frontend/src/assets/svg/symbolic-map-origin.svg
+++ b/core/core-frontend/src/assets/svg/symbolic-map-origin.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/assets/svg/symbolic-map.svg b/core/core-frontend/src/assets/svg/symbolic-map.svg
index aec98583f6..62d72b12b0 100644
--- a/core/core-frontend/src/assets/svg/symbolic-map.svg
+++ b/core/core-frontend/src/assets/svg/symbolic-map.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/core/core-frontend/src/custom-component/component-group/CommonGroup.vue b/core/core-frontend/src/custom-component/component-group/CommonGroup.vue
index f5b15076df..4cb03deb1e 100644
--- a/core/core-frontend/src/custom-component/component-group/CommonGroup.vue
+++ b/core/core-frontend/src/custom-component/component-group/CommonGroup.vue
@@ -84,6 +84,7 @@ const groupActiveChange = category => {
class="item-top"
draggable="true"
:data-id="groupInfo.category + '&' + chartInfo.value"
+ :title="chartInfo.title"
>
{
color: #a6a6a6;
font-size: 12px;
text-align: center;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ width: 88px;
}
}
diff --git a/core/core-frontend/src/custom-component/component-group/UserViewGroup.vue b/core/core-frontend/src/custom-component/component-group/UserViewGroup.vue
index 90e8180538..e360a66f26 100644
--- a/core/core-frontend/src/custom-component/component-group/UserViewGroup.vue
+++ b/core/core-frontend/src/custom-component/component-group/UserViewGroup.vue
@@ -138,6 +138,7 @@ const loadPluginCategory = data => {
class="item-top"
draggable="true"
:data-id="'UserView&' + chartInfo.value"
+ :title="chartInfo.title"
>
{
font-size: 12px;
text-align: center;
margin-top: 4px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ width: 88px;
}
}
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 8c8fc2511e..b077739d15 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -1676,13 +1676,13 @@ export default {
font_family: 'font',
letter_space: 'letter spacing',
font_shadow: 'font shadow',
- chart_area: 'area chart',
+ chart_area: 'Area chart',
fix: 'fixed value',
dynamic: 'dynamic value',
gauge_size_field_delete: 'field in dynamic value has changed, please re-edit',
chart_group: 'subcategory',
- chart_bar_group: 'grouped bar chart',
- chart_bar_group_stack: 'grouped stacked bar chart',
+ chart_bar_group: 'Grouped bar chart',
+ chart_bar_group_stack: 'Grouped stacked bar chart',
field_dynamic: 'dynamic value',
aggregation: 'aggregation method',
filter_between: 'between',
@@ -1862,7 +1862,9 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
export_excel: 'Excel',
export_excel_formatter: 'Excel(with Formatting)',
export_raw_details: 'Raw Details',
- field_is_empty_export_error: 'No fields available, unable to export'
+ field_is_empty_export_error: 'No fields available, unable to export',
+ chart_symbolic_map: 'Symbolic map',
+ chart_stock_line: 'K line'
},
dataset: {
scope_edit: 'only effective when editing',
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index 4367534736..af311e9201 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -1822,7 +1822,9 @@ export default {
export_excel: '導出Excel',
export_excel_formatter: '導出Excel(帶格式)',
export_raw_details: '導出原始明細',
- field_is_empty_export_error: '目前無欄位，無法匯出'
+ field_is_empty_export_error: '目前無欄位，無法匯出',
+ chart_symbolic_map: '符號地圖',
+ chart_stock_line: 'K 線圖'
},
dataset: {
scope_edit: '僅編輯時生效',
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index cacd7ee4e2..dca49879ee 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -1824,7 +1824,9 @@ export default {
export_excel: '导出Excel',
export_excel_formatter: '导出Excel(带格式)',
export_raw_details: '导出原始明细',
- field_is_empty_export_error: '当前无字段，无法导出'
+ field_is_empty_export_error: '当前无字段，无法导出',
+ chart_symbolic_map: '符号地图',
+ chart_stock_line: 'K 线图'
},
dataset: {
scope_edit: '仅编辑时生效',
diff --git a/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue b/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue
index 1191e7ac12..d776512a0c 100644
--- a/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue
+++ b/core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue
@@ -95,6 +95,7 @@ const groupActiveChange = category => {
class="item-top"
:class="props.type === chartInfo.value ? 'item-active' : ''"
:data-id="'UserView&' + chartInfo.value"
+ :title="chartInfo.title"
>
{
color: #a6a6a6;
font-size: 12px;
text-align: center;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ width: 88px;
}
}
diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
index 734f6846d7..cd3c94e4ec 100644
--- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
@@ -1361,7 +1361,7 @@ export const CHART_TYPE_CONFIGS = [
render: 'antv',
category: 'trend',
value: 'stock-line',
- title: 'K 线图',
+ title: t('chart.chart_stock_line'),
icon: 'stock-line'
}
]
@@ -1459,7 +1459,7 @@ export const CHART_TYPE_CONFIGS = [
render: 'antv',
category: 'map',
value: 'symbolic-map',
- title: '符号地图',
+ title: t('chart.chart_symbolic_map'),
icon: 'symbolic-map'
}
]
diff --git a/de-xpack b/de-xpack
index 41dd10e730..2f08e32ac4 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 41dd10e730d40da5b83f1b7c782ec20c2ff1793a
+Subproject commit 2f08e32ac4d9457bda077a210a939b7f0e2cd1e3