From 9dfe258421560deb94d15a5942ee634576439da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 23 Sep 2023 17:29:45 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6zr-dia?=
 =?UTF-8?q?log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialog/index.vue   | 38 ++++++++-----------------------
 src/views/system/notice/index.vue |  2 +-
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue
index 8222794..5c4052f 100644
--- a/src/components/Dialog/index.vue
+++ b/src/components/Dialog/index.vue
@@ -1,13 +1,5 @@
 <template>
-  <el-dialog
-    :width="width"
-    :title="title"
-    :lock-scroll="false"
-    v-model="open"
-    :lockScroll="lockScroll"
-    :fullscreen="isFullscreen"
-    :draggable="draggable"
-    @closed="close">
+  <el-dialog v-bind="$attrs" :fullscreen="isFullscreen" ref="myDialogRef" v-model="open">
     <template #header="{ close, titleId, titleClass }">
       <div class="custom-header">
         <span :id="titleId" :class="titleClass">{{ title }}</span>
@@ -16,9 +8,7 @@
         </span>
       </div>
     </template>
-
     <slot></slot>
-
     <template v-slot:footer>
       <slot name="footer"> </slot>
     </template>
@@ -34,24 +24,11 @@ const props = defineProps({
   title: {
     type: String
   },
-  width: {
-    type: [Number, String],
-    default: 0
-  },
   fullScreen: {
     type: Boolean,
     default: false
-  },
-  draggable: {
-    type: Boolean,
-    default: false
-  },
-  lockScroll: {
-    type: Boolean,
-    default: true
   }
 })
-
 const isFullscreen = ref(false)
 const open = ref(false)
 watch(
@@ -69,13 +46,18 @@ watch(
   { deep: true, immediate: true }
 )
 
-const emit = defineEmits()
 function handleScreen() {
   isFullscreen.value = !isFullscreen.value
 }
-function close() {
-  emit('close')
-}
+const expose = {}
+const myDialogRef = ref()
+onMounted(() => {
+  const entries = Object.entries(myDialogRef.value)
+  for (const [method, fn] of entries) {
+    expose[method] = fn
+  }
+})
+defineExpose(expose)
 </script>
 <style>
 .custom-header {
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 3a0c993..d128e33 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -68,7 +68,7 @@
     <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改公告对话框 -->
-    <zr-dialog :title="title" v-model="open" width="780px" @close="cancel" fullScreen>
+    <zr-dialog :title="title" draggable v-model="open" width="580px">
       <el-form ref="noticeRef" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :lg="24">