From 4b019a0688e8925d52e435cb186d4942556ad5cd Mon Sep 17 00:00:00 2001 From: bac-joker Date: Thu, 4 Mar 2021 17:13:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20bable=20plugin=20|=20presets=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/commands/webpackConfig/getBableOpts.js | 13 +++++++++---- .../src/plugins/commands/webpackConfig/index.js | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBableOpts.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBableOpts.js index 22b7cac8..92790902 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBableOpts.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBableOpts.js @@ -2,9 +2,10 @@ import { winPath } from '@umijs/utils'; -function getBabelOpts({ +function getBableOpts({ cwd, targets, + config, presetOpts }) { const presets = [ @@ -19,7 +20,8 @@ function getBabelOpts({ }, modules: false } - ] + ], + ...(config.extraBabelPresets || []) ]; const plugins = [ require('@babel/plugin-proposal-export-default-from').default, @@ -45,7 +47,8 @@ function getBabelOpts({ importOpts.libraryName ]) : []), - require.resolve('@vue/babel-plugin-jsx') + require.resolve('@vue/babel-plugin-jsx'), + ...(config.extraBabelPresets || []) ]; return { babelrc: false, @@ -62,6 +65,7 @@ function getBabelOpts({ export default async ({ cwd, + config, modifyBabelOpts, modifyBabelPresetOpts, targets @@ -72,8 +76,9 @@ export default async ({ if (modifyBabelPresetOpts) { presetOpts = await modifyBabelPresetOpts(presetOpts); } - let babelOpts = getBabelOpts({ + let babelOpts = getBableOpts({ cwd, + config, presetOpts, targets }); diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js index dcbcb39f..861d19c5 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js @@ -157,6 +157,7 @@ export default async function getConfig({ const { targets, browserslist } = getTargetsAndBrowsersList({ config }); const babelOpts = await getBableOpts({ cwd, + config, modifyBabelOpts, modifyBabelPresetOpts, targets From c65e1c089ceefa59fdd732e3fd8fd4a3746dd224 Mon Sep 17 00:00:00 2001 From: bac-joker Date: Thu, 4 Mar 2021 19:35:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20global=20css?= =?UTF-8?q?=20=E7=9A=84=E8=83=BD=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-preset-built-in/src/index.js | 1 + .../src/plugins/features/globalCSS.js | 25 +++++++++++++++++++ packages/fes-template/src/global.css | 0 3 files changed, 26 insertions(+) create mode 100644 packages/fes-preset-built-in/src/plugins/features/globalCSS.js create mode 100644 packages/fes-template/src/global.css diff --git a/packages/fes-preset-built-in/src/index.js b/packages/fes-preset-built-in/src/index.js index 9da9ca76..83060016 100644 --- a/packages/fes-preset-built-in/src/index.js +++ b/packages/fes-preset-built-in/src/index.js @@ -28,6 +28,7 @@ export default function () { require.resolve('./plugins/features/extraBabelPresets'), require.resolve('./plugins/features/extraPostCSSPlugins'), require.resolve('./plugins/features/html'), + require.resolve('./plugins/features/globalCSS'), require.resolve('./plugins/features/inlineLimit'), require.resolve('./plugins/features/lessLoader'), require.resolve('./plugins/features/mountElementId'), diff --git a/packages/fes-preset-built-in/src/plugins/features/globalCSS.js b/packages/fes-preset-built-in/src/plugins/features/globalCSS.js new file mode 100644 index 00000000..0e12c756 --- /dev/null +++ b/packages/fes-preset-built-in/src/plugins/features/globalCSS.js @@ -0,0 +1,25 @@ +import { relative, join } from 'path'; +import { existsSync } from 'fs'; + +export default (api) => { + const { + paths, + utils: { winPath } + } = api; + const { absSrcPath = '', absTmpPath = '' } = paths; + const files = [ + 'global.css', + 'global.less', + 'global.stylus' + ]; + const globalCSSFile = files + .map(file => join(absSrcPath || '', file)) + .filter(file => existsSync(file)) + .slice(0, 1); + + api.addEntryCodeAhead( + () => `${globalCSSFile + .map(file => `require('${winPath(relative(absTmpPath, file))}');`) + .join('')}` + ); +}; diff --git a/packages/fes-template/src/global.css b/packages/fes-template/src/global.css new file mode 100644 index 00000000..e69de29b From 14c00a8ffc76b1a6a0d6cbfd9231602ab6a6d649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= Date: Thu, 4 Mar 2021 19:48:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96plugin-access?= =?UTF-8?q?=E5=92=8Cplugin-layout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. access插件提供找不到页面时的处理器 2. 文件路径转路由路径优化 3. 提供按需加载插件配置dynamicImport --- .../templates/app/pc/src/pages/index.vue | 1 - .../fes-plugin-access/src/runtime/core.tpl | 21 +++++------- .../fes-plugin-access/src/runtime/runtime.js | 33 +++++++++++-------- .../{addAccessTag.js => pluginAccess.js} | 16 ++++----- .../src/runtime/views/Menu.vue | 8 ++--- .../src/runtime/views/MultiTabProvider.vue | 6 ++-- packages/fes-preset-built-in/src/index.js | 1 + .../src/plugins/features/dynamicImport.js | 12 +++++++ .../src/plugins/misc/route/index.js | 23 ++++++------- packages/fes-template/.fes.js | 5 +-- packages/fes-template/src/app.js | 25 ++++++++++++-- packages/fes-template/src/pages/403.vue | 25 ++++++++++++++ packages/fes-template/src/pages/404.vue | 25 ++++++++++++++ packages/fes-template/src/pages/index.vue | 2 -- 14 files changed, 144 insertions(+), 59 deletions(-) rename packages/fes-plugin-layout/src/runtime/helpers/{addAccessTag.js => pluginAccess.js} (72%) create mode 100644 packages/fes-preset-built-in/src/plugins/features/dynamicImport.js create mode 100644 packages/fes-template/src/pages/403.vue create mode 100644 packages/fes-template/src/pages/404.vue diff --git a/packages/create-fes-app/templates/app/pc/src/pages/index.vue b/packages/create-fes-app/templates/app/pc/src/pages/index.vue index 3a304634..ef41dd64 100644 --- a/packages/create-fes-app/templates/app/pc/src/pages/index.vue +++ b/packages/create-fes-app/templates/app/pc/src/pages/index.vue @@ -73,7 +73,6 @@ export default { locale.setLocale({ lang: 'en-US' }); locale.addLocale({ lang: 'ja-JP', messages: { test: 'テスト' } }); console.log(locale.getAllLocales()); - access.addAccess('/onepiece1'); }, 2000); setTimeout(() => { accessId.value = '11'; diff --git a/packages/fes-plugin-access/src/runtime/core.tpl b/packages/fes-plugin-access/src/runtime/core.tpl index 15d44688..cd0c9c3c 100644 --- a/packages/fes-plugin-access/src/runtime/core.tpl +++ b/packages/fes-plugin-access/src/runtime/core.tpl @@ -1,4 +1,4 @@ -import { reactive, computed, inject } from "vue"; +import { reactive, unref, computed, inject } from "vue"; import createDirective from "./createDirective"; import createComponent from "./createComponent"; @@ -56,12 +56,9 @@ const setAccess = (accessIds) => { state.currentAccessIds = accessIds; }; -const addAccess = (accessId) => { - if (typeof accessId !== 'string') { - throw new Error("[plugin-access]: argument to the addAccess() must be string"); - } - state.currentAccessIds.push(accessId); -}; +const getAccess = () => { + return state.currentAccessIds.slice(0) +} const _syncSetRoleId = (promise) => { rolePromiseList.push(promise); @@ -116,12 +113,12 @@ const match = (path, accessIds) => { return false; }; -const hasLoading = () => { +const isDataReady = () => { return rolePromiseList.length || accessPromiseList.length; }; const hasAccess = async (path) => { - if (!hasLoading()) { + if (!isDataReady()) { return match(path, getAllowAccessIds()); } await Promise.all(rolePromiseList.concat(accessPromiseList)); @@ -132,7 +129,7 @@ export const install = (app) => { const allowPageIds = computed(getAllowAccessIds); const useAccess = (path) => { const result = computed(() => { - return match(path, allowPageIds.value); + return match(unref(path), allowPageIds.value); }); return result; }; @@ -143,10 +140,10 @@ export const install = (app) => { export const access = { hasAccess, - hasLoading, + isDataReady, setRole, setAccess, - addAccess + getAccess, }; export const useAccess = (path) => { diff --git a/packages/fes-plugin-access/src/runtime/runtime.js b/packages/fes-plugin-access/src/runtime/runtime.js index 01d19641..46a877d2 100644 --- a/packages/fes-plugin-access/src/runtime/runtime.js +++ b/packages/fes-plugin-access/src/runtime/runtime.js @@ -3,6 +3,18 @@ import { access, install } from './core'; export function onRouterCreated({ router }) { router.beforeEach(async (to, from, next) => { + const runtimeConfig = plugin.applyPlugins({ + key: 'access', + type: ApplyPluginsType.modify, + initialValue: {} + }); + if (to.matched.length === 0) { + if (runtimeConfig.noFoundHandler && typeof runtimeConfig.noFoundHandler === 'function') { + return runtimeConfig.noFoundHandler({ + router, to, from, next + }); + } + } let path; if (to.matched.length === 1) { path = to.matched[0].path; @@ -11,21 +23,14 @@ export function onRouterCreated({ router }) { } const canRoute = await access.hasAccess(path); if (canRoute) { - next(); - } else { - const runtimeConfig = plugin.applyPlugins({ - key: 'access', - type: ApplyPluginsType.modify, - initialValue: {} - }); - if (runtimeConfig.noAccessHandler && typeof runtimeConfig.noAccessHandler === 'function') { - runtimeConfig.noAccessHandler({ - router, to, from, next - }); - } else { - next(false); - } + return next(); } + if (runtimeConfig.unAccessHandler && typeof runtimeConfig.unAccessHandler === 'function') { + return runtimeConfig.unAccessHandler({ + router, to, from, next + }); + } + next(false); }); } diff --git a/packages/fes-plugin-layout/src/runtime/helpers/addAccessTag.js b/packages/fes-plugin-layout/src/runtime/helpers/pluginAccess.js similarity index 72% rename from packages/fes-plugin-layout/src/runtime/helpers/addAccessTag.js rename to packages/fes-plugin-layout/src/runtime/helpers/pluginAccess.js index ec962335..f1221540 100644 --- a/packages/fes-plugin-layout/src/runtime/helpers/addAccessTag.js +++ b/packages/fes-plugin-layout/src/runtime/helpers/pluginAccess.js @@ -7,29 +7,29 @@ if (!useAccess) { ); } -const hasAccess = (item) => { +export const hasAccessByMenuItem = (item) => { let res; if (item.path && (!item.children || item.children.length === 0)) { res = useAccess(item.path); } else if (item.children && item.children.length > 0) { - res = computed(() => item.children.some(child => hasAccess(child))); + res = computed(() => item.children.some(child => hasAccessByMenuItem(child))); } return res; }; -const addAcessTag = (arr) => { +const _addAccessTag = (arr) => { if (Array.isArray(arr)) { arr.forEach((item) => { - item.access = hasAccess(item); + item.access = hasAccessByMenuItem(item); if (item.children && item.children.length > 0) { - addAcessTag(item.children); + _addAccessTag(item.children); } }); } }; -export default function (menus) { +export const addAccessTag = (menus) => { const originData = unref(menus); - addAcessTag(originData); + _addAccessTag(originData); return originData; -} +}; diff --git a/packages/fes-plugin-layout/src/runtime/views/Menu.vue b/packages/fes-plugin-layout/src/runtime/views/Menu.vue index 5ee7d084..1240fdec 100644 --- a/packages/fes-plugin-layout/src/runtime/views/Menu.vue +++ b/packages/fes-plugin-layout/src/runtime/views/Menu.vue @@ -1,11 +1,11 @@