From 93aad549187b90c35e368b4b5324ae3a2978e717 Mon Sep 17 00:00:00 2001
From: wanchun <445436867@qq.com>
Date: Tue, 4 Jan 2022 15:29:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/app/pc/package.json             |  2 +-
 packages/fes-plugin-layout/package.json       |  2 +-
 packages/fes-plugin-layout/src/node/helper.js |  2 +-
 packages/fes-plugin-locale/package.json       |  2 +-
 .../src/runtime/views/SelectLang.vue          |  8 ++++---
 .../examples/app1/package.json                |  2 +-
 .../examples/main/package.json                |  2 +-
 packages/fes-plugin-qiankun/package.json      |  2 +-
 packages/fes-template/.fes.js                 | 20 ++++++++++++++--
 packages/fes-template/package.json            |  2 +-
 .../src/components/UserCenter.vue             |  7 +++++-
 packages/fes-template/src/pages/cssModule.vue | 24 +++++++++++++++++++
 packages/fes-template/src/pages/index.vue     |  1 -
 .../fes-template/src/pages/menuTest/a.vue     | 21 ++++++++++++++++
 .../fes-template/src/pages/menuTest/index.vue | 21 ++++++++++++++++
 packages/fes-template/src/pages/store.vue     |  1 -
 yarn.lock                                     |  8 +++----
 17 files changed, 107 insertions(+), 20 deletions(-)
 create mode 100644 packages/fes-template/src/pages/cssModule.vue
 create mode 100644 packages/fes-template/src/pages/menuTest/a.vue
 create mode 100644 packages/fes-template/src/pages/menuTest/index.vue

diff --git a/packages/create-fes-app/templates/app/pc/package.json b/packages/create-fes-app/templates/app/pc/package.json
index afb4d5d3..e4b1b7a3 100644
--- a/packages/create-fes-app/templates/app/pc/package.json
+++ b/packages/create-fes-app/templates/app/pc/package.json
@@ -52,7 +52,7 @@
     "@fesjs/plugin-layout": "^2.0.0",
     "@fesjs/plugin-model": "^2.0.0",
     "@fesjs/plugin-enums": "^2.0.0",
-    "@fesjs/fes-design": "^0.1.9",
+    "@fesjs/fes-design": "^0.1.10",
     "vue": "^3.2.6"
   },
   "private": true
diff --git a/packages/fes-plugin-layout/package.json b/packages/fes-plugin-layout/package.json
index ee9e26d9..b2eeac40 100644
--- a/packages/fes-plugin-layout/package.json
+++ b/packages/fes-plugin-layout/package.json
@@ -31,7 +31,7 @@
   },
   "peerDependencies": {
     "@fesjs/fes": "^2.0.0",
-    "@fesjs/fes-design": "^0.1.9",
+    "@fesjs/fes-design": "^0.1.10",
     "vue": "^3.0.5"
   }
 }
diff --git a/packages/fes-plugin-layout/src/node/helper.js b/packages/fes-plugin-layout/src/node/helper.js
index ae174e83..d5b83208 100644
--- a/packages/fes-plugin-layout/src/node/helper.js
+++ b/packages/fes-plugin-layout/src/node/helper.js
@@ -20,7 +20,7 @@ const matchName = (config, name) => {
 export const fillMenuByRoute = (menuConfig, routeConfig, dep = 0) => {
     dep += 1;
     if (dep > 3) {
-        throw new Error('[plugin-layout]: menu层级不能超出三层！');
+        console.warn('[plugin-layout]: 菜单层级最好不要超出三层！');
     }
     const arr = [];
     if (Array.isArray(menuConfig) && Array.isArray(routeConfig)) {
diff --git a/packages/fes-plugin-locale/package.json b/packages/fes-plugin-locale/package.json
index c4af0433..6c308ea2 100644
--- a/packages/fes-plugin-locale/package.json
+++ b/packages/fes-plugin-locale/package.json
@@ -32,7 +32,7 @@
   },
   "peerDependencies": {
     "@fesjs/fes": "^2.0.0",
-    "@fesjs/fes-design": "^0.1.9",
+    "@fesjs/fes-design": "^0.1.10",
     "vue": "^3.0.5"
   }
 }
diff --git a/packages/fes-plugin-locale/src/runtime/views/SelectLang.vue b/packages/fes-plugin-locale/src/runtime/views/SelectLang.vue
index 11ebee5c..7d66ad1c 100644
--- a/packages/fes-plugin-locale/src/runtime/views/SelectLang.vue
+++ b/packages/fes-plugin-locale/src/runtime/views/SelectLang.vue
@@ -1,7 +1,7 @@
 <template>
     <FTooltip v-model="isOpened" popperClass="lang-popper" mode="popover">
         <div class="lang-icon">
-            <SettingOutlined />
+            <LanguageOutlined />
         </div>
         <template #content>
             <FScrollbar height="274" class="lang-container">
@@ -24,7 +24,7 @@
 
 <script>
 import { FTooltip, FScrollbar } from '@fesjs/fes-design';
-import { SettingOutlined } from '@fesjs/fes-design/icon';
+import { LanguageOutlined } from '@fesjs/fes-design/icon';
 import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';
 import langUConfigMap from '../langUConfigMap';
@@ -33,7 +33,7 @@ export default {
     components: {
         FTooltip,
         FScrollbar,
-        SettingOutlined
+        LanguageOutlined
     },
     setup() {
         const { messages, locale } = useI18n();
@@ -69,6 +69,8 @@ export default {
 <style lang="less" scoped>
 
 .lang-icon {
+    display: flex;
+    align-items: center;
     margin: 0 8px;
     padding: 0 4px;
     cursor: pointer;
diff --git a/packages/fes-plugin-qiankun/examples/app1/package.json b/packages/fes-plugin-qiankun/examples/app1/package.json
index 3180148a..224273e2 100644
--- a/packages/fes-plugin-qiankun/examples/app1/package.json
+++ b/packages/fes-plugin-qiankun/examples/app1/package.json
@@ -48,7 +48,7 @@
     "dependencies": {
         "@fesjs/fes": "^2.0.0",
         "vue": "^3.0.5",
-        "@fesjs/fes-design": "^0.1.9"
+        "@fesjs/fes-design": "^0.1.10"
     },
     "private": true
 }
diff --git a/packages/fes-plugin-qiankun/examples/main/package.json b/packages/fes-plugin-qiankun/examples/main/package.json
index 3adc3e85..8ee2b9bd 100644
--- a/packages/fes-plugin-qiankun/examples/main/package.json
+++ b/packages/fes-plugin-qiankun/examples/main/package.json
@@ -48,7 +48,7 @@
     "dependencies": {
         "@fesjs/fes": "^2.0.0",
         "vue": "^3.0.5",
-        "@fesjs/fes-design": "^0.1.9"
+        "@fesjs/fes-design": "^0.1.10"
     },
     "private": true
 }
diff --git a/packages/fes-plugin-qiankun/package.json b/packages/fes-plugin-qiankun/package.json
index c2838370..34e0c944 100644
--- a/packages/fes-plugin-qiankun/package.json
+++ b/packages/fes-plugin-qiankun/package.json
@@ -40,6 +40,6 @@
   "peerDependencies": {
     "@fesjs/fes": "^2.0.0",
     "vue": "^3.0.5",
-    "@fesjs/fes-design": "^0.1.9"
+    "@fesjs/fes-design": "^0.1.10"
   }
 }
diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js
index 8f37aab6..585a5af4 100644
--- a/packages/fes-template/.fes.js
+++ b/packages/fes-template/.fes.js
@@ -15,7 +15,7 @@ export default {
     access: {
         roles: {
             admin: ['*'],
-            menuTest: ['/']
+            menuTest: ['/','/menuTest']
         }
     },
     request: {
@@ -34,7 +34,7 @@ export default {
         title: 'Fes.js',
         footer: 'Created by MumbleFE',
         multiTabs: false,
-        navigation: 'side',
+        navigation: 'mixin',
         theme: 'dark',
         menus: [
             {
@@ -53,6 +53,22 @@ export default {
                 icon: 'UserOutlined',
                 path: 'https://www.baidu.com'
             },
+            {
+                title: '菜单权限测试', 
+                children: [
+                    {
+                        title: '子菜单',
+                        path: '/menuTest',
+                    },
+                    {
+                        title: '子菜单a',
+                        path: '/menuTest/a'
+                    },
+                ]
+            }, 
+            {
+                name: 'cssModule'
+            }
         ]
     },
     locale: {
diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json
index 4f3c7a53..fcfe39e1 100644
--- a/packages/fes-template/package.json
+++ b/packages/fes-template/package.json
@@ -59,7 +59,7 @@
     "@fesjs/plugin-sass": "^2.0.0",
     "@fesjs/plugin-monaco-editor": "^2.0.0-beta.0",
     "@fesjs/plugin-windicss": "^2.0.0",
-    "@fesjs/fes-design": "^0.1.9",
+    "@fesjs/fes-design": "^0.1.10",
     "vue": "^3.0.5",
     "vuex": "^4.0.0"
   },
diff --git a/packages/fes-template/src/components/UserCenter.vue b/packages/fes-template/src/components/UserCenter.vue
index 17d6536f..8b0829a5 100644
--- a/packages/fes-template/src/components/UserCenter.vue
+++ b/packages/fes-template/src/components/UserCenter.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>{{initialState.userName}}</div>
+    <div class="user-center">{{initialState.userName}}</div>
 </template>
 <script>
 import { useModel } from '@fesjs/fes';
@@ -13,3 +13,8 @@ export default {
     }
 };
 </script>
+<style lang="less">
+.user-center {
+    text-align: right;
+}
+</style>
diff --git a/packages/fes-template/src/pages/cssModule.vue b/packages/fes-template/src/pages/cssModule.vue
new file mode 100644
index 00000000..78d29fd8
--- /dev/null
+++ b/packages/fes-template/src/pages/cssModule.vue
@@ -0,0 +1,24 @@
+<template>
+    <div :class="$style.red">
+        字体颜色
+    </div>
+</template>
+<config>
+{
+    "name": "cssModule",
+    "title": "css Module 测试"
+}
+</config>
+<script>
+export default {
+    setup() {
+        return {};
+    }
+};
+</script>
+
+<style module>
+.red {
+  color: red;
+}
+</style>
diff --git a/packages/fes-template/src/pages/index.vue b/packages/fes-template/src/pages/index.vue
index 3199e015..4ea7e8a2 100644
--- a/packages/fes-template/src/pages/index.vue
+++ b/packages/fes-template/src/pages/index.vue
@@ -22,6 +22,5 @@ export default {
 
 <style>
 .page {
-    min-height: 100vh;
 }
 </style>
diff --git a/packages/fes-template/src/pages/menuTest/a.vue b/packages/fes-template/src/pages/menuTest/a.vue
new file mode 100644
index 00000000..cb0d9d84
--- /dev/null
+++ b/packages/fes-template/src/pages/menuTest/a.vue
@@ -0,0 +1,21 @@
+<template>
+    <div class="page">
+        menuTest-a
+    </div>
+</template>
+<script>
+export default {
+    components: {
+    },
+    setup() {
+        return {
+        };
+    }
+};
+</script>
+
+<style>
+.page {
+    min-height: 100vh;
+}
+</style>
diff --git a/packages/fes-template/src/pages/menuTest/index.vue b/packages/fes-template/src/pages/menuTest/index.vue
new file mode 100644
index 00000000..cc76a7e4
--- /dev/null
+++ b/packages/fes-template/src/pages/menuTest/index.vue
@@ -0,0 +1,21 @@
+<template>
+    <div class="page">
+        menuTest-index
+    </div>
+</template>
+<script>
+export default {
+    components: {
+    },
+    setup() {
+        return {
+        };
+    }
+};
+</script>
+
+<style>
+.page {
+    min-height: 100vh;
+}
+</style>
diff --git a/packages/fes-template/src/pages/store.vue b/packages/fes-template/src/pages/store.vue
index c6831f96..63c9df2b 100644
--- a/packages/fes-template/src/pages/store.vue
+++ b/packages/fes-template/src/pages/store.vue
@@ -56,6 +56,5 @@ export default {
 </script>
 <style scoped>
 .page {
-    min-height: 100vh;
 }
 </style>
diff --git a/yarn.lock b/yarn.lock
index 899dbc83..56e87919 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1411,10 +1411,10 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@fesjs/fes-design@^0.1.9":
-  version "0.1.9"
-  resolved "https://registry.npmmirror.com/@fesjs/fes-design/download/@fesjs/fes-design-0.1.9.tgz#19847f3de343a2cb0f1d77a1df72e0d5c1a7690d"
-  integrity sha512-Z5iE935IeonVw5D1H3Yd/OgUGxT9kpa126bJUL9I/zXRtRzilAhR8N0/Vv1/IASKmEDHdt4plMy8YpFNlfjQVg==
+"@fesjs/fes-design@^0.1.10":
+  version "0.1.10"
+  resolved "https://registry.npmmirror.com/@fesjs/fes-design/download/@fesjs/fes-design-0.1.10.tgz#b7caaec676fcd1b2f86f5626b8b575f8d899b0c8"
+  integrity sha512-VEt3gA6ExM7WRhXE1k98Ufgee8h9tTL6nqJOItqHPB0jEcakW5z/r0tSByJND4es7zthwMUihHBzccwvjOVBCQ==
   dependencies:
     "@babel/runtime" "^7.16.3"
     "@juggle/resize-observer" "^3.3.1"