修改删除提醒

src/components/message/index.js

@@ -1,25 +0,0 @@
-import { h } from 'vue'
-import domView from './index.vue'
-
-//删除提醒
-export const delMessageV2 = (cbk) => {
-    window?.$messageBox({
-        center: true,
-        message: () => h(domView, {
-            type: 'delete',
-            title: '确认删除提醒',
-            text: '请谨慎考虑后，确认是否需要删除？',
-        }),
-        customClass: 'hc-message-view-box',
-        showCancelButton: true,
-        confirmButtonText: '确认删除',
-        cancelButtonText: '取消操作',
-        beforeClose: (action, instance, done) => {
-            if (cbk) {
-                cbk(action, instance, done)
-            } else {
-                done()
-            }
-        },
-    })
-}

src/components/message/index.vue

@@ -1,70 +0,0 @@
-<template>
-    <div class="hc-message-box">
-        <div class="hc-lottie-box delete">
-            <hc-lottie v-if="isType === 'delete'" type="delete" style="height: 200px" />
-            <hc-lottie v-if="isType === 'warning'" type="warning" style="height: 140px" />
-        </div>
-        <div class="title">{{ titles }}</div>
-        <div class="text">{{ text }}</div>
-    </div>
-</template>
-
-<script setup>
-import { ref, watch } from 'vue'
-//参数
-const props = defineProps({
-    type: {
-        type: String,
-        default: 'warning',
-    },
-    title: {
-        type: String,
-        default: '',
-    },
-    text: {
-        type: String,
-        default: '',
-    },
-})
-
-//监听
-watch(() => [
-    props.type,
-    props.title,
-    props.text,
-], ([type, title, text]) => {
-    isType.value = type
-    titles.value = title
-    texts.value = text
-})
-
-//变量
-const isType = ref(props.type)
-const titles = ref(props.title)
-const texts = ref(props.text)
-</script>
-
-<style scoped lang="scss">
-.hc-message-box {
-    position: relative;
-    .hc-lottie-box {
-        position: relative;
-        height: 200px;
-        overflow: hidden;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-    }
-    .title {
-        position: relative;
-        font-size: 20px;
-        color: var(--hc-text-color);
-        margin-bottom: 20px;
-    }
-    .text {
-        color: var(--hc-label-color);
-        font-size: 14px;
-        margin-bottom: 10px;
-    }
-}
-</style>

src/views/tentative/device/approach.vue

@@ -41,7 +41,7 @@
                         </el-button>
                     </HcTooltip>
                     <HcTooltip keys="tentative_device_approach_del">
-                        <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997" @click="delTableModalClick">
+                        <el-button v-del-com:[delTableModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
                             <HcIcon name="delete-bin-2" />
                             <span>删除</span>
                         </el-button>
@@ -500,16 +500,13 @@ const addEditNodeFormModalClose = () => {
 
 //删除分类
 const delNodeModalClick = (id) => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                setClassRemove(id)
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-     })
+    HcDelMsg({}, async (instance, resolve) => {
+        instance.confirmButtonLoading = true
+        instance.confirmButtonText = '删除中...'
+        await setClassRemove(id)
+        resolve() //关闭弹窗的回调
+        instance.confirmButtonLoading = false
+    })
 }
 
 //删除分类
@@ -527,17 +524,9 @@ const setClassRemove = async (id) => {
 }
 
 //删除表格数据
-const delTableModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                tableRemoveData()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-     })
+const delTableModalClick = async (_, resolve) => {
+    await tableRemoveData()
+    resolve()
 }
 
 //批量删除

src/views/tentative/device/employ.vue

@@ -28,7 +28,7 @@
                         </el-button>
                     </HcTooltip>
                     <HcTooltip keys="tentative_device_employ_del">
-                        <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997" @click="delNodeModalClick">
+                        <el-button v-del-com:[delNodeModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
                             <HcIcon name="delete-bin-2" />
                             <span>删除</span>
                         </el-button>
@@ -366,17 +366,9 @@ const tableSelection = (rows) => {
 }
 
 //删除
-const delNodeModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                tableRemoveData()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-     })
+const delNodeModalClick = async (_, resolve) => {
+    await tableRemoveData()
+    resolve()
 }
 
 //批量删除

src/views/tentative/device/overhaul.vue

@@ -28,7 +28,7 @@
                         </el-button>
                     </HcTooltip>
                     <HcTooltip keys="tentative_device_overhaul_del">
-                        <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997" @click="delNodeModalClick">
+                        <el-button v-del-com:[delNodeModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
                             <HcIcon name="delete-bin-2" />
                             <span>删除</span>
                         </el-button>
@@ -325,17 +325,9 @@ const tableSelection = (rows) => {
 }
 
 //删除
-const delNodeModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                tableRemoveData()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-     })
+const delNodeModalClick = async (_, resolve) => {
+    await tableRemoveData()
+    resolve()
 }
 
 //批量删除

src/views/tentative/laboratory/user.vue

@@ -26,7 +26,7 @@
                     </el-button>
                 </HcTooltip>
                 <HcTooltip keys="tentative_laboratory_user_del">
-                    <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997" @click="delModalClick">
+                    <el-button v-del-com:[delModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
                         <HcIcon name="delete-bin-2" />
                         <span>删除</span>
                     </el-button>
@@ -424,18 +424,9 @@ const addEditFormClick = async () => {
 }
 
 //删除
-const delModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                tableRemoveData()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-    })
-
+const delModalClick = async (_, resolve) => {
+    await tableRemoveData()
+    resolve()
 }
 
 //批量删除

src/views/tentative/material/approach.vue

@@ -25,7 +25,7 @@
                     </el-button>
                 </HcTooltip>
                 <HcTooltip keys="tentative_material_approach_del">
-                    <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997" @click="delModalClick">
+                    <el-button v-del-com:[delModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
                         <HcIcon name="delete-bin-2" />
                         <span>删除</span>
                     </el-button>
@@ -628,17 +628,9 @@ const tableCopyData = async (rows) => {
 }
 
 //删除
-const delModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                tableRemoveData()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-    })
+const delModalClick = async (_, resolve) => {
+    await tableRemoveData()
+    resolve()
 }
 
 //批量删除

src/views/tentative/material/sampling.vue

@@ -50,7 +50,7 @@
                         </el-button>
                     </HcTooltip>
                     <HcTooltip keys="tentative_material_sampling_del">
-                        <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997" @click="delModalClick">
+                        <el-button v-del-com:[delModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
                             <HcIcon name="delete-bin-2" />
                             <span>删除</span>
                         </el-button>
@@ -611,17 +611,9 @@ const tableCopyData = async (rows) => {
 }
 
 //删除
-const delModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                tableRemoveData()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-    })
+const delModalClick = async (_, resolve) => {
+    await tableRemoveData()
+    resolve()
 }
 
 //批量删除

src/views/tentative/parameter/compactness.vue

@@ -15,7 +15,7 @@
                     </el-button>
                 </HcTooltip>
                 <HcTooltip keys="tentative_parameter_compactness_del">
-                    <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997" @click="delModalClick">
+                    <el-button v-del-com:[delModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
                         <HcIcon name="delete-bin-2" />
                         <span>删除</span>
                     </el-button>
@@ -207,17 +207,9 @@ const addEditFormClick = async () => {
 }
 
 //删除
-const delModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                tableRemoveData()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-     })
+const delModalClick = async (_, resolve) => {
+    await tableRemoveData()
+    resolve()
 }
 
 //批量删除

src/views/tentative/parameter/container.vue

@@ -47,7 +47,7 @@
                         </el-button>
                     </HcTooltip>
                     <HcTooltip keys="tentative_parameter_container_del">
-                        <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997" @click="delTableModalClick">
+                        <el-button v-del-com:[delTableModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
                             <HcIcon name="delete-bin-2" />
                             <span>删除</span>
                         </el-button>
@@ -436,17 +436,13 @@ const addEditNodeFormModalClose = () => {
 
 //删除分类
 const delNodeModalClick = (id) => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                removeClassification(id)
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
+    HcDelMsg({}, async (instance, resolve) => {
+        instance.confirmButtonLoading = true
+        instance.confirmButtonText = '删除中...'
+        await removeClassification(id)
+        resolve() //关闭弹窗的回调
+        instance.confirmButtonLoading = false
     })
-
 }
 
 //删除容器
@@ -596,17 +592,9 @@ const addEditFormClick = async () => {
 }
 
 //删除数据
-const delTableModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                tableRemoveData()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-    })
+const delTableModalClick = async (_, resolve) => {
+    await tableRemoveData()
+    resolve()
 }
 
 //批量删除

src/views/tentative/parameter/density.vue

@@ -15,7 +15,7 @@
                     </el-button>
                 </HcTooltip>
                 <HcTooltip keys="tentative_parameter_density_del">
-                    <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997" @click="delModalClick">
+                    <el-button v-del-com:[delModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
                         <HcIcon name="delete-bin-2" />
                         <span>删除</span>
                     </el-button>
@@ -189,17 +189,9 @@ const addEditFormClick = async () => {
 }
 
 //删除
-const delModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                await tableRemoveData()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-     })
+const delModalClick = async (_, resolve) => {
+    await tableRemoveData()
+    resolve()
 }
 
 //批量删除

src/views/tentative/parameter/sieve.vue

@@ -47,7 +47,7 @@
                         </el-button>
                     </HcTooltip>
                     <HcTooltip keys="tentative_parameter_sieve_del">
-                        <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997" @click="delNodeModalClick">
+                        <el-button v-del-com:[delNodeModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
                             <HcIcon name="delete-bin-2" />
                             <span>删除</span>
                         </el-button>
@@ -202,15 +202,12 @@ const contextMenuClick = ({ key, item }) => {
         addEditNodeFormModel.value = item
         addEditNodeFormModal.value = true
     } else if (key === 'del') {
-        delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                delClassification(item)
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
+        HcDelMsg({}, async (instance, resolve) => {
+            instance.confirmButtonLoading = true
+            instance.confirmButtonText = '删除中...'
+            await delClassification(item)
+            resolve() //关闭弹窗的回调
+            instance.confirmButtonLoading = false
         })
     }
 }
@@ -439,17 +436,9 @@ const addEditFormClick = async () => {
 
 
 //删除分类
-const delNodeModalClick = () => {
-    delMessageV2(async (action, instance, done) => {
-            if (action === 'confirm') {
-                instance.confirmButtonLoading = true
-                tableRemoveData()
-                instance.confirmButtonLoading = false
-                done()
-            } else {
-                done()
-            }
-     })
+const delNodeModalClick = async (_, resolve) => {
+    await tableRemoveData()
+    resolve()
 }
 
 //批量删除