github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 12:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4244 from dataease/pr@dev@fix_relation_analyze

Browse Source 
fix(血源关系): 修复存在多个 Excel 数据集依赖时的报错
This commit is contained in:
wisonic-s 2022-12-29 19:35:26 +08:00 committed by GitHub
commit 943e32862c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml
View File

@ -159,7 +159,7 @@
<select id="queryDatasetRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap"> <select id="queryDatasetRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap">
select select
ds.id, ifnull(ds.id,'') `id`,
ds.name, ds.name,
ds_auth.auths, ds_auth.auths,
'link' `type`, 'link' `type`,

2
backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
View File

@ -228,7 +228,7 @@
<select id="queryPanelRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap"> <select id="queryPanelRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap">
select select
ds.id, ifnull(ds.id,'') `id`,
ds.name, ds.name,
ds_auth.auths, ds_auth.auths,
'link' `type`, 'link' `type`,

31
frontend/src/views/dataset/group/Group.vue
View File

@ -924,22 +924,21 @@ export default {
} }
} }
const { queryType = 'dataset', name: label, id } = data const { queryType = 'dataset', id } = data
await this.getDatasetRelationship({ queryType, label, id }) getDatasetRelationship(id).then((res) => {
if (this.treeData.length) { if (res.data.subRelation?.length) {
options.title = this.$t('datasource.delete_this_dataset') options.title = this.$t('datasource.delete_this_dataset')
options.link = this.$t('datasource.click_to_check') options.link = this.$t('datasource.click_to_check')
options.content = this.$t('datasource.cannot_be_deleted_dataset') options.content = this.$t('datasource.cannot_be_deleted_dataset')
options.templateDel = msgContent options.templateDel = msgContent
options.confirmButtonText = undefined options.confirmButtonText = undefined
options.type = 'danger' options.type = 'danger'
options.linkTo = this.linkTo.bind(this, { queryType, id })
this.withLink(options, this.$t('commons.delete'))
options.linkTo = this.linkTo.bind(this, { queryType, id }) return
this.withLink(options, this.$t('commons.delete')) }
return this.handlerConfirm(options)
} })
this.handlerConfirm(options)
}, },
linkTo(query) { linkTo(query) {
window.open(this.$router.resolve({ window.open(this.$router.resolve({

3
frontend/src/views/system/datasource/DsTree.vue
View File

@ -758,9 +758,8 @@ export default {
if (this.treeData.length) { if (this.treeData.length) {
params.title = this.$t('datasource.this_data_source') params.title = this.$t('datasource.this_data_source')
params.link = this.$t('datasource.click_to_check') params.link = this.$t('datasource.click_to_check')
params.content = this.$t('datasource.cannot_be_deleted_dataset') params.content = this.$t('datasource.cannot_be_deleted_datasource')
params.templateDel = msgContent params.templateDel = msgContent
params.linkTo = this.linkTo.bind(this, { queryType, id }) params.linkTo = this.linkTo.bind(this, { queryType, id })
this.withLink(params) this.withLink(params)
return return