diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 5a5221100a..17460c1dcc 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1022,7 +1022,8 @@ export default {
table_column_adapt: 'Adapt',
table_column_custom: 'Custom',
chart_table_pivot: 'Pivot Table',
- table_pivot_row: 'Data Row'
+ table_pivot_row: 'Data Row',
+ field_error_tips: 'This field is changed(Include dimension、quota，field type，deleted),please edit again.'
},
dataset: {
sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 2c1451ad1e..8d27954f15 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1022,7 +1022,8 @@ export default {
table_column_adapt: '自適應',
table_column_custom: '自定義',
chart_table_pivot: '透視表',
- table_pivot_row: '數據行'
+ table_pivot_row: '數據行',
+ field_error_tips: '該字段所對應的數據集原始字段發生變更（包括維度、指標，字段類型，字段被刪除等），建議重新編輯'
},
dataset: {
sheet_warn: '有多個 Sheet 頁，默認抽取第一個',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index bcd59ca48b..8706d7c50d 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1024,7 +1024,8 @@ export default {
table_column_adapt: '自适应',
table_column_custom: '自定义',
chart_table_pivot: '透视表',
- table_pivot_row: '数据行'
+ table_pivot_row: '数据行',
+ field_error_tips: '该字段所对应的数据集原始字段发生变更（包括维度、指标，字段类型，字段被删除等），建议重新编辑'
},
dataset: {
sheet_warn: '有多个 Sheet 页，默认抽取第一个',
diff --git a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
index 8fded96dda..da927853f9 100644
--- a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
+++ b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
@@ -1,6 +1,6 @@
-
+
@@ -10,6 +10,7 @@
{{ item.name }}
+
{{ $t('chart.'+item.summary) }}
{{ $t('chart.' + item.dateStyle) }}
@@ -17,7 +18,7 @@
-
+
@@ -27,6 +28,7 @@
{{ item.name }}
+
{{ $t('chart.'+item.summary) }}
{{ $t('chart.' + item.dateStyle) }}
@@ -120,8 +122,12 @@
+
+
diff --git a/frontend/src/views/chart/components/drag-item/utils.js b/frontend/src/views/chart/components/drag-item/utils.js
new file mode 100644
index 0000000000..8ed6a57939
--- /dev/null
+++ b/frontend/src/views/chart/components/drag-item/utils.js
@@ -0,0 +1,33 @@
+export function getItemType(dimensionData, quotaData, item) {
+ // 将item的字段在数据集维度、指标字段中查询一遍，如果遇到id不存在、字段类型不一致、维度指标不一致，则提示
+ const status = item.groupType
+ let checked = false
+ if (status === 'd') {
+ for (let i = 0; i < dimensionData.length; i++) {
+ const ele = dimensionData[i]
+ if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType) {
+ checked = true
+ break
+ }
+ }
+ }
+ if (status === 'q') {
+ for (let i = 0; i < quotaData.length; i++) {
+ const ele = quotaData[i]
+ if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType) {
+ checked = true
+ break
+ }
+ }
+ }
+
+ if (checked) {
+ if (status === 'd') {
+ return ''
+ } else if (status === 'q') {
+ return 'success'
+ }
+ } else {
+ return 'danger'
+ }
+}
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 75abeb94f1..e7c85caaa6 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -271,6 +271,8 @@
:param="param"
:index="index"
:item="item"
+ :dimension-data="dimensionData"
+ :quota-data="quotaData"
@onDimensionItemChange="dimensionItemChange"
@onDimensionItemRemove="dimensionItemRemove"
@editItemFilter="showDimensionEditFilter"
@@ -323,6 +325,8 @@
:param="param"
:index="index"
:item="item"
+ :dimension-data="dimensionData"
+ :quota-data="quotaData"
@onDimensionItemChange="dimensionItemChange"
@onDimensionItemRemove="dimensionItemRemove"
@editItemFilter="showDimensionEditFilter"
@@ -376,6 +380,8 @@
:index="index"
:item="item"
:chart="chart"
+ :dimension-data="dimensionData"
+ :quota-data="quotaData"
@onQuotaItemChange="quotaItemChange"
@onQuotaItemRemove="quotaItemRemove"
@editItemFilter="showQuotaEditFilter"
@@ -413,6 +419,8 @@
:index="index"
:item="item"
:chart="chart"
+ :dimension-data="dimensionData"
+ :quota-data="quotaData"
@onQuotaItemChange="quotaItemChange"
@onQuotaItemRemove="quotaItemRemove"
@editItemFilter="showQuotaEditFilter"
@@ -450,6 +458,8 @@
:param="param"
:index="index"
:item="item"
+ :dimension-data="dimensionData"
+ :quota-data="quotaData"
@onItemChange="stackItemChange"
@onItemRemove="stackItemRemove"
/>
@@ -490,6 +500,8 @@
:param="param"
:index="index"
:item="item"
+ :dimension-data="dimensionData"
+ :quota-data="quotaData"
@onItemChange="bubbleItemChange"
@onItemRemove="bubbleItemRemove"
/>
@@ -522,6 +534,8 @@
:param="param"
:index="index"
:item="item"
+ :dimension-data="dimensionData"
+ :quota-data="quotaData"
@onFilterItemRemove="filterItemRemove"
@editItemFilter="showEditFilter"
/>
@@ -558,6 +572,8 @@
:param="param"
:index="index"
:item="item"
+ :dimension-data="dimensionData"
+ :quota-data="quotaData"
@onDimensionItemChange="drillItemChange"
@onDimensionItemRemove="drillItemRemove"
/>
@@ -568,7 +584,6 @@
-