diff --git a/src/components/RenderDialog/index.vue b/src/components/RenderDialog/index.vue index f6e3cc6..e4ed87b 100644 --- a/src/components/RenderDialog/index.vue +++ b/src/components/RenderDialog/index.vue @@ -49,7 +49,7 @@ export default { }, closeOnClickModal: { type: Boolean, - default: true + default: false }, beforeClose: { type: Function, diff --git a/src/views/app/layout/components/Sidebar/personal.vue b/src/views/app/layout/components/Sidebar/personal.vue index dbad0e1..b24cf3d 100644 --- a/src/views/app/layout/components/Sidebar/personal.vue +++ b/src/views/app/layout/components/Sidebar/personal.vue @@ -53,15 +53,24 @@ export default { this.$store.dispatch('app/toggleSideBar') }, async logout() { - this.$confirm('确定要退出吗?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(async () => { - await this.$store.dispatch('user/logout') - await this.$store.dispatch('user/removeRoles') - this.$router.push(`/login?redirect=${this.$route.fullPath}`) - }) + this.$messageBox( + async () => { + await this.$store.dispatch('user/logout') + await this.$store.dispatch('user/removeRoles') + this.$router.push(`/login?redirect=${this.$route.fullPath}`) + }, + '确定要退出吗?', + 'warning', + '提示' + ) + + // this.$confirm({ + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(async () => { + // + // }) }, resetPassword() { this.resetPasswordVisible = true diff --git a/src/views/knowledge/detail/components/HitTest/Index.vue b/src/views/knowledge/detail/components/HitTest/Index.vue index 495d648..5eab8b3 100644 --- a/src/views/knowledge/detail/components/HitTest/Index.vue +++ b/src/views/knowledge/detail/components/HitTest/Index.vue @@ -494,6 +494,7 @@ export default { diff --git a/src/views/knowledge/detail/components/documentDetail/DocumentDrawer.vue b/src/views/knowledge/detail/components/documentDetail/DocumentDrawer.vue index d6119dd..9c16a5b 100644 --- a/src/views/knowledge/detail/components/documentDetail/DocumentDrawer.vue +++ b/src/views/knowledge/detail/components/documentDetail/DocumentDrawer.vue @@ -3,6 +3,7 @@ @@ -31,6 +32,7 @@ > { - this.handleDelete(item) - }) + this.$messageBox(()=>{ this.handleDelete(item)},`确认删除该元数据吗?`, 'warning','提示') + + // this.$confirm(, { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // + // }) }, handleDelete(item) { deleteMetadata([item.id]).then(res => { diff --git a/src/views/knowledge/detail/components/split/AddRule.vue b/src/views/knowledge/detail/components/split/AddRule.vue index 4720918..818b010 100644 --- a/src/views/knowledge/detail/components/split/AddRule.vue +++ b/src/views/knowledge/detail/components/split/AddRule.vue @@ -9,6 +9,7 @@ " :visible.sync="dialogVisible" size="30%" + :wrapperClosable="false" :before-close="handleClose" >
diff --git a/src/views/knowledge/detail/components/words/AddRule.vue b/src/views/knowledge/detail/components/words/AddRule.vue index b7d73da..3a82ace 100644 --- a/src/views/knowledge/detail/components/words/AddRule.vue +++ b/src/views/knowledge/detail/components/words/AddRule.vue @@ -8,6 +8,7 @@ : '新增知识题词规则' " :visible.sync="dialogVisible" + :wrapperClosable="false" size="30%" :before-close="handleClose" > diff --git a/src/views/knowledge/detail/index.vue b/src/views/knowledge/detail/index.vue index b5d387c..a848176 100644 --- a/src/views/knowledge/detail/index.vue +++ b/src/views/knowledge/detail/index.vue @@ -211,6 +211,7 @@ @@ -221,6 +222,7 @@ :title="metadataOperatorDrawer.title" :visible.sync="metadataOperatorDrawer.visible" size="30%" + :wrapperClosable="false" > { - datasetDelete({ id: item.id }).then(res => { - if (res.content.result === '0') { - this.$message({ - type: 'success', - message: '删除成功!' - }) - this.getList() - } - }) - }) + this.$messageBox( + () => { + datasetDelete({ id: item.id }).then(res => { + if (res.content.result === '0') { + this.$message({ + type: 'success', + message: '删除成功!' + }) + this.getList() + } + }) + }, + '此操作将永久删除该知识库, 是否继续?', + 'warning', + '提示' + ) + + // this.$confirm(, { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // + // }) }, getKnowledgeImage(index) { const images = [ diff --git a/src/views/rules/Index.vue b/src/views/rules/Index.vue index 36eb52f..d8ad308 100644 --- a/src/views/rules/Index.vue +++ b/src/views/rules/Index.vue @@ -193,33 +193,42 @@ export default { }, // 处理删除规则` handleDelete(row, index) { - this.$confirm('此操作将永久删除该规则, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - deleteRule([row.id]) - .then(() => { - // 删除当前行 - this.tableData.splice(index, 1) - this.getTableData() - this.$notify.success({ - title: '删除成功', - message: '删除成功', - duration: 2000 + this.$messageBox( + () => { + deleteRule([row.id]) + .then(() => { + // 删除当前行 + this.tableData.splice(index, 1) + this.getTableData() + this.$notify.success({ + title: '删除成功', + message: '删除成功', + duration: 2000 + }) }) - }) - .catch(err => { - this.$notify.error({ - title: '删除失败', - message: h( - 'i', - { style: 'color: teal' }, - '删除时出现错误,稍后再试' + err - ) + .catch(err => { + this.$notify.error({ + title: '删除失败', + message: h( + 'i', + { style: 'color: teal' }, + '删除时出现错误,稍后再试' + err + ) + }) }) - }) - }) + }, + '此操作将永久删除该规则, 是否继续?', + 'warning', + '提示' + ) + + // this.$confirm(, { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // + // }) }, // 处理查询 handleQuery() { diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 83757ce..2e5a688 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -226,12 +226,8 @@ export default { this.handleQuery() }, handleDelete(row) { - this.$confirm('确认删除该菜单吗?', '警告', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }) - .then(() => { + this.$messageBox( + () => { this.loading = true // 将id放入数组中传递 deleteMenu([row.id]) @@ -245,10 +241,23 @@ export default { .finally(() => { this.loading = false }) - }) - .catch(() => { - this.$message.info('已取消删除') - }) + }, + '确认删除该菜单吗?', + 'warning', + '警告' + ) + + // this.$confirm(, { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }) + // .then(() => { + // + // }) + // .catch(() => { + // this.$message.info('已取消删除') + // }) } } } diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index ade151b..4b8c416 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -67,6 +67,7 @@ { + this.$messageBox( + () => { this.loading = true // 将id放入数组中传递 deleteRole([row.id]) @@ -348,10 +345,23 @@ export default { .finally(() => { this.loading = false }) - }) - .catch(() => { - this.$message.info('已取消删除') - }) + }, + '确认删除该角色吗?', + 'warning', + '警告' + ) + + // this.$confirm('确认删除该角色吗?', '警告', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }) + // .then(() => { + // + // }) + // .catch(() => { + // this.$message.info('已取消删除') + // }) }, // 关闭权限抽屉 handleOnClose() { diff --git a/src/views/system/user/components/UserDialog.vue b/src/views/system/user/components/UserDialog.vue index 5260cba..91a0920 100644 --- a/src/views/system/user/components/UserDialog.vue +++ b/src/views/system/user/components/UserDialog.vue @@ -1,5 +1,5 @@