diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 5f6df2ea07..a096931859 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1366,6 +1366,7 @@ export default { chart_table_pivot: 'Pivot Table', table_pivot_row: 'Data Row', field_error_tips: 'This field is changed(Include dimension、quota,field type,deleted),please edit again.', + mark_field_error: 'The current field does not exist, please select again', table_border_color: 'Border Color', table_header_align: 'Header Align', table_item_align: 'Body Align', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index bc46329abc..f9eae689f4 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1365,6 +1365,7 @@ export default { chart_table_pivot: '透視表', table_pivot_row: '數據行', field_error_tips: '該字段所對應的數據集原始字段發生變更(包括維度、指標,字段類型,字段被刪除等),建議重新編輯', + mark_field_error: '數據集變更,當前字段不存在,請重新選擇', table_border_color: '邊框顏色', table_header_align: '表頭對齊方式', table_item_align: '表格對齊方式', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 3b766b950a..619d3ce1a7 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1364,6 +1364,7 @@ export default { chart_table_pivot: '透视表', table_pivot_row: '数据行', field_error_tips: '该字段所对应的数据集原始字段发生变更(包括维度、指标,字段类型,字段被删除等),建议重新编辑', + mark_field_error: '数据集变更,当前字段不存在,请重新选择', table_border_color: '边框颜色', table_header_align: '表头对齐方式', table_item_align: '表格对齐方式', diff --git a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue index 3781a99fce..8439fa2b92 100644 --- a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue +++ b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue @@ -6,11 +6,13 @@ :model="markForm" label-width="40px" size="mini" + :rules="rules" > group.options.some(item => item.id === this.markForm.fieldId)) - if (!valid) { - this.markForm.fieldId = null - } + this.getItemTagType() } } } @@ -375,22 +392,9 @@ export default { this.changeMarkAttr('fieldId') }, getItemTagType() { - if (this.markForm.fieldId) { - const field = this.getField(this.markForm.fieldId) - if (!field) { - this.changeFields() - this.markForm.fieldId = null - return - } - const tagType = getItemType(this.dimensionData, this.quotaData, field) - if (tagType === 'danger') { - this.changeFields() - this.markForm.fieldId = null - } - } else { - this.changeFields() - this.markForm.fieldId = null - } + this.$refs['markForm'].validate((valid) => { + console.log(valid) + }) } } }