From 568e470ac1cdd35290ddb613d7ed735848e2acc3 Mon Sep 17 00:00:00 2001
From: zhangtao <1176193409@qq.com>
Date: Tue, 24 May 2022 10:02:06 +0800
Subject: [PATCH] modal

---
 src/components/{Modal => CardModal}/index.vue | 21 ++++++++++++-------
 .../{RoleModal.vue => MenuModal.vue}          | 10 ++++-----
 src/views/system/menu/index.vue               |  6 +++---
 3 files changed, 22 insertions(+), 15 deletions(-)
 rename src/components/{Modal => CardModal}/index.vue (66%)
 rename src/views/system/menu/components/{RoleModal.vue => MenuModal.vue} (79%)

diff --git a/src/components/Modal/index.vue b/src/components/CardModal/index.vue
similarity index 66%
rename from src/components/Modal/index.vue
rename to src/components/CardModal/index.vue
index 3fabb34..7290e53 100644
--- a/src/components/Modal/index.vue
+++ b/src/components/CardModal/index.vue
@@ -1,6 +1,11 @@
 <template>
-  <n-modal v-bind="getModalOptions" preset="dialog">
-    <n-card>
+  <n-modal
+    v-bind="getModalOptions"
+    :style="`width:${getModalOptions.width}px`"
+    preset="card"
+    @update:show="handleClose"
+  >
+    <n-card :bordered="false">
       <slot name="Context" />
     </n-card>
   </n-modal>
@@ -10,7 +15,7 @@
 
 import { defineComponent, computed, unref } from 'vue'
 export default defineComponent({
-  name: 'ModalModules',
+  name: 'CardModal',
   props: {
     options: {
       type: Object,
@@ -25,19 +30,21 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     const getModalOptions = computed(() => {
-      return unref(props.options)
+      return {
+        ...props.options,
+        width: props.options.width || 600
+      }
     })
-    console.log(getModalOptions)
     const handleClick = function() {
       emit('click')
     }
-    const handleCancel = function() {
+    const handleClose = function() {
       emit('onClose', true)
     }
     return {
       getModalOptions,
       handleClick,
-      handleCancel
+      handleClose
     }
   }
 })
diff --git a/src/views/system/menu/components/RoleModal.vue b/src/views/system/menu/components/MenuModal.vue
similarity index 79%
rename from src/views/system/menu/components/RoleModal.vue
rename to src/views/system/menu/components/MenuModal.vue
index c81f9f9..f008d84 100644
--- a/src/views/system/menu/components/RoleModal.vue
+++ b/src/views/system/menu/components/MenuModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <Modal :options="getModalOptions">
+  <Modal :options="getModalOptions" @on-close="handleClose">
     <template #Context>
       111
     </template>
@@ -8,7 +8,7 @@
 
 <script>
 import { defineComponent, computed } from 'vue'
-import Modal from '@/components/Modal/index.vue'
+import Modal from '@/components/CardModal/index.vue'
 export default defineComponent({
   name: 'MenuModal',
   components: { Modal },
@@ -30,18 +30,18 @@ export default defineComponent({
   setup(props, { emit }) {
     const getModalOptions = computed(() => {
       return {
-        visible: props.visible
+        show: props.visible
       }
     })
 
     /* 关闭弹窗 */
     const handleClose = () => {
-      // vodModal.value.handleUploadCancel()
       emit('update:visible', false)
     }
 
     return {
-      getModalOptions
+      getModalOptions,
+      handleClose
     }
   }
 })
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index d63333b..147e20c 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -4,19 +4,19 @@
       <data-table :columns="data.columns" :pagination="false" :data="data.data" size="large">
         <template #tableTitle>
           <n-button type="primary" @click="handlleRoleAdd">
-            添加角色
+            添加菜单
           </n-button>
         </template>
       </data-table>
     </n-card>
   </div>
 
-  <RoleModal :visible="data.modalShow" />
+  <RoleModal v-model:visible="data.modalShow" />
 </template>
 
 <script>
 import dataTable from '@/components/DataTable/index.vue'
-import RoleModal from './components/RoleModal.vue'
+import RoleModal from './components/MenuModal.vue'
 import Action from '@/components/DataTable/tools/Action.vue'
 import { getMenuList } from '@/api/system/index.js'
 import { h, onMounted } from 'vue'