diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 1287b31817..6fd1c23b63 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1161,7 +1161,9 @@ export default { edit_union_relation: 'Edit Union Relation', add_union_relation: 'Add Union Relation', field_select: 'Select Field', - add_union_field: 'Add Union Field' + add_union_field: 'Add Union Field', + union_error: 'Union relation and field can not be empty', + union_repeat: 'This dataset is already union，do not union repeat' }, datasource: { datasource: 'Data Source', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 88c26ca89b..b0d44416c0 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1162,7 +1162,9 @@ export default { edit_union_relation: '編輯關聯關系', add_union_relation: '新建關聯關系', field_select: '字段選擇', - add_union_field: '添加關聯字段' + add_union_field: '添加關聯字段', + union_error: '關聯關系與關聯字段不能為空', + union_repeat: '當前數據集已被關聯，請勿重復關聯' }, datasource: { datasource: '數據源', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 5ac145263c..13f643642d 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1164,7 +1164,9 @@ export default { edit_union_relation: '编辑关联关系', add_union_relation: '新建关联关系', field_select: '字段选择', - add_union_field: '添加关联字段' + add_union_field: '添加关联字段', + union_error: '关联关系与关联字段不能为空', + union_repeat: '当前数据集已被关联，请勿重复关联' }, datasource: { datasource: '数据源', diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue index 0308b798c5..60954cab02 100644 --- a/frontend/src/views/dataset/add/AddUnion.vue +++ b/frontend/src/views/dataset/add/AddUnion.vue @@ -8,7 +8,7 @@ {{ $t('dataset.cancel') }} - + {{ $t('dataset.confirm') }} @@ -17,7 +17,7 @@
- + @@ -78,6 +78,7 @@ import UnionNode from '@/views/dataset/add/union/UnionNode' import NodeItem from '@/views/dataset/add/union/NodeItem' import DatasetGroupSelectorTree from '@/views/dataset/common/DatasetGroupSelectorTree' import UnionEdit from '@/views/dataset/add/union/UnionEdit' +import { getTable, post } from '@/api/dataset/dataset' export default { name: 'AddUnion', components: { UnionEdit, DatasetGroupSelectorTree, NodeItem, UnionNode }, @@ -126,7 +127,7 @@ export default { }, allChildCount: 0 }, - name: '', + name: '关联数据集', customType: ['db', 'sql', 'excel'], selectDsDialog: false, // 弹框临时选中的数据集 @@ -135,11 +136,45 @@ export default { unionParam: {} } }, + watch: { + 'param.tableId': function() { + this.initTableData() + } + }, mounted() { + this.initTableData() }, methods: { save() { - + if (!this.name || this.name === '') { + this.$message({ + showClose: true, + message: this.$t('dataset.pls_input_name'), + type: 'error' + }) + return + } + if (this.name.length > 50) { + this.$message({ + showClose: true, + message: this.$t('dataset.char_can_not_more_50'), + type: 'error' + }) + return + } + const table = { + id: this.param.tableId, + name: this.name, + sceneId: this.param.id, + dataSourceId: this.dataset[0].currentDs.dataSourceId, + type: 'union', + mode: this.dataset[0].currentDs.mode, + info: '{"list":' + JSON.stringify(this.dataset) + '}' + } + post('/dataset/table/update', table).then(response => { + this.$emit('saveSuccess', table) + this.cancel() + }) }, cancel() { if (this.param.tableId) { @@ -198,11 +233,46 @@ export default { } }, confirmEditUnion() { - // todo 校验关联关系与字段，必填 - this.editUnion = false + // 校验关联关系与字段，必填 + if (this.checkUnion()) { + this.editUnion = false + } else { + this.$message({ + message: this.$t('dataset.union_error'), + type: 'error', + showClose: true + }) + } }, cancelUnion(val) { this.dataset = val + }, + + checkUnion() { + const union = this.unionParam.node.unionToParent + if (!union.unionType) { + return false + } + if (!union.unionFields || union.unionFields.length < 1) { + return false + } + for (let i = 0; i < union.unionFields.length; i++) { + const ele = union.unionFields[i] + if (!ele.parentField || !ele.parentField.id || !ele.currentField || !ele.currentField.id) { + return false + } + } + return true + }, + + initTableData() { + if (this.param.tableId) { + getTable(this.param.tableId).then(response => { + const table = JSON.parse(JSON.stringify(response.data)) + this.name = table.name + this.dataset = JSON.parse(table.info).list + }) + } } } } diff --git a/frontend/src/views/dataset/add/union/NodeItem.vue b/frontend/src/views/dataset/add/union/NodeItem.vue index 753aa4465e..bd96645d46 100644 --- a/frontend/src/views/dataset/add/union/NodeItem.vue +++ b/frontend/src/views/dataset/add/union/NodeItem.vue @@ -13,7 +13,7 @@ - + {{ $t('dataset.union') }} @@ -29,7 +29,7 @@ - +
{{ $t('dataset.cancel') }} {{ $t('dataset.confirm') }} @@ -127,6 +127,16 @@ export default { }, selectDs() { + // 根据父级node，过滤不同的数据集 + if (this.currentNode.currentDs.mode === 1) { + this.customType = ['db', 'sql', 'excel'] + } else if (this.currentNode.currentDs.mode === 0) { + if (this.currentNode.currentDs.modelInnerType === 'db') { + this.customType = ['db'] + } else { + this.customType = [] + } + } this.selectDsDialog = true }, // 弹框中选择数据集 @@ -138,6 +148,27 @@ export default { this.tempDs = {} }, confirmSelectDs() { + // 校验当前数据集是否已被关联，以及直连模式是否属于同一数据源 + if (this.tempDs.mode === 0) { + if (this.tempDs.dataSourceId !== this.tempParentDs.currentDs.dataSourceId) { + this.$message({ + type: 'error', + message: this.$t('dataset.can_not_union_diff_datasource'), + showClose: true + }) + return + } + } + const arr = this.getAllDs() + if (arr.indexOf(this.tempDs.id) > -1) { + this.$message({ + type: 'error', + message: this.$t('dataset.union_repeat'), + showClose: true + }) + return + } + // check over const ds = JSON.parse(JSON.stringify(this.unionItem)) ds.currentDs = this.tempDs this.tempParentDs.childrenDs.push(ds) @@ -163,6 +194,25 @@ export default { }, confirmEditField() { this.editField = false + }, + + getAllDs() { + const arr = [] + for (let i = 0; i < this.originData.length; i++) { + arr.push(this.originData[0].currentDs.id) + if (this.originData[0].childrenDs && this.originData[0].childrenDs.length > 0) { + this.getDs(this.originData[0].childrenDs, arr) + } + } + return arr + }, + getDs(dsList, arr) { + for (let i = 0; i < dsList.length; i++) { + arr.push(dsList[i].currentDs.id) + if (dsList[i].childrenDs && dsList[i].childrenDs.length > 0) { + this.getDs(dsList[i].childrenDs, arr) + } + } } } } diff --git a/frontend/src/views/dataset/add/union/UnionNode.vue b/frontend/src/views/dataset/add/union/UnionNode.vue index 00b243f1c6..b26fe6f62c 100644 --- a/frontend/src/views/dataset/add/union/UnionNode.vue +++ b/frontend/src/views/dataset/add/union/UnionNode.vue @@ -191,11 +191,37 @@ export default { } }, confirmEditUnion() { - this.editUnion = false + // 校验关联关系与字段，必填 + if (this.checkUnion()) { + this.editUnion = false + } else { + this.$message({ + message: this.$t('dataset.union_error'), + type: 'error', + showClose: true + }) + } }, // 向上级传递 cancelUnion(val) { this.$emit('cancelUnionEdit', val) + }, + + checkUnion() { + const union = this.unionParam.node.unionToParent + if (!union.unionType) { + return false + } + if (!union.unionFields || union.unionFields.length < 1) { + return false + } + for (let i = 0; i < union.unionFields.length; i++) { + const ele = union.unionFields[i] + if (!ele.parentField || !ele.parentField.id || !ele.currentField || !ele.currentField.id) { + return false + } + } + return true } } } diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index 32eafed33c..133a2a251d 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -36,6 +36,9 @@ {{ $t('dataset.edit_sql') }} + + {{ $t('dataset.edit_union') }} + @@ -168,6 +171,9 @@ export default { editCustom() { this.$emit('switchComponent', { name: 'AddCustom', param: { id: this.table.sceneId, tableId: this.table.id, table: this.table }}) }, + editUnion() { + this.$emit('switchComponent', { name: 'AddUnion', param: { id: this.table.sceneId, tableId: this.table.id, table: this.table }}) + }, reSearch(val) { this.tableViewRowForm = val.form