fix: 修复一些问题

2025-10-14 02:48:06 +08:00 · 2022-01-04 15:29:53 +08:00 · 2022-01-04 15:29:53 +08:00 · 93aad54918
commit 93aad54918
parent 449312c146
17 changed files with 107 additions and 20 deletions
--- 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
--- 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"
  }
 }
--- 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)) {
--- 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"
  }
 }
--- 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;
--- 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
 }
--- 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
 }
--- 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"
  }
 }
--- 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: {
--- 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"
  },
--- 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>
--- a/packages/fes-template/src/pages/cssModule.vue
+++ 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>
--- 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>
--- a/packages/fes-template/src/pages/menuTest/a.vue
+++ 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>
--- a/packages/fes-template/src/pages/menuTest/index.vue
+++ 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>
--- 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>
--- 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"