From 1d21c6b098b76c3fa28a39993c98c27d9972499b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=89=E6=9D=A5=E6=8A=80=E6=9C=AF?= <1490493387@qq.com>
Date: Sun, 28 Nov 2021 22:49:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8A=A8=E6=80=81=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/api/system/menu.ts                        |   2 +-
 src/layout/components/Navbar.vue              |   2 +-
 src/layout/components/Settings/index.vue      |   2 +-
 src/layout/components/Sidebar/Link.vue        |  55 ++++-----
 src/layout/components/Sidebar/SidebarItem.vue | 114 ++++++++----------
 src/layout/components/Sidebar/index.vue       |  47 ++++----
 src/layout/index.vue                          |  25 ++--
 src/router/index.ts                           |  13 +-
 src/store/index.ts                            |   2 +-
 src/store/interface.ts                        |   5 +-
 src/store/modules/app.ts                      |   4 +-
 src/styles/variables.scss.d.ts                |   9 ++
 src/views/system/user/index.vue               |  13 ++
 vite.config.ts                                |   2 +
 15 files changed, 146 insertions(+), 150 deletions(-)
 create mode 100644 src/styles/variables.scss.d.ts
 create mode 100644 src/views/system/user/index.vue

diff --git a/package.json b/package.json
index 8398b71..292aeca 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
   "devDependencies": {
     "@types/node": "^16.11.7",
     "@types/nprogress": "^0.2.0",
+    "@types/path-browserify": "^1.0.0",
     "@vitejs/plugin-vue": "^1.9.3",
     "sass": "^1.43.4",
     "typescript": "^4.4.3",
diff --git a/src/api/system/menu.ts b/src/api/system/menu.ts
index e866ca1..5a506dc 100644
--- a/src/api/system/menu.ts
+++ b/src/api/system/menu.ts
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getRouteList() {
     return request({
-        url: '/youlai-admin/api/v1/menus/route',
+        url: '/youlai-admin/api/v2/menus/route',
         method: 'get'
     })
 }
\ No newline at end of file
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c5fa2f7..40bbc32 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -64,7 +64,7 @@ export default {
       return store.state.app.sidebar
     })
     const device = computed(() => {
-      return store.state.app.device.toString()
+      return store.state.app.device
     })
     const avatar = computed(() => {
       return store.state.user.avatar
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index dd2fa83..06c8856 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -52,7 +52,7 @@ export default defineComponent({
     })
 
     watch(() => state.sidebarLogo, (value) => {
-      store.dispatch('settings/changeSetting', { key: 'showSidebarLogo', value })
+      store.dispatch('settings/changeSetting', { key: 'sidebarLogo', value })
     })
 
     return {
diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue
index 530b3d5..8b76b87 100644
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -1,43 +1,40 @@
 <template>
-  <component :is="type" v-bind="linkProps(to)">
+  <a
+      v-if="isExternal(to)"
+      :href="to"
+      target="_blank"
+      rel="noopener"
+  >
     <slot />
-  </component>
+  </a>
+  <div
+      v-else
+      @click="push"
+  >
+    <slot />
+  </div>
 </template>
 
-<script>
+<script lang="ts">
+import { defineComponent } from 'vue'
 import { isExternal } from '@/utils/validate'
-
-export default {
+import { useRouter } from 'vue-router'
+export default defineComponent({
   props: {
     to: {
       type: String,
       required: true
     }
   },
-  computed: {
-    isExternal() {
-      return isExternal(this.to)
-    },
-    type() {
-      if (this.isExternal) {
-        return 'a'
-      }
-      return 'router-link'
+  setup(props) {
+    const router = useRouter()
+    const push = () => {
+      router.push(props.to)
     }
-  },
-  methods: {
-    linkProps(to) {
-      if (this.isExternal) {
-        return {
-          href: to,
-          target: '_blank',
-          rel: 'noopener'
-        }
-      }
-      return {
-        to: to
-      }
+    return {
+      push,
+      isExternal
     }
   }
-}
-</script>
+})
+</script>
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 70c2f4c..4ebe832 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,47 +1,53 @@
 <template>
-  <div v-if="!item.hidden">
-    <template
-        v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
-      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <svg-icon v-if="onlyOneChild.meta && onlyOneChild.meta.icon" :icon-class="onlyOneChild.meta.icon"></svg-icon>
-          <span v-if="onlyOneChild.meta && onlyOneChild.meta.title">{{ onlyOneChild.meta.title }}</span>
-        </el-menu-item>
-      </app-link>
-    </template>
-
-    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
-
-      <template slot="title">
-        <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
-        <span v-if="item.meta && item.meta.title">{{ item.meta.title }}</span>
+  <div>
+    <div v-if="!item.meta ||!item.meta.hidden">
+      <!-- 非嵌套路由 -->
+      <template
+          v-if="!item.children||item.children.length==0">
+        <app-link v-if="item.meta" :to="resolvePath(item.path)">
+          <el-menu-item :index="resolvePath(item.path)" :class="{'submenu-title-noDropdown':!isNest}">
+            <svg-icon v-if="item.meta && item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
+            <span v-if="item.meta && item.meta.title">{{ item.meta.title }}</span>
+          </el-menu-item>
+        </app-link>
       </template>
 
-      <sidebar-item
-          v-for="child in item.children"
-          :key="child.path"
-          :is-nest="true"
-          :item="child"
-          :base-path="resolvePath(child.path)"
-          class="nest-menu"
-      />
-    </el-sub-menu>
+      <!-- 嵌套路由 -->
+      <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+        <template #title>
+          <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
+          <span v-if="item.meta && item.meta.title">{{ item.meta.title }}</span>
+        </template>
+
+        <sidebar-item
+            v-for="child in item.children"
+            :key="child.path"
+            :is-nest="true"
+            :item="child"
+            :base-path="resolvePath(child.path)"
+            class="nest-menu"
+        />
+      </el-sub-menu>
+    </div>
   </div>
+
 </template>
 
-<script>
+<script lang="ts">
 import path from 'path-browserify'
+import {defineComponent, PropType} from "vue";
+import {RouteRecordRaw} from 'vue-router'
 import {isExternal} from '@utils/validate'
 import AppLink from './Link.vue'
 import SvgIcon from '@/components/SvgIcon/index.vue';
 
-export default {
+
+export default defineComponent({
   name: 'SidebarItem',
   components: {SvgIcon, AppLink},
   props: {
-    // route object
     item: {
-      type: Object,
+      type: Object as PropType<RouteRecordRaw>,
       required: true
     },
     isNest: {
@@ -53,46 +59,22 @@ export default {
       default: ''
     }
   },
-  data() {
-    // To fix https://github.com/PanJiaChen/vue-admin-template/issues/237
-    // TODO: refactor with render function
-    this.onlyOneChild = null
-    return {}
-  },
-  methods: {
-    hasOneShowingChild(children = [], parent) {
-      const showingChildren = children.filter(item => {
-        if (item.hidden) {
-          return false
-        } else {
-          // Temp set(will be used if only has one showing child)
-          this.onlyOneChild = item
-          return true
-        }
-      })
-
-      // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (showingChildren.length === 0) {
-        this.onlyOneChild = {...parent, path: '', noShowingChildren: true}
-        return true
-      }
-
-      return false
-    },
-    resolvePath(routePath) {
+  setup(props) {
+    const resolvePath = (routePath: string) => {
       if (isExternal(routePath)) {
         return routePath
       }
-      if (isExternal(this.basePath)) {
-        return this.basePath
+      if (isExternal(props.basePath)) {
+        return props.basePath
       }
-      return path.resolve(this.basePath, routePath)
+      console.log(props.basePath,routePath)
+      return path.resolve(props.basePath, routePath)
+    }
+
+    return {
+      resolvePath
     }
   }
-}
-</script>
+})
+
+</script>
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 7fab2eb..1f61c78 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,29 +1,38 @@
 <template>
   <div :class="{'has-logo':showLogo}">
     <logo v-if="showLogo" :collapse="isCollapse"/>
+
+
+    <!-- :background-color="variables.menuBg"
+          :text-color="variables.menuText"
+          :active-text-color="variables.menuActiveText"-->
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-menu
           :default-active="activeMenu"
           :collapse="isCollapse"
-          :background-color="variables.menuBg"
-          :text-color="variables.menuText"
+          background-color="#304156"
+          text-color="#bfcbd9"
+          active-text-color="#409EFF"
           :unique-opened="false"
-          :active-text-color="variables.menuActiveText"
           :collapse-transition="false"
-          mode="vertical"
-      >
-        <sidebar-item v-for="route in routes" :key="route.path" :item="route"
-                      :base-path="route.path"/>
+          mode="vertical">
+        <sidebar-item
+            v-for="route in routes"
+            :item="route"
+            :key="route.path"
+            :base-path="route.path"
+        />
       </el-menu>
     </el-scrollbar>
+
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import {computed, defineComponent} from "vue";
 import SidebarItem from './SidebarItem.vue'
 import Logo from './Logo.vue'
-import variables from '@styles/variables.scss'
+import variables from '@/styles/variables.scss'
 import {useStore} from '@/store'
 import {useRoute} from 'vue-router'
 
@@ -33,17 +42,11 @@ export default defineComponent({
     Logo
   },
   setup() {
-    const store = useStore()
+    const store = useStore();
     const route = useRoute()
-    const sidebar = computed(() => {
-      return store.state.app.sidebar
-    })
-    const routes = computed(() => {
-      return store.state.permission.routes
-    })
-    const showLogo = computed(() => {
-      return store.state.settings.sidebarLogo
-    })
+    const sidebar = computed(() => store.state.app.sidebar)
+    const routes = computed(() => store.state.permission.routes)
+    const showLogo = computed(() => store.state.settings.sidebarLogo)
     const activeMenu = computed(() => {
       const {meta, path} = route
       // if set path, the sidebar will highlight the path you set
@@ -52,9 +55,7 @@ export default defineComponent({
       }
       return path
     })
-    const isCollapse = computed(() => {
-      return !sidebar.value.opened
-    })
+    const isCollapse = computed(() => !store.state.app.sidebar.opened)
 
     return {
       sidebar,
@@ -62,7 +63,7 @@ export default defineComponent({
       showLogo,
       variables,
       activeMenu,
-      isCollapse
+      isCollapse,
     }
   }
 })
diff --git a/src/layout/index.vue b/src/layout/index.vue
index d65a4a6..3a239a8 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -9,10 +9,10 @@
       </div>
       <app-main/>
       <!--
-      <right-panel v-if="showSettings">
+        <right-panel v-if="showSettings">
               <settings/>
             </right-panel>
-            -->
+      -->
     </div>
   </div>
 </template>
@@ -23,6 +23,7 @@ import {computed, defineComponent, onBeforeMount, onBeforeUnmount, onMounted, re
 import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components/index.ts'
 import {useStore} from "@store";
 import {useRoute} from "vue-router";
+
 const {body} = document
 const WIDTH = 992
 
@@ -38,14 +39,7 @@ export default defineComponent({
   setup() {
     const store = useStore()
 
-    const device = computed(() => {
-      return store.state.app.device
-    })
-
-    const sidebar = computed(() => {
-      return store.state.app.sidebar
-    })
-
+    const sidebar = computed(() => store.state.app.sidebar)
     const isMobile = () => {
       const rect = body.getBoundingClientRect()
       return rect.width - 1 < WIDTH
@@ -81,7 +75,6 @@ export default defineComponent({
       }
     })
 
-
     const state = reactive({
       handleClickOutside: () => {
         store.dispatch('app/closeSideBar', false)
@@ -90,10 +83,10 @@ export default defineComponent({
 
     const classObj = computed(() => {
       return {
-        hideSidebar: !sidebar.opened,
-        openSidebar: sidebar.opened,
-        withoutAnimation: sidebar.withoutAnimation,
-        mobile: device === 'mobile'
+        hideSidebar:  !store.state.app.sidebar.opened,
+        openSidebar: store.state.app.sidebar.opened,
+        withoutAnimation: store.state.app.sidebar.withoutAnimation,
+        mobile: store.state.app.device === 'mobile'
       }
     })
     const showSettings = computed(() => {
@@ -124,10 +117,10 @@ export default defineComponent({
 
     return {
       classObj,
-      sidebar,
       showSettings,
       needTagsView,
       fixedHeader,
+      sidebar,
       ...toRefs(state)
     }
   }
diff --git a/src/router/index.ts b/src/router/index.ts
index 22e4b27..41228aa 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -2,13 +2,12 @@ import {createRouter, createWebHashHistory, RouteRecordRaw} from 'vue-router'
 import Layout from '@/layout/index.vue'
 
 
-// 参数配置: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
-
+// 参数说明: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
 export const constantRoutes: Array<RouteRecordRaw> = [
     {
         path: '/redirect',
         component: Layout,
-        hidden: true,
+        meta: {hidden: true},
         children: [
             {
                 path: '/redirect/:path(.*)',
@@ -19,22 +18,23 @@ export const constantRoutes: Array<RouteRecordRaw> = [
     {
         path: '/login',
         component: () => import('@/views/login/index.vue'),
-        hidden: true
+        meta: {hidden: true}
     },
     {
         path: '/404',
         component: () => import('@/views/error-page/404.vue'),
-        hidden: true
+        meta: {hidden: true}
     },
     {
         path: '/401',
         component: () => import('@/views/error-page/401.vue'),
-        hidden: true
+        meta:{hidden: true}
     },
     {
         path: '/',
         component: Layout,
         redirect: '/dashboard',
+        meta:{hidden:true},
         children: [
             {
                 path: 'dashboard',
@@ -46,7 +46,6 @@ export const constantRoutes: Array<RouteRecordRaw> = [
     }
 ]
 
-
 const router = createRouter({
     history: createWebHashHistory(),
     routes: constantRoutes
diff --git a/src/store/index.ts b/src/store/index.ts
index 0674324..62e7cd8 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -3,7 +3,7 @@ import {createStore,useStore as baseUseStore ,Store} from 'vuex'
 import {RootStateTypes} from "@store/interface";
 
 // Vite 使用特殊的 import.meta.glob 函数从文件系统导入多个模块
-// see https://cn.vitejs.dev/guide/features.html#glob-import
+// @see https://cn.vitejs.dev/guide/features.html#glob-import
 const moduleFiles = import.meta.globEager('./modules/*.ts')
 const paths:string[]=[]
 
diff --git a/src/store/interface.ts b/src/store/interface.ts
index 74c957b..59684c6 100644
--- a/src/store/interface.ts
+++ b/src/store/interface.ts
@@ -9,7 +9,6 @@ export interface UserState {
     perms: string[]
 }
 
-
 export interface AppState {
     device: string,
     sidebar: {
@@ -26,7 +25,6 @@ export interface SettingState {
     sidebarLogo: boolean
 }
 
-
 export interface PermissionState{
     routes:RouteRecordRaw[]
     addRoutes: RouteRecordRaw[]
@@ -41,12 +39,11 @@ export interface TagsViewState{
     cachedViews: (string|undefined)[]
 }
 
-
 // 顶级类型声明
 export interface RootStateTypes {
     user: UserState,
     app: AppState,
-    setting: SettingState,
+    settings: SettingState,
     permission:PermissionState,
     tagsView:TagsViewState
 }
\ No newline at end of file
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 1aee926..7f050cc 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -14,6 +14,7 @@ const appModule: Module<AppState, RootStateTypes> = {
     mutations: {
         TOGGLE_SIDEBAR: state => {
             state.sidebar.opened = !state.sidebar.opened
+            console.log('state.sidebar.opened',state.sidebar.opened)
             state.sidebar.withoutAnimation = false
             if (state.sidebar.opened) {
                 Local.set('sidebarStatus', 1)
@@ -27,6 +28,7 @@ const appModule: Module<AppState, RootStateTypes> = {
             state.sidebar.withoutAnimation = withoutAnimation
         },
         TOGGLE_DEVICE: (state, device) => {
+            console.log('TOGGLE_DEVICE',device)
             state.device = device
         }
     },
@@ -37,7 +39,7 @@ const appModule: Module<AppState, RootStateTypes> = {
         closeSideBar({commit}, {withoutAnimation}) {
             commit('CLOSE_SIDEBAR', withoutAnimation)
         },
-        toggleDevice({commit}, device) {
+       async toggleDevice({commit}, device) {
             commit('TOGGLE_DEVICE', device)
         }
     }
diff --git a/src/styles/variables.scss.d.ts b/src/styles/variables.scss.d.ts
new file mode 100644
index 0000000..69ad576
--- /dev/null
+++ b/src/styles/variables.scss.d.ts
@@ -0,0 +1,9 @@
+export interface IScssVariables {
+    menuBg: string
+    menuText: string
+    menuActiveText: string
+}
+
+export const variables: IScssVariables
+
+export default variables
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
new file mode 100644
index 0000000..4bb1816
--- /dev/null
+++ b/src/views/system/user/index.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index 8ee8ceb..ac8b645 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -12,6 +12,7 @@ export default ({command, mode}: ConfigEnv): UserConfig => {
 
     return (
         {
+
             plugins: [
                 vue(),
                 viteSvgIcons({
@@ -35,6 +36,7 @@ export default ({command, mode}: ConfigEnv): UserConfig => {
                     }
                 }
             },
+
             resolve: {
                 // Vite2设置别名路径方式一
                 // alias:{