From dcd6b7a9d78b645f177f4fffd10ef3ae538a647f Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Wed, 11 Jan 2023 17:21:16 +0800
Subject: [PATCH] feat: new feat

---
 resources/admin/components/404/index.vue           |  3 ++-
 resources/admin/composables/curd/useCreate.ts      | 11 ++++++++++-
 resources/admin/router/constantRoutes.ts           |  5 ++++-
 resources/admin/stores/modules/user/index.ts       |  2 +-
 resources/admin/stores/modules/user/permissions.ts |  2 +-
 resources/admin/types/Permission.ts                | 12 ------------
 resources/admin/types/responseData.ts              | 10 ++++------
 7 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/resources/admin/components/404/index.vue b/resources/admin/components/404/index.vue
index 7b0ae50..611fea2 100644
--- a/resources/admin/components/404/index.vue
+++ b/resources/admin/components/404/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div :style="bgColor" class="flex flex-col w-full">
-    <img src="/admin/assets/404.png" class="w-full sm:w-3/5 m-auto" />
+    <img :src="notFound" class="w-full sm:w-3/5 m-auto" />
     <div class="mr-auto w-full bottom-0 m-auto">
       <div class="w-full text-center text-base text-gray-400">抱歉，您访问的页面不存在</div>
       <div @click="push('/')" class="text-center w-full mt-2">
@@ -14,6 +14,7 @@
 import { useRouter } from 'vue-router'
 import { useAppStore } from '/admin/stores/modules/app'
 import { computed } from 'vue'
+import notFound from '/admin/assets/404.png'
 
 const { push } = useRouter()
 
diff --git a/resources/admin/composables/curd/useCreate.ts b/resources/admin/composables/curd/useCreate.ts
index 5f04fb2..c6202f5 100644
--- a/resources/admin/composables/curd/useCreate.ts
+++ b/resources/admin/composables/curd/useCreate.ts
@@ -18,6 +18,8 @@ export function useCreate(path: string, id: string | number | null = null, _form
   // 更新前 hook
   const beforeUpdate = ref()
 
+  const afterCreate = ref()
+
   // store
   function store(path: string, id: string | number | null = null) {
     loading.value = true
@@ -41,6 +43,13 @@ export function useCreate(path: string, id: string | number | null = null, _form
         if (r.data.code === Code.SUCCESS) {
           isClose.value = true
           Message.success(r.data.message)
+
+          // 创建后的操作
+          if (!id) {
+            if (isFunction(afterCreate.value)) {
+              afterCreate.value()
+            }
+          }
         } else {
           Message.error(r.data.message)
         }
@@ -72,5 +81,5 @@ export function useCreate(path: string, id: string | number | null = null, _form
     })
   }
 
-  return { formData, loading, form, submitForm, close, beforeCreate, beforeUpdate }
+  return { formData, loading, form, submitForm, close, beforeCreate, beforeUpdate, afterCreate }
 }
diff --git a/resources/admin/router/constantRoutes.ts b/resources/admin/router/constantRoutes.ts
index 21902d0..f49c1dd 100644
--- a/resources/admin/router/constantRoutes.ts
+++ b/resources/admin/router/constantRoutes.ts
@@ -1,11 +1,14 @@
 import { RouteRecordRaw } from 'vue-router'
+import { isUndefined } from '/admin/support/helper'
 // @ts-ignore
 export function getModuleRoutes() {
   const modules = import.meta.glob('@/module/**/views/router.ts', { eager: true })
   let moduleRoutes: RouteRecordRaw[] = []
 
   Object.keys(modules).forEach(routePath => {
-    moduleRoutes = moduleRoutes.concat(modules[routePath].default)
+    if (!isUndefined(modules[routePath].default)) {
+      moduleRoutes = moduleRoutes.concat(modules[routePath].default)
+    }
   })
 
   return moduleRoutes
diff --git a/resources/admin/stores/modules/user/index.ts b/resources/admin/stores/modules/user/index.ts
index 947f914..3b953f5 100644
--- a/resources/admin/stores/modules/user/index.ts
+++ b/resources/admin/stores/modules/user/index.ts
@@ -140,7 +140,7 @@ export const useUserStore = defineStore('UserStore', {
             this.setStatus(status)
             this.setAvatar(avatar)
             this.setPermissions(permissions)
-
+            console.log(this.getAvatar)
             resolve(response.data.data)
           })
           .catch(e => {
diff --git a/resources/admin/stores/modules/user/permissions.ts b/resources/admin/stores/modules/user/permissions.ts
index 003c3c4..eb752a2 100644
--- a/resources/admin/stores/modules/user/permissions.ts
+++ b/resources/admin/stores/modules/user/permissions.ts
@@ -129,7 +129,7 @@ export const usePermissionsStore = defineStore('PermissionsStore', {
           // menu
           let importComponent
           if (permission.type === MenuType.TOP_TYPE) {
-            importComponent = () => import('/admin/layout/index')
+            importComponent = () => import('/admin/layout/index.vue')
           } else {
             importComponent = viewComponents['/modules' + permission.component]
           }
diff --git a/resources/admin/types/Permission.ts b/resources/admin/types/Permission.ts
index 418aa5c..604a95d 100644
--- a/resources/admin/types/Permission.ts
+++ b/resources/admin/types/Permission.ts
@@ -1,27 +1,15 @@
 export interface Permission {
   id: number
-
   parent_id: number
-
   permission_name: string
-
   type: number
-
   icon: string
-
   component: string
-
   module: string
-
   permission_mark: string
-
   route: string
-
   redirect: string
-
   keepAlive: boolean
-
   hidden: boolean
-
   is_inner: boolean
 }
diff --git a/resources/admin/types/responseData.ts b/resources/admin/types/responseData.ts
index 5df41ac..86a2d0f 100644
--- a/resources/admin/types/responseData.ts
+++ b/resources/admin/types/responseData.ts
@@ -1,7 +1,5 @@
-export default interface ResponseData{
-    code: number;
-
-    message: string;
-
-    data: any
+export default interface ResponseData {
+  code: number
+  message: string
+  data: any
 }