From ec3243e4ed1c7fa2ac5b923784ca791f0db085e8 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 29 Dec 2022 19:23:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/datasource/DsTree.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue index 7d5de21f87..2b5c2eb205 100644 --- a/frontend/src/views/system/datasource/DsTree.vue +++ b/frontend/src/views/system/datasource/DsTree.vue @@ -758,9 +758,8 @@ export default { if (this.treeData.length) { params.title = this.$t('datasource.this_data_source') 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.linkTo = this.linkTo.bind(this, { queryType, id }) this.withLink(params) return From 4111e52396b6bb6bcc4434e356c6296501b69ff0 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 29 Dec 2022 19:24:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E9=9B=86=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E4=BE=9D=E8=B5=96=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/group/Group.vue | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue index 37f73f80fa..bcdaf184a8 100644 --- a/frontend/src/views/dataset/group/Group.vue +++ b/frontend/src/views/dataset/group/Group.vue @@ -924,22 +924,21 @@ export default { } } - const { queryType = 'dataset', name: label, id } = data - await this.getDatasetRelationship({ queryType, label, id }) - if (this.treeData.length) { - options.title = this.$t('datasource.delete_this_dataset') - options.link = this.$t('datasource.click_to_check') - options.content = this.$t('datasource.cannot_be_deleted_dataset') - options.templateDel = msgContent - options.confirmButtonText = undefined - options.type = 'danger' - - - options.linkTo = this.linkTo.bind(this, { queryType, id }) - this.withLink(options, this.$t('commons.delete')) - return - } - this.handlerConfirm(options) + const { queryType = 'dataset', id } = data + getDatasetRelationship(id).then((res) => { + if (res.data.subRelation?.length) { + options.title = this.$t('datasource.delete_this_dataset') + options.link = this.$t('datasource.click_to_check') + options.content = this.$t('datasource.cannot_be_deleted_dataset') + options.templateDel = msgContent + options.confirmButtonText = undefined + options.type = 'danger' + options.linkTo = this.linkTo.bind(this, { queryType, id }) + this.withLink(options, this.$t('commons.delete')) + return + } + this.handlerConfirm(options) + }) }, linkTo(query) { window.open(this.$router.resolve({ From d0418edd8dc59a48779a98ba57f07ea3692cd90a Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 29 Dec 2022 19:26:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E8=A1=80=E6=BA=90=E5=85=B3=E7=B3=BB):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=9C=A8=E5=A4=9A=E4=B8=AA=20Exc?= =?UTF-8?q?el=20=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BE=9D=E8=B5=96=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml | 2 +- backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml index 205a1b42f2..bc18c27b76 100644 --- a/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml @@ -159,7 +159,7 @@ select - ds.id, + ifnull(ds.id,'') `id`, ds.name, ds_auth.auths, 'link' `type`,