From 3fce0f3bf99cafb7124036f7643748cc64c6f065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Mon, 29 Jul 2024 15:30:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Editor/tinymce.vue      | 6 +++++-
 src/layout/components/Header/index.vue | 3 ++-
 src/router/generator-routers.ts        | 3 +--
 src/router/index.ts                    | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/Editor/tinymce.vue b/src/components/Editor/tinymce.vue
index 07ce487..6a4bc37 100644
--- a/src/components/Editor/tinymce.vue
+++ b/src/components/Editor/tinymce.vue
@@ -64,6 +64,10 @@ export default {
       type: String,
       default: "",
     },
+    name: {
+      type: String,
+      default: "data",
+    },
     height: {
       type: Number,
       default: 0,
@@ -213,7 +217,7 @@ export default {
       try {
         const formData = new FormData()
         formData.append('file',file)
-        formData.append('name','notice')
+        formData.append('name',this.name)
         const res = await upload(formData)
         loading.close()
         return {
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 4465113..196d4cc 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -131,7 +131,7 @@
       <div class="layout-header-trigger layout-header-trigger-min">
         <el-dropdown trigger="hover" @command="avatarSelect">
           <div class="avatar">
-            <el-avatar round :src="schoolboy" />
+            <el-avatar round :src="userAvatar?userAvatar:schoolboy" />
           </div>
           <template #dropdown>
             <el-dropdown-menu>
@@ -235,6 +235,7 @@
   const amendPwdRef = ref();
 
   // const username = userStore?.info ? ref(userStore?.info.username) : '';
+  const userAvatar = userStore.getAvatar
 
   const collapsed = inject('collapsed');
 
diff --git a/src/router/generator-routers.ts b/src/router/generator-routers.ts
index 0bd5a19..a9dcbe0 100644
--- a/src/router/generator-routers.ts
+++ b/src/router/generator-routers.ts
@@ -67,7 +67,7 @@ export const routerGenerator = (routerMap, parent?): any[] => {
     } else {
       if(item.parentId==0 && item.children.length==0) {
         currentRouter.children =[]
-        if(item.target==1){
+        if(item.target==1 && (/http(s)?:/.test(item.component))){
           currentRouter.children.push({
             path: item.path,
             name: names,
@@ -103,7 +103,6 @@ export const generatorDynamicRouter = (): Promise<RouteRecordRaw[]> => {
     adminMenus()
       .then((result) => {
         const routeList = routerGenerator(result);
-        console.log(routeList)
         asyncImportRoute(routeList);
         resolve(routeList);
       })
diff --git a/src/router/index.ts b/src/router/index.ts
index e583a27..42c8941 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,7 +10,7 @@ const routeModuleList: RouteRecordRaw[] = [];
 
 const modulesVue = import.meta.glob('/src/views/**/*.vue')
 export function getModulesKey() {
-  return Object.keys(modulesVue).map((item) => item.replace('/src/views/', '').replace('.vue', ''))
+  return Object.keys(modulesVue).map((item) => item.replace('/src/views', '').replace('.vue', ''))
 }
 
 Object.keys(modules).forEach((key) => {