From d8b0fec8c8cb296474e3d6b1bf9ef78a9f0edd91 Mon Sep 17 00:00:00 2001
From: Coffee-crocodile <1147347984@qq.com>
Date: Thu, 11 Aug 2022 13:58:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor(components):=20=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85e-icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EIcon.vue                   | 19 +++++
 src/layouts/BasicLayout/index.vue          | 96 ++--------------------
 src/layouts/components/Breadcrumb.vue      | 14 +---
 src/layouts/components/CollapaseButton.vue | 11 ++-
 src/layouts/components/Menu.vue            | 85 +++++++++++++++++++
 src/layouts/components/index.ts            |  6 ++
 src/layouts/components/logo.vue            | 16 +---
 src/store/index.ts                         |  1 +
 src/store/modules/app.ts                   | 15 ++++
 src/store/modules/auth.ts                  |  9 ++
 src/store/modules/index.ts                 |  1 +
 src/views/test/test2.vue                   |  4 +-
 12 files changed, 158 insertions(+), 119 deletions(-)
 create mode 100644 src/components/EIcon.vue
 create mode 100644 src/layouts/components/Menu.vue
 create mode 100644 src/layouts/components/index.ts
 create mode 100644 src/store/modules/app.ts
 create mode 100644 src/store/modules/auth.ts

diff --git a/src/components/EIcon.vue b/src/components/EIcon.vue
new file mode 100644
index 0000000..384a005
--- /dev/null
+++ b/src/components/EIcon.vue
@@ -0,0 +1,19 @@
+<template>
+  <Icon :icon="props.icon" class="inline-block" :width="props.size" />
+</template>
+
+<script setup lang="ts">
+import { Icon } from '@iconify/vue';
+const props = defineProps({
+  icon: {
+    type: String,
+    default: 'icon-park-outline:game',
+  },
+  size: {
+    type: Number,
+    default: 18,
+  },
+});
+</script>
+
+<style scoped></style>
diff --git a/src/layouts/BasicLayout/index.vue b/src/layouts/BasicLayout/index.vue
index 479448e..0267e79 100644
--- a/src/layouts/BasicLayout/index.vue
+++ b/src/layouts/BasicLayout/index.vue
@@ -1,25 +1,9 @@
 <template>
   <n-layout has-sider class="wh-full">
-    <n-layout-sider
-      bordered
-      show-trigger
-      :collapsed="collapsed"
-      :collapsed-width="64"
-      collapse-mode="width"
-      @collapse="collapsed = true"
-      @expand="collapsed = false"
-    >
-      <Logo :collapsed="collapsed" />
-      <n-menu
-        :collapsed="collapsed"
-        :collapsed-width="64"
-        :collapsed-icon-size="24"
-        :indent="20"
-        :options="menuOptions"
-        @update:value="handleClickMenu"
-      />
+    <n-layout-sider bordered :collapsed="appStore.collapsed" :collapsed-width="64" collapse-mode="width">
+      <Logo />
+      <Menu />
     </n-layout-sider>
-
     <n-layout class="h-full bg-hex-f3f4f6" :native-scrollbar="false">
       <n-layout-header bordered class="h-60px flex-y-center">
         <CollapaseButton />
@@ -36,78 +20,10 @@
 </template>
 
 <script lang="ts" setup>
-import type { MenuOption } from 'naive-ui';
-import { h, ref } from 'vue';
-import { useRouter } from 'vue-router';
-import { Icon } from '@iconify/vue';
-import Logo from '../components/Logo.vue';
-import Breadcrumb from '../components/Breadcrumb.vue';
-import CollapaseButton from '../components/CollapaseButton.vue';
+import { useApp } from '@/store';
+import { Breadcrumb, CollapaseButton, Menu, Logo } from '../components';
 
-const router = useRouter();
-const collapsed = ref(false);
-
-function renderIcon(icon: string) {
-  return () => h(Icon, { icon });
-}
-// const activeKey = ref('');
-const handleClickMenu = (key: string, _item: MenuOption) => {
-  router.push(key);
-};
-const menuOptions: MenuOption[] = [
-  {
-    label: 'test1',
-    key: '/test1',
-    icon: renderIcon('icon-park-outline:alarm'),
-  },
-  {
-    label: 'test2',
-    key: '/test2',
-    icon: renderIcon('icon-park-outline:alarm'),
-  },
-  {
-    label: 'test3',
-    key: '/test3',
-    icon: renderIcon('icon-park-outline:alarm'),
-  },
-  {
-    label: '登录页',
-    key: '/login',
-    icon: renderIcon('icon-park-outline:alarm'),
-  },
-  {
-    label: '舞，舞，舞',
-    key: 'dance-dance-dance',
-    icon: renderIcon('icon-park-outline:alarm'),
-    children: [
-      {
-        label: '饮品',
-        key: 'beverage',
-        // icon: renderIcon(WineIcon),
-        children: [
-          {
-            label: '威士忌',
-            key: 'whisky',
-          },
-        ],
-      },
-      {
-        label: '食物',
-        key: 'food',
-        children: [
-          {
-            label: '三明治',
-            key: 'sandwich',
-          },
-        ],
-      },
-      {
-        label: '过去增多，未来减少',
-        key: 'the-past-increases-the-future-recedes',
-      },
-    ],
-  },
-];
+const appStore = useApp();
 </script>
 
 <style scoped></style>
diff --git a/src/layouts/components/Breadcrumb.vue b/src/layouts/components/Breadcrumb.vue
index 8aa6e33..f2c2933 100644
--- a/src/layouts/components/Breadcrumb.vue
+++ b/src/layouts/components/Breadcrumb.vue
@@ -1,11 +1,11 @@
 <template>
   <n-breadcrumb>
     <n-breadcrumb-item class="align-middle">
-      <Icon icon="icon-park-outline:home-two" class="inline-block" width="16" />
+      <e-icon icon="icon-park-outline:home-two" />
       首页
     </n-breadcrumb-item>
     <n-breadcrumb-item v-for="(item, index) in routes" :key="index">
-      <Icon :icon="item.meta.icon" class="inline-block" width="18" />
+      <e-icon :icon="item.meta.icon" />
       {{ item.meta.title }}
     </n-breadcrumb-item>
   </n-breadcrumb>
@@ -17,16 +17,6 @@ import { useRouter } from 'vue-router';
 import { Icon } from '@iconify/vue';
 
 const router = useRouter();
-// const props = defineProps({
-//   title: {
-//     type: String,
-//     default: 'Logo2',
-//   },
-//   collapsed: {
-//     type: Boolean,
-//     default: false,
-//   },
-// });
 const routes = computed(() => {
   return router.currentRoute.value.matched.filter((item) => {
     return item.meta.title;
diff --git a/src/layouts/components/CollapaseButton.vue b/src/layouts/components/CollapaseButton.vue
index 3a48505..9fa9425 100644
--- a/src/layouts/components/CollapaseButton.vue
+++ b/src/layouts/components/CollapaseButton.vue
@@ -1,11 +1,16 @@
 <template>
-  <div class="hover:bg-hex-F3F4F6 hover:shadow-inner h-full px-2 flex-center cursor-pointer">
-    <Icon icon="icon-park-outline:music-list" class="inline-block" width="18" />
+  <div
+    class="hover:bg-hex-F3F4F6 hover:shadow-inner h-full px-2 flex-center cursor-pointer"
+    @click="appStore.switchCollapse()"
+  >
+    <e-icon v-show="appStore.collapsed" icon="icon-park-outline:menu-unfold" />
+    <e-icon v-show="!appStore.collapsed" icon="icon-park-outline:menu-fold" />
   </div>
 </template>
 
 <script setup lang="ts">
-import { Icon } from '@iconify/vue';
+import { useApp } from '@/store';
+const appStore = useApp();
 </script>
 
 <style scoped></style>
diff --git a/src/layouts/components/Menu.vue b/src/layouts/components/Menu.vue
new file mode 100644
index 0000000..9941399
--- /dev/null
+++ b/src/layouts/components/Menu.vue
@@ -0,0 +1,85 @@
+<template>
+  <n-menu
+    :collapsed="appStore.collapsed"
+    :collapsed-width="64"
+    :collapsed-icon-size="24"
+    :indent="20"
+    :options="menuOptions"
+    @update:value="handleClickMenu"
+  />
+</template>
+
+<script setup lang="ts">
+import { useApp } from '@/store';
+import { Icon } from '@iconify/vue';
+import { useRouter } from 'vue-router';
+import { h } from 'vue';
+import type { MenuOption } from 'naive-ui';
+
+const appStore = useApp();
+const router = useRouter();
+
+function renderIcon(icon: string) {
+  return () => h(Icon, { icon });
+}
+
+const handleClickMenu = (key: string, _item: MenuOption) => {
+  router.push(key);
+};
+const menuOptions: MenuOption[] = [
+  {
+    label: 'test1',
+    key: '/test1',
+    icon: renderIcon('icon-park-outline:alarm'),
+  },
+  {
+    label: 'test2',
+    key: '/test2',
+    icon: renderIcon('icon-park-outline:tool'),
+  },
+  {
+    label: 'test3',
+    key: '/test3',
+    icon: renderIcon('icon-park-outline:pic'),
+  },
+  {
+    label: '登录页',
+    key: '/login',
+    icon: renderIcon('icon-park-outline:save'),
+  },
+  {
+    label: '舞，舞，舞',
+    key: 'dance-dance-dance',
+    icon: renderIcon('icon-park-outline:command'),
+    children: [
+      {
+        label: '饮品',
+        key: 'beverage',
+        // icon: renderIcon(WineIcon),
+        children: [
+          {
+            label: '威士忌',
+            key: 'whisky',
+          },
+        ],
+      },
+      {
+        label: '食物',
+        key: 'food',
+        children: [
+          {
+            label: '三明治',
+            key: 'sandwich',
+          },
+        ],
+      },
+      {
+        label: '过去增多，未来减少',
+        key: 'the-past-increases-the-future-recedes',
+      },
+    ],
+  },
+];
+</script>
+
+<style scoped></style>
diff --git a/src/layouts/components/index.ts b/src/layouts/components/index.ts
new file mode 100644
index 0000000..7ff9802
--- /dev/null
+++ b/src/layouts/components/index.ts
@@ -0,0 +1,6 @@
+import Breadcrumb from './Breadcrumb.vue';
+import CollapaseButton from './CollapaseButton.vue';
+import Logo from './Logo.vue';
+import Menu from './Menu.vue';
+
+export { Breadcrumb, CollapaseButton, Menu, Logo };
diff --git a/src/layouts/components/logo.vue b/src/layouts/components/logo.vue
index 13abdc5..29b6d88 100644
--- a/src/layouts/components/logo.vue
+++ b/src/layouts/components/logo.vue
@@ -1,21 +1,13 @@
 <template>
-  <div class="h-60px text-2xl flex-center">
+  <div class="h-60px text-2xl flex-center overflow-hidden">
     <SvgIcon name="logo" class="w-9 h-9" />
-    <span v-show="!props.collapsed" class="mx-5">{{ props.title }}</span>
+    <div v-show="!appStore.collapsed" class="mx-5">{{ appStore.title }}</div>
   </div>
 </template>
 
 <script setup lang="ts">
-const props = defineProps({
-  title: {
-    type: String,
-    default: 'Logo2',
-  },
-  collapsed: {
-    type: Boolean,
-    default: false,
-  },
-});
+import { useApp } from '@/store';
+const appStore = useApp();
 </script>
 
 <style scoped></style>
diff --git a/src/store/index.ts b/src/store/index.ts
index 397cd23..3d337d1 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -5,3 +5,4 @@ export function setupStore(app: App) {
   const store = createPinia();
   app.use(store);
 }
+export * from './modules';
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
new file mode 100644
index 0000000..07a53a9
--- /dev/null
+++ b/src/store/modules/app.ts
@@ -0,0 +1,15 @@
+import { defineStore } from 'pinia';
+
+export const useApp = defineStore('app-store', {
+  state: () => {
+    return {
+      collapsed: false,
+      title: import.meta.env.VITE_APP_TITLE,
+    };
+  },
+  actions: {
+    switchCollapse() {
+      this.collapsed = !this.collapsed;
+    },
+  },
+});
diff --git a/src/store/modules/auth.ts b/src/store/modules/auth.ts
new file mode 100644
index 0000000..6be36e0
--- /dev/null
+++ b/src/store/modules/auth.ts
@@ -0,0 +1,9 @@
+import { defineStore } from 'pinia';
+
+export const useAuth = defineStore('auth-store', {
+  state: () => {
+    return {
+      name: '张三',
+    };
+  },
+});
diff --git a/src/store/modules/index.ts b/src/store/modules/index.ts
index e5abc85..17b64ca 100644
--- a/src/store/modules/index.ts
+++ b/src/store/modules/index.ts
@@ -1 +1,2 @@
 export * from './user';
+export * from './app';
diff --git a/src/views/test/test2.vue b/src/views/test/test2.vue
index a0a4f15..4603ad1 100644
--- a/src/views/test/test2.vue
+++ b/src/views/test/test2.vue
@@ -1,11 +1,11 @@
 <template>
-  <div text-center c-yellow>I prove that you have made the jump test2.</div>
+  <div text-center c-yellow>I prove that you have made the ju mp test2.</div>
   {{ userStore.name }}
 </template>
 
 <script setup lang="ts">
 import { useRouter } from 'vue-router';
-import { useStore } from '@/store/modules';
+import { useStore } from '@/store';
 
 const userStore = useStore();