From 6fa17533df894de1ab091ea73f559e48393fdf60 Mon Sep 17 00:00:00 2001
From: ivamp <im@ivampiresp.com>
Date: Thu, 21 Mar 2024 18:37:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20yarn.lock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yarn.lock | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a5e9ba8..1389869 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18,9 +18,9 @@
   integrity sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==
 
 "@babel/runtime@^7.21.0":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
-  integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.1.tgz#431f9a794d173b53720e69a6464abc6f0e2a5c57"
+  integrity sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -2027,8 +2027,16 @@ source-map-js@^1.0.2, source-map-js@^1.1.0:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.1.0.tgz#9e7d5cb46f0689fb6691b30f226937558d0fa94b"
   integrity sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
-  name string-width-cjs
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -2046,8 +2054,14 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  name strip-ansi-cjs
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==

From 92772e0de7ae354c87db15c755240b405d525c25 Mon Sep 17 00:00:00 2001
From: ivamp <im@ivampiresp.com>
Date: Thu, 21 Mar 2024 23:07:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B9=E8=BF=9B=20=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Container.vue    | 144 --------------------------------
 src/components/Layout.vue       |   4 +-
 src/components/ManageLayout.vue |  64 ++++++++++++++
 src/views/manage/Index.vue      |  13 +--
 4 files changed, 74 insertions(+), 151 deletions(-)
 delete mode 100644 src/components/Container.vue
 create mode 100644 src/components/ManageLayout.vue

diff --git a/src/components/Container.vue b/src/components/Container.vue
deleted file mode 100644
index 8be4d48..0000000
--- a/src/components/Container.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<script setup lang="ts">
-import {NIcon, NLayout, NLayoutSider, NMenu} from "naive-ui"
-import {RouterView} from "vue-router"
-import type { MenuOption } from 'naive-ui'
-import { RouterLink } from 'vue-router'
-import {type Component, defineComponent, h} from 'vue'
-import {
-  BookOutline as BookIcon,
-  PersonOutline as PersonIcon,
-  WineOutline as WineIcon,
-  HomeOutline as HomeIcon
-} from '@vicons/ionicons5'
-function renderIcon (icon: Component) {
-  return () => h(NIcon, null, { default: () => h(icon) })
-}
-
-const menuOptions: MenuOption[] = [
-  {
-    label: () =>
-        h(
-            RouterLink,
-            {
-              to: {
-                name: 'home',
-                params: {
-                  lang: 'zh-CN'
-                }
-              }
-            },
-            { default: () => '回家' }
-        ),
-    key: 'go-back-home',
-    icon: renderIcon(HomeIcon)
-  },
-  {
-    key: 'divider-1',
-    type: 'divider',
-    props: {
-      style: {
-        marginLeft: '32px'
-      }
-    }
-  },
-  {
-    label: () =>
-        h(
-            'a',
-            {
-              href: 'https://baike.baidu.com/item/%E4%B8%94%E5%90%AC%E9%A3%8E%E5%90%9F',
-              target: '_blank',
-              rel: 'noopenner noreferrer'
-            },
-            '且听风吟'
-        ),
-    key: 'hear-the-wind-sing',
-    icon: renderIcon(BookIcon)
-  },
-  {
-    label: '1973年的弹珠玩具',
-    key: 'pinball-1973',
-    icon: renderIcon(BookIcon),
-    disabled: true,
-    children: [
-      {
-        label: '鼠',
-        key: 'rat'
-      }
-    ]
-  },
-  {
-    label: '寻羊冒险记',
-    key: 'a-wild-sheep-chase',
-    icon: renderIcon(BookIcon),
-    disabled: true
-  },
-  {
-    label: '舞，舞，舞',
-    key: 'dance-dance-dance',
-    icon: renderIcon(BookIcon),
-    children: [
-      {
-        type: 'group',
-        label: '人物',
-        key: 'people',
-        children: [
-          {
-            label: '叙事者',
-            key: 'narrator',
-            icon: renderIcon(PersonIcon)
-          },
-          {
-            label: '羊男',
-            key: 'sheep-man',
-            icon: renderIcon(PersonIcon)
-          }
-        ]
-      },
-      {
-        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>
-
-<template>
-  <n-layout has-sider class="min-h-screen">
-    <n-layout-sider>
-      <n-menu :options="menuOptions" />
-    </n-layout-sider>
-    <n-layout embedded  :native-scrollbar="false"
-               content-style="padding: 24px;padding-top: 10px" class="min-h-screen">
-      <router-view/>
-
-    </n-layout>
-  </n-layout>
-
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/components/Layout.vue b/src/components/Layout.vue
index 4ec203e..91c7ccc 100644
--- a/src/components/Layout.vue
+++ b/src/components/Layout.vue
@@ -10,7 +10,7 @@ import {
   useOsTheme,
     zhCN,dateZhCN
 } from 'naive-ui'
-import Container from "@/components/Container.vue";
+import Container from "@/components/ManageLayout.vue";
 
 const osTheme = useOsTheme()
 const theme = computed(() => (osTheme.value === 'dark' ? darkTheme : null))
@@ -23,7 +23,7 @@ const theme = computed(() => (osTheme.value === 'dark' ? darkTheme : null))
       <n-message-provider>
         <n-global-style/>
         <n-dialog-provider>
-          <Container></Container>
+          <router-view />
         </n-dialog-provider>
 
       </n-message-provider>
diff --git a/src/components/ManageLayout.vue b/src/components/ManageLayout.vue
new file mode 100644
index 0000000..40c7692
--- /dev/null
+++ b/src/components/ManageLayout.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import type {MenuOption} from 'naive-ui'
+import {NIcon, NLayout, NLayoutSider, NMenu} from "naive-ui"
+import {RouterLink} from "vue-router"
+import {type Component, h, ref} from 'vue'
+
+
+import {
+  HomeOutline as HomeIcon,
+} from '@vicons/ionicons5'
+
+function renderIcon(icon: Component) {
+  return () => h(NIcon, null, {default: () => h(icon)})
+}
+
+const collapsed = ref(false)
+
+const menuOptions: MenuOption[] = [
+  {
+    label: () =>
+        h(
+            RouterLink,
+            {
+              to: {
+                name: 'manage.index',
+              }
+            },
+            {default: () => '中台'}
+        ),
+    key: 'go-back-home',
+    icon: renderIcon(HomeIcon)
+  },
+]
+</script>
+
+<template>
+  <n-layout has-sider class="min-h-screen">
+    <n-layout-sider bordered
+                    collapse-mode="width"
+                    :collapsed-width="64"
+                    :width="240"
+                    :collapsed="collapsed"
+                    show-trigger
+                    @collapse="collapsed = true"
+                    @expand="collapsed = false">
+      <n-menu
+          :collapsed="collapsed"
+          :collapsed-width="64"
+          :collapsed-icon-size="22"
+          :options="menuOptions"/>
+    </n-layout-sider>
+    <n-layout embedded :native-scrollbar="false"
+              content-style="padding: 24px;padding-top: 10px" class="min-h-screen">
+
+      <slot/>
+
+    </n-layout>
+  </n-layout>
+
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/manage/Index.vue b/src/views/manage/Index.vue
index c7e0a89..6d56a43 100644
--- a/src/views/manage/Index.vue
+++ b/src/views/manage/Index.vue
@@ -1,13 +1,16 @@
 <script setup lang="ts">
   import {NH1, NText} from 'naive-ui'
+  import ManageLayout from "@/components/ManageLayout.vue";
 </script>
 
 <template>
-  <n-h1>
-    <n-text type="primary">
-      中台
-    </n-text>
-  </n-h1>
+  <ManageLayout>
+    <n-h1>
+      <n-text type="primary">
+        中台
+      </n-text>
+    </n-h1>
+  </ManageLayout>
 </template>
 
 <style scoped>