From b225781cd2c13127a5b888dba11bb27fd3962be8 Mon Sep 17 00:00:00 2001
From: zhangtao <1176193409@qq.com>
Date: Tue, 24 May 2022 09:20:29 +0800
Subject: [PATCH] mune change

---
 src/components/Modal/index.vue                | 28 +++++--------------
 src/layout/components/Tags/index.vue          |  6 ++--
 src/store/modules/permission.js               |  5 ++++
 .../system/menu/components/RoleModal.vue      |  2 +-
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/components/Modal/index.vue b/src/components/Modal/index.vue
index 14be664..3fabb34 100644
--- a/src/components/Modal/index.vue
+++ b/src/components/Modal/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <n-modal v-model:show="getModalOptions" preset="dialog">
+  <n-modal v-bind="getModalOptions" preset="dialog">
     <n-card>
       <slot name="Context" />
     </n-card>
@@ -8,28 +8,13 @@
 
 <script>
 
-import { defineComponent, computed } from 'vue'
+import { defineComponent, computed, unref } from 'vue'
 export default defineComponent({
   name: 'ModalModules',
   props: {
-    /* 弹窗可见 */
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    /* 弹窗标题 */
-    title: {
-      type: String,
-      default: ''
-    },
-    /* 确定按钮的loading */
-    confirmLoading: {
-      type: Boolean,
-      default: false
-    },
-    maskClosable: {
-      type: Boolean,
-      default: true
+    options: {
+      type: Object,
+      default: () => {}
     }
   },
   emits: {
@@ -40,8 +25,9 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     const getModalOptions = computed(() => {
-      return props.visible
+      return unref(props.options)
     })
+    console.log(getModalOptions)
     const handleClick = function() {
       emit('click')
     }
diff --git a/src/layout/components/Tags/index.vue b/src/layout/components/Tags/index.vue
index 2d794d9..e5b9bb2 100644
--- a/src/layout/components/Tags/index.vue
+++ b/src/layout/components/Tags/index.vue
@@ -132,7 +132,7 @@ cacheRoutes.forEach((cacheRoute) => {
   const findRoute = routes.find((route) => route.path === cacheRoute.path)
   if (route) {
     cacheRoute.meta = findRoute.meta || cacheRoute.meta
-    cacheRoute.title = (findRoute.title || cacheRoute.title)
+    cacheRoute.name = (findRoute.name || cacheRoute.name)
   }
 })
 
@@ -163,8 +163,8 @@ watch(
  * @return { Object }
  */
 function getSimpleRoute(route) {
-  const { fullPath, hash, meta, title, params, path, query } = route
-  return { fullPath, hash, meta, title, params, path, query }
+  const { fullPath, hash, meta, name, params, path, query } = route
+  return { fullPath, hash, meta, name, params, path, query }
 }
 
 /**
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 9bcf93c..ed8923b 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -79,6 +79,11 @@ function dataArrayToRoutes(routes) {
       const component = `../${sub_view}.vue`
       tmp.component = modules[component]
     }
+    tmp.name = tmp.title
+    tmp.meta = {
+      ...tmp.meta,
+      title: tmp.title
+    }
     res.push(tmp)
   })
   return res
diff --git a/src/views/system/menu/components/RoleModal.vue b/src/views/system/menu/components/RoleModal.vue
index 5d7bdc9..c81f9f9 100644
--- a/src/views/system/menu/components/RoleModal.vue
+++ b/src/views/system/menu/components/RoleModal.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { defineComponent, reactive, computed } from 'vue'
+import { defineComponent, computed } from 'vue'
 import Modal from '@/components/Modal/index.vue'
 export default defineComponent({
   name: 'MenuModal',