Skip to content

Commit 50b1d21

Browse files
author
piexlMax
committed
调整删除方法 放弃使用el-popover 删除操作使用弹窗提示
1 parent 7b79ec6 commit 50b1d21

File tree

11 files changed

+222
-617
lines changed

11 files changed

+222
-617
lines changed

server/resource/autocode_template/web/table.vue.tpl

+7-15
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,7 @@
8686
<div class="gva-table-box">
8787
<div class="gva-btn-list">
8888
<el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
89-
<el-popover v-model:visible="deleteVisible" :disabled="!multipleSelection.length" placement="top" width="160">
90-
<p>确定要删除吗?</p>
91-
<div style="text-align: right; margin-top: 8px;">
92-
<el-button type="primary" link @click="deleteVisible = false">取消</el-button>
93-
<el-button type="primary" @click="onDelete">确定</el-button>
94-
</div>
95-
<template #reference>
96-
<el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
97-
</template>
98-
</el-popover>
89+
<el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="onDelete">删除</el-button>
9990
</div>
10091
<el-table
10192
ref="multipleTable"
@@ -549,12 +540,13 @@ const deleteRow = (row) => {
549540
})
550541
}
551542
552-
553-
// 批量删除控制标记
554-
const deleteVisible = ref(false)
555-
556543
// 多选删除
557544
const onDelete = async() => {
545+
ElMessageBox.confirm('确定要删除吗?', '提示', {
546+
confirmButtonText: '确定',
547+
cancelButtonText: '取消',
548+
type: 'warning'
549+
}).then(async() => {
558550
const {{.PrimaryField.FieldJson}}s = []
559551
if (multipleSelection.value.length === 0) {
560552
ElMessage({
@@ -576,9 +568,9 @@ const onDelete = async() => {
576568
if (tableData.value.length === {{.PrimaryField.FieldJson}}s.length && page.value > 1) {
577569
page.value--
578570
}
579-
deleteVisible.value = false
580571
getTableData()
581572
}
573+
})
582574
}
583575
584576
// 行为控制标记(弹窗内部需要增还是改)

web/src/api/chatgpt.js

-31
This file was deleted.

web/src/view/chatgpt/chatTable.vue

-199
This file was deleted.

web/src/view/example/customer/customer.vue

+23-39
Original file line numberDiff line numberDiff line change
@@ -59,32 +59,12 @@
5959
icon="edit"
6060
@click="updateCustomer(scope.row)"
6161
>变更</el-button>
62-
<el-popover
63-
v-model="scope.row.visible"
64-
placement="top"
65-
width="160"
66-
>
67-
<p>确定要删除吗?</p>
68-
<div style="text-align: right; margin-top: 8px;">
69-
<el-button
70-
type="primary"
71-
link
72-
@click="scope.row.visible = false"
73-
>取消</el-button>
74-
<el-button
75-
type="primary"
76-
@click="deleteCustomer(scope.row)"
77-
>确定</el-button>
78-
</div>
79-
<template #reference>
80-
<el-button
81-
type="primary"
82-
link
83-
icon="delete"
84-
@click="scope.row.visible = true"
85-
>删除</el-button>
86-
</template>
87-
</el-popover>
62+
<el-button
63+
type="primary"
64+
link
65+
icon="delete"
66+
@click="deleteCustomer(scope.row)"
67+
>删除</el-button>
8868
</template>
8969
</el-table-column>
9070
</el-table>
@@ -146,7 +126,7 @@ import {
146126
} from '@/api/customer'
147127
import WarningBar from '@/components/warningBar/warningBar.vue'
148128
import { ref } from 'vue'
149-
import { ElMessage } from 'element-plus'
129+
import { ElMessage, ElMessageBox } from 'element-plus'
150130
import { formatDate } from '@/utils/format'
151131
152132
defineOptions({
@@ -205,18 +185,23 @@ const closeDialog = () => {
205185
}
206186
}
207187
const deleteCustomer = async(row) => {
208-
row.visible = false
209-
const res = await deleteExaCustomer({ ID: row.ID })
210-
if (res.code === 0) {
211-
ElMessage({
212-
type: 'success',
213-
message: '删除成功'
214-
})
215-
if (tableData.value.length === 1 && page.value > 1) {
216-
page.value--
188+
ElMessageBox.confirm('确定要删除吗?', '提示', {
189+
confirmButtonText: '确定',
190+
cancelButtonText: '取消',
191+
type: 'warning'
192+
}).then(async() => {
193+
const res = await deleteExaCustomer({ ID: row.ID })
194+
if (res.code === 0) {
195+
ElMessage({
196+
type: 'success',
197+
message: '删除成功'
198+
})
199+
if (tableData.value.length === 1 && page.value > 1) {
200+
page.value--
201+
}
202+
getTableData()
217203
}
218-
getTableData()
219-
}
204+
})
220205
}
221206
const enterDialog = async() => {
222207
let res
@@ -244,5 +229,4 @@ const openDialog = () => {
244229
245230
</script>
246231

247-
248232
<style></style>

0 commit comments

Comments
 (0)