From 449312c146033afa7e90cab0f00ae476becda956 Mon Sep 17 00:00:00 2001 From: wanchun <445436867@qq.com> Date: Tue, 4 Jan 2022 14:05:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/reference/plugin/plugins/layout.md | 8 +- docs/zh/guide/route.md | 2 +- docs/zh/reference/plugin/plugins/layout.md | 8 +- .../src/runtime/createDirective.js | 6 +- .../src/runtime/helpers/pluginLocale.js | 6 +- .../fes-plugin-layout/src/runtime/index.tpl | 3 +- .../src/runtime/views/MenuIcon.vue | 5 +- .../examples/app1/package.json | 54 +++++++++++++ .../fes-plugin-qiankun/examples/main/.fes.js | 4 +- .../examples/main/package.json | 54 +++++++++++++ .../examples/main/src/global.css | 3 + packages/fes-template/.fes.js | 81 ++++++++----------- packages/fes-template/src/app.js | 14 +--- packages/fes-template/src/locales/en-US.js | 11 +-- packages/fes-template/src/locales/id-ID.js | 11 --- packages/fes-template/src/locales/pt-BR.js | 8 -- packages/fes-template/src/locales/zh-CN.js | 11 +-- packages/fes-template/src/locales/zh-TW.js | 8 -- packages/fes-template/src/pages/a/b.vue | 8 -- packages/fes-template/src/pages/b/index.vue | 8 -- packages/fes-template/src/pages/editor.vue | 2 +- packages/fes-template/src/pages/index.vue | 2 +- packages/fes-template/src/pages/onepiece.vue | 21 ----- packages/fes-template/src/pages/store.vue | 31 ++++--- packages/fes-template/src/pages/test.vue | 16 ---- 25 files changed, 196 insertions(+), 189 deletions(-) create mode 100644 packages/fes-plugin-qiankun/examples/app1/package.json create mode 100644 packages/fes-plugin-qiankun/examples/main/package.json delete mode 100644 packages/fes-template/src/locales/id-ID.js delete mode 100644 packages/fes-template/src/locales/pt-BR.js delete mode 100644 packages/fes-template/src/locales/zh-TW.js delete mode 100644 packages/fes-template/src/pages/a/b.vue delete mode 100644 packages/fes-template/src/pages/b/index.vue delete mode 100644 packages/fes-template/src/pages/onepiece.vue delete mode 100644 packages/fes-template/src/pages/test.vue diff --git a/docs/reference/plugin/plugins/layout.md b/docs/reference/plugin/plugins/layout.md index 9dc05e16..be8a079d 100644 --- a/docs/reference/plugin/plugins/layout.md +++ b/docs/reference/plugin/plugins/layout.md @@ -84,7 +84,7 @@ export default { // 标题 title: "Fes.js", // 底部文字 - footer: 'Created by MumbelFe', + footer: 'Created by MumbleFE', // 主题light theme: 'dark' // 是否开启 tabs @@ -183,13 +183,13 @@ export default { - **path**：菜单的路径，可配置第三方地址。 - - **title**：菜单的标题，如果同时使用[国际化插件](./locale.md)，而且在 `locales` 中配置了 `title` ，则菜单的名称会根据语言自动切换。 + - **title**：菜单的标题，如果同时使用[国际化插件](./locale.md)，而且`title`的值以`$`开头，则使用`$`后面的内容去匹配语言设置。 - **icon**: 菜单的图标，只有一级标题展示图标。 - - 图标使用[antv icon](https://www.antdv.com/components/icon-cn/)，在这里使用组件type。 + - 图标使用[fes-design icon](https://fes-design-4gvn317r3b6bfe17-1254145788.ap-shanghai.app.tcloudbase.com/zh/components/icon.html)，在这里使用组件名称。 ```js { - icon: "user" + icon: "AppstoreOutlined" } ``` - 图标使用本地或者远程svg图片。 diff --git a/docs/zh/guide/route.md b/docs/zh/guide/route.md index 0200633b..2a5757d2 100644 --- a/docs/zh/guide/route.md +++ b/docs/zh/guide/route.md @@ -106,7 +106,7 @@ pages ``` **需要注意的是，满足以下任意规则的文件不会被注册为路由**： -- 不是 `.vue` 文件 +- 不是 `.vue .jsx` 文件 - `components` 目录中的文件 diff --git a/docs/zh/reference/plugin/plugins/layout.md b/docs/zh/reference/plugin/plugins/layout.md index 9dc05e16..be8a079d 100644 --- a/docs/zh/reference/plugin/plugins/layout.md +++ b/docs/zh/reference/plugin/plugins/layout.md @@ -84,7 +84,7 @@ export default { // 标题 title: "Fes.js", // 底部文字 - footer: 'Created by MumbelFe', + footer: 'Created by MumbleFE', // 主题light theme: 'dark' // 是否开启 tabs @@ -183,13 +183,13 @@ export default { - **path**：菜单的路径，可配置第三方地址。 - - **title**：菜单的标题，如果同时使用[国际化插件](./locale.md)，而且在 `locales` 中配置了 `title` ，则菜单的名称会根据语言自动切换。 + - **title**：菜单的标题，如果同时使用[国际化插件](./locale.md)，而且`title`的值以`$`开头，则使用`$`后面的内容去匹配语言设置。 - **icon**: 菜单的图标，只有一级标题展示图标。 - - 图标使用[antv icon](https://www.antdv.com/components/icon-cn/)，在这里使用组件type。 + - 图标使用[fes-design icon](https://fes-design-4gvn317r3b6bfe17-1254145788.ap-shanghai.app.tcloudbase.com/zh/components/icon.html)，在这里使用组件名称。 ```js { - icon: "user" + icon: "AppstoreOutlined" } ``` - 图标使用本地或者远程svg图片。 diff --git a/packages/fes-plugin-access/src/runtime/createDirective.js b/packages/fes-plugin-access/src/runtime/createDirective.js index 2a693fb5..eb5aa076 100644 --- a/packages/fes-plugin-access/src/runtime/createDirective.js +++ b/packages/fes-plugin-access/src/runtime/createDirective.js @@ -1,7 +1,7 @@ import { watch } from 'vue'; const cache = new WeakMap(); -const setDispaly = (el, access) => { +const setDisplay = (el, access) => { if (access.value) { el.style.display = el._display; } else { @@ -15,9 +15,9 @@ export default function createDirective(useAccess) { ctx.watch = (path) => { el._display = el._display || el.style.display; const access = useAccess(path); - setDispaly(el, access); + setDisplay(el, access); return watch(access, () => { - setDispaly(el, access); + setDisplay(el, access); }); }; cache.set(el, ctx); diff --git a/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js b/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js index 6722e8c4..4682d7d2 100644 --- a/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js +++ b/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js @@ -1,10 +1,13 @@ import { plugin } from '@@/core/coreExports'; export const transTitle = (name) => { + if (!/^\$\S+$/.test(name)) { + return name; + } const sharedLocale = plugin.getShared('locale'); if (sharedLocale) { const { t } = sharedLocale.useI18n(); - return t(name); + return t(name.slice(1)); } return name; }; @@ -13,7 +16,6 @@ export const transTitle = (name) => { export const transform = menus => menus.map((menu) => { const copy = { ...menu, - _label: menu.label, label: transTitle(menu.label) }; if (menu.children) { diff --git a/packages/fes-plugin-layout/src/runtime/index.tpl b/packages/fes-plugin-layout/src/runtime/index.tpl index ce86b74a..3ffef152 100644 --- a/packages/fes-plugin-layout/src/runtime/index.tpl +++ b/packages/fes-plugin-layout/src/runtime/index.tpl @@ -2,11 +2,10 @@ import { reactive, defineComponent } from "vue"; import { plugin, ApplyPluginsType } from "@@/core/coreExports"; import BaseLayout from "./views/BaseLayout.vue"; -const userConfig = reactive({{{REPLACE_USER_CONFIG}}}); - const Layout = defineComponent({ name: 'Layout', setup(){ + const userConfig = reactive({{{REPLACE_USER_CONFIG}}}); const runtimeConfig = plugin.applyPlugins({ key: "layout", type: ApplyPluginsType.modify, diff --git a/packages/fes-plugin-layout/src/runtime/views/MenuIcon.vue b/packages/fes-plugin-layout/src/runtime/views/MenuIcon.vue index e1261e61..e7bba3b4 100644 --- a/packages/fes-plugin-layout/src/runtime/views/MenuIcon.vue +++ b/packages/fes-plugin-layout/src/runtime/views/MenuIcon.vue @@ -33,7 +33,7 @@ export default { if (AText.value) { return ( ); @@ -55,9 +55,6 @@ export default { text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; min-width: 14px; - margin-right: 10px; font-size: 14px; - transition: font-size 0.15s cubic-bezier(0.215, 0.61, 0.355, 1), - margin 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); } diff --git a/packages/fes-plugin-qiankun/examples/app1/package.json b/packages/fes-plugin-qiankun/examples/app1/package.json new file mode 100644 index 00000000..3180148a --- /dev/null +++ b/packages/fes-plugin-qiankun/examples/app1/package.json @@ -0,0 +1,54 @@ +{ + "name": "app1", + "version": "2.0.0", + "description": "fes项目模版", + "scripts": { + "build": "fes build", + "prod": "FES_ENV=prod fes build", + "analyze": "ANALYZE=1 fes build", + "dev": "fes dev", + "test": "fes test" + }, + "keywords": [ + "管理端", + "fes", + "fast", + "easy", + "strong" + ], + "files": [ + ".eslintrc.js", + ".gitignore", + ".fes.js", + ".fes.prod.js", + "mock.js", + "package.json", + "README.md", + "tsconfig.json", + "/src", + "/config" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/WeBankFinTech/fes.js.git", + "directory": "packages/fes-template" + }, + "author": "harrywan", + "license": "MIT", + "bugs": { + "url": "https://github.com/WeBankFinTech/fes.js/issues" + }, + "homepage": "https://github.com/WeBankFinTech/fes.js#readme", + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@webank/eslint-config-webank": "0.3.1" + }, + "dependencies": { + "@fesjs/fes": "^2.0.0", + "vue": "^3.0.5", + "@fesjs/fes-design": "^0.1.9" + }, + "private": true +} diff --git a/packages/fes-plugin-qiankun/examples/main/.fes.js b/packages/fes-plugin-qiankun/examples/main/.fes.js index e9f8587c..051e0203 100644 --- a/packages/fes-plugin-qiankun/examples/main/.fes.js +++ b/packages/fes-plugin-qiankun/examples/main/.fes.js @@ -9,15 +9,13 @@ export default { }, layout: { title: "Fes.js", - footer: 'Created by MumbelFe', + footer: 'Created by MumbleFE', multiTabs: false, navigation: 'mixin', menus: [{ name: 'index', - icon: 'user' }, { title: "子应用1", - icon: 'user', children: [{ name: 'app1-index' },{ diff --git a/packages/fes-plugin-qiankun/examples/main/package.json b/packages/fes-plugin-qiankun/examples/main/package.json new file mode 100644 index 00000000..3adc3e85 --- /dev/null +++ b/packages/fes-plugin-qiankun/examples/main/package.json @@ -0,0 +1,54 @@ +{ + "name": "main", + "version": "2.0.0", + "description": "fes项目模版", + "scripts": { + "build": "fes build", + "prod": "FES_ENV=prod fes build", + "analyze": "ANALYZE=1 fes build", + "dev": "fes dev", + "test": "fes test" + }, + "keywords": [ + "管理端", + "fes", + "fast", + "easy", + "strong" + ], + "files": [ + ".eslintrc.js", + ".gitignore", + ".fes.js", + ".fes.prod.js", + "mock.js", + "package.json", + "README.md", + "tsconfig.json", + "/src", + "/config" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/WeBankFinTech/fes.js.git", + "directory": "packages/fes-template" + }, + "author": "harrywan", + "license": "MIT", + "bugs": { + "url": "https://github.com/WeBankFinTech/fes.js/issues" + }, + "homepage": "https://github.com/WeBankFinTech/fes.js#readme", + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@webank/eslint-config-webank": "0.3.1" + }, + "dependencies": { + "@fesjs/fes": "^2.0.0", + "vue": "^3.0.5", + "@fesjs/fes-design": "^0.1.9" + }, + "private": true +} diff --git a/packages/fes-plugin-qiankun/examples/main/src/global.css b/packages/fes-plugin-qiankun/examples/main/src/global.css index e69de29b..b8e98c28 100644 --- a/packages/fes-plugin-qiankun/examples/main/src/global.css +++ b/packages/fes-plugin-qiankun/examples/main/src/global.css @@ -0,0 +1,3 @@ +html, body { + margin: 0; +} \ No newline at end of file diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index 67032bf9..8f37aab6 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -1,87 +1,74 @@ // .fes.js 只负责管理编译时配置，只能使用plain Object export default { - exportStatic: {}, + // exportStatic: {}, define: { - __DEV__: false, + __DEV__: false }, - publicPath: "./", + publicPath: './', html: { - title: "海贼王", + title: '海贼王' }, router: { - mode: "history", + mode: 'history' }, access: { roles: { - admin: ["*"], - menuTest: ['/', '/onepiece', '/store'], - }, + admin: ['*'], + menuTest: ['/'] + } }, request: { - dataField: "result", + dataField: 'result' }, mock: { - prefix: "/v2", + prefix: '/v2' }, proxy: { - "/v2": { - target: "https://api.douban.com/", - changeOrigin: true, - }, + '/v2': { + target: 'https://api.douban.com/', + changeOrigin: true + } }, layout: { - title: "Fes.js", - footer: "Created by MumbleFe", + title: 'Fes.js', + footer: 'Created by MumbleFE', multiTabs: false, - navigation: "side", + navigation: 'side', theme: 'dark', menus: [ { - name: "index", - icon: "/wine-outline.svg", + name: 'index', + icon: '/wine-outline.svg' }, { - name: "onepiece", - icon: "UserOutlined", - path: "https://www.baidu.com", + name: 'store' }, { - title: "abcd", - children: [ - { - name: "store", - }, - ], - }, - { - name: "setting", - title: "setting", - children: [ - { - name: "test", - }, - ], - },{ name: 'editor', - icon: "/wine-outline.svg" - } - ], + icon: '/wine-outline.svg' + }, + { + title: '$externalLink', + icon: 'UserOutlined', + path: 'https://www.baidu.com' + }, + ] }, locale: { - legacy: true, + legacy: true }, devServer: { - port: 8080, + port: 8080 }, enums: { status: [ - ["0", "无效的"], - ["1", "有效的"], - ], + ['0', '无效的'], + ['1', '有效的'] + ] }, vuex: { - strict: true, + strict: true }, dynamicImport: true, monacoEditor: { diff --git a/packages/fes-template/src/app.js b/packages/fes-template/src/app.js index 8bd599b2..f9c66d27 100644 --- a/packages/fes-template/src/app.js +++ b/packages/fes-template/src/app.js @@ -1,11 +1,9 @@ -import { access as accessApi, store, GETTER_TYPES } from '@fesjs/fes'; +import { access as accessApi } from '@fesjs/fes'; import PageLoading from '@/components/PageLoading'; import UserCenter from '@/components/UserCenter'; -console.log(store.getters[GETTER_TYPES.user.address]); -console.log(process.env.FES_APP_PUBLISH_ERROR_PAGE); export const beforeRender = { loading: , @@ -13,9 +11,9 @@ export const beforeRender = { const { setRole } = accessApi; return new Promise((resolve) => { setTimeout(() => { - setRole('menuTest'); + setRole('admin'); resolve({ - userName: 'harrywan' + userName: '李雷' }); }, 1000); }); @@ -24,10 +22,4 @@ export const beforeRender = { export const layout = { customHeader: - // unAccessHandler({ next }) { - // next(false); - // }, - // noFoundHandler({ next }) { - // next(false); - // } }; diff --git a/packages/fes-template/src/locales/en-US.js b/packages/fes-template/src/locales/en-US.js index d2c8653c..0d39017e 100644 --- a/packages/fes-template/src/locales/en-US.js +++ b/packages/fes-template/src/locales/en-US.js @@ -1,12 +1,7 @@ export default { - test: 'test', home: 'home', - 'navBar.lang': 'Languages', - 'layout.user.link.help': 'Help', - 'layout.user.link.privacy': 'Privacy', - 'layout.user.link.terms': 'Terms', - 'app.preview.down.block': 'Download this page to your local project', - 'app.welcome.link.fetch-blocks': 'Get all block', - 'app.welcome.link.block-list': 'Quickly build standard, pages based on `block` development' + store: 'store', + editor: 'editor', + externalLink: 'externalLink' }; diff --git a/packages/fes-template/src/locales/id-ID.js b/packages/fes-template/src/locales/id-ID.js deleted file mode 100644 index 3596ca12..00000000 --- a/packages/fes-template/src/locales/id-ID.js +++ /dev/null @@ -1,11 +0,0 @@ - -export default { - 'navbar.lang': 'Bahasa', - 'layout.user.link.help': 'Bantuan', - 'layout.user.link.privacy': 'Privasi', - 'layout.user.link.terms': 'Ketentuan', - 'app.preview.down.block': 'Unduh halaman ini dalam projek lokal anda', - 'app.welcome.link.fetch-blocks': 'Dapatkan semua blok', - 'app.welcome.link.block-list': - 'Buat standar dengan cepat, halaman-halaman berdasarkan pengembangan `block`' -}; diff --git a/packages/fes-template/src/locales/pt-BR.js b/packages/fes-template/src/locales/pt-BR.js deleted file mode 100644 index 7a7a80bd..00000000 --- a/packages/fes-template/src/locales/pt-BR.js +++ /dev/null @@ -1,8 +0,0 @@ - -export default { - 'navBar.lang': 'Idiomas', - 'layout.user.link.help': 'ajuda', - 'layout.user.link.privacy': 'política de privacidade', - 'layout.user.link.terms': 'termos de serviços', - 'app.preview.down.block': 'Download this page to your local project' -}; diff --git a/packages/fes-template/src/locales/zh-CN.js b/packages/fes-template/src/locales/zh-CN.js index bbc8138d..be54ef9f 100644 --- a/packages/fes-template/src/locales/zh-CN.js +++ b/packages/fes-template/src/locales/zh-CN.js @@ -1,12 +1,7 @@ export default { - test: '测试', home: '首页', - 'navBar.lang': '语言', - 'layout.user.link.help': '帮助', - 'layout.user.link.privacy': '隐私', - 'layout.user.link.terms': '条款', - 'app.preview.down.block': '下载此页面到本地项目', - 'app.welcome.link.fetch-blocks': '获取全部区块', - 'app.welcome.link.block-list': '基于 block 开发，快速构建标准页面' + store: '状态管理', + editor: '编辑器', + externalLink: '外部链接' }; diff --git a/packages/fes-template/src/locales/zh-TW.js b/packages/fes-template/src/locales/zh-TW.js deleted file mode 100644 index 6347aea9..00000000 --- a/packages/fes-template/src/locales/zh-TW.js +++ /dev/null @@ -1,8 +0,0 @@ - -export default { - 'navBar.lang': '語言', - 'layout.user.link.help': '幫助', - 'layout.user.link.privacy': '隱私', - 'layout.user.link.terms': '條款', - 'app.preview.down.block': '下載此頁面到本地項目' -}; diff --git a/packages/fes-template/src/pages/a/b.vue b/packages/fes-template/src/pages/a/b.vue deleted file mode 100644 index 183c640d..00000000 --- a/packages/fes-template/src/pages/a/b.vue +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/packages/fes-template/src/pages/b/index.vue b/packages/fes-template/src/pages/b/index.vue deleted file mode 100644 index 26f31da7..00000000 --- a/packages/fes-template/src/pages/b/index.vue +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/packages/fes-template/src/pages/editor.vue b/packages/fes-template/src/pages/editor.vue index 1ec87ff6..e4a89b05 100644 --- a/packages/fes-template/src/pages/editor.vue +++ b/packages/fes-template/src/pages/editor.vue @@ -11,7 +11,7 @@ { "name": "editor", - "title": "monaco-editor" + "title": "$editor" } diff --git a/packages/fes-template/src/pages/store.vue b/packages/fes-template/src/pages/store.vue index 3c157136..c6831f96 100644 --- a/packages/fes-template/src/pages/store.vue +++ b/packages/fes-template/src/pages/store.vue @@ -1,16 +1,24 @@ { "name": "store", - "title": "vuex测试" + "title": "$store" } - diff --git a/packages/fes-template/src/pages/test.vue b/packages/fes-template/src/pages/test.vue deleted file mode 100644 index 2c50c8f0..00000000 --- a/packages/fes-template/src/pages/test.vue +++ /dev/null @@ -1,16 +0,0 @@ - - -{ - "name": "test", - "title": "侧事故" -} - -