From ce68e83aa625a960181c2372543ec003e511dbcf Mon Sep 17 00:00:00 2001 From: harrywan Date: Wed, 23 Jun 2021 10:16:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/create-fes-app/templates/app/h5/.prettierrc | 4 ++++ packages/create-fes-app/templates/app/pc/.prettierrc | 4 ++++ packages/fes-plugin-layout/src/node/helper.js | 6 +++--- packages/fes-plugin-qiankun/src/main/modifyRoutes.js | 2 +- .../fes-preset-built-in/src/plugins/commands/build/index.js | 2 +- .../fes-preset-built-in/src/plugins/misc/route/index.js | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 packages/create-fes-app/templates/app/h5/.prettierrc create mode 100644 packages/create-fes-app/templates/app/pc/.prettierrc diff --git a/packages/create-fes-app/templates/app/h5/.prettierrc b/packages/create-fes-app/templates/app/h5/.prettierrc new file mode 100644 index 00000000..29ed0c41 --- /dev/null +++ b/packages/create-fes-app/templates/app/h5/.prettierrc @@ -0,0 +1,4 @@ +{ + "singleQuote": true, + "trailingComma": "none" +} \ No newline at end of file diff --git a/packages/create-fes-app/templates/app/pc/.prettierrc b/packages/create-fes-app/templates/app/pc/.prettierrc new file mode 100644 index 00000000..29ed0c41 --- /dev/null +++ b/packages/create-fes-app/templates/app/pc/.prettierrc @@ -0,0 +1,4 @@ +{ + "singleQuote": true, + "trailingComma": "none" +} \ No newline at end of file diff --git a/packages/fes-plugin-layout/src/node/helper.js b/packages/fes-plugin-layout/src/node/helper.js index a14a01e6..4c39f8f6 100644 --- a/packages/fes-plugin-layout/src/node/helper.js +++ b/packages/fes-plugin-layout/src/node/helper.js @@ -6,7 +6,7 @@ const matchName = (config, name) => { for (let i = 0; i < config.length; i++) { const item = config[i]; if (item.meta && item.meta.name === name) { - res = item.meta || {}; + res = item.meta; res.path = item.path; break; } @@ -68,10 +68,10 @@ export function getIconsFromMenu(data) { return []; } let icons = []; - (data || []).forEach((item = { path: '/' }) => { + data.forEach((item = { path: '/' }) => { if (item.icon) { const { icon } = item; - if (icon && icon.type === 'icon') { + if (icon.type === 'icon') { icons.push(icon.name); } } diff --git a/packages/fes-plugin-qiankun/src/main/modifyRoutes.js b/packages/fes-plugin-qiankun/src/main/modifyRoutes.js index e113728b..62f691d7 100644 --- a/packages/fes-plugin-qiankun/src/main/modifyRoutes.js +++ b/packages/fes-plugin-qiankun/src/main/modifyRoutes.js @@ -45,7 +45,7 @@ function modifyRoutesWithAttachMode({ export default function modifyRoutes({ api, namespace }) { api.modifyRoutes((routes) => { const { router, base } = api.config; - const masterHistoryType = (router && router?.mode) || defaultHistoryType; + const masterHistoryType = (router && router.mode) || defaultHistoryType; modifyRoutesWithAttachMode({ routes, diff --git a/packages/fes-preset-built-in/src/plugins/commands/build/index.js b/packages/fes-preset-built-in/src/plugins/commands/build/index.js index 94ec4a75..ef07f0e0 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/build/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/build/index.js @@ -39,7 +39,7 @@ export default function (api) { try { // clear output path before exec build if (process.env.CLEAR_OUTPUT !== 'none') { - if (paths.absOutputPath && existsSync(paths.absOutputPath || '')) { + if (paths.absOutputPath && existsSync(paths.absOutputPath)) { logger.debug(`Clear OutputPath: ${paths.absNodeModulesPath}`); rimraf.sync(paths.absOutputPath); } diff --git a/packages/fes-preset-built-in/src/plugins/misc/route/index.js b/packages/fes-preset-built-in/src/plugins/misc/route/index.js index 7e3311af..73cfb844 100644 --- a/packages/fes-preset-built-in/src/plugins/misc/route/index.js +++ b/packages/fes-preset-built-in/src/plugins/misc/route/index.js @@ -163,7 +163,7 @@ const rank = function (routes) { rank(item.children); } }); - routes = routes.sort((a, b) => b.count - a.count); + routes.sort((a, b) => b.count - a.count); }; const getRoutes = function ({ config, absPagesPath }) { From 053b268ee8a0d6e53fd0c93c70d9fdb924944b9d Mon Sep 17 00:00:00 2001 From: harrywan Date: Wed, 23 Jun 2021 15:03:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat(plugin-layout):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84layout=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/zh/reference/plugin/plugins/layout.md | 54 ++++++++++++------- .../src/runtime/views/BaseLayout.vue | 44 +++++++++++---- 2 files changed, 68 insertions(+), 30 deletions(-) diff --git a/docs/zh/reference/plugin/plugins/layout.md b/docs/zh/reference/plugin/plugins/layout.md index 3e583132..e00ebaca 100644 --- a/docs/zh/reference/plugin/plugins/layout.md +++ b/docs/zh/reference/plugin/plugins/layout.md @@ -14,8 +14,19 @@ - 可配置页面是否需要 layout。 +## 启用方式 +在 `package.json` 中引入依赖： +```json +{ + "dependencies": { + "@fesjs/fes": "^2.0.0", + "@fesjs/plugin-layout": "^2.0.0" + }, +} +``` + ## 布局类型 -配置参数是 `navigation`, 内容默认是 `side`： +配置参数是 `navigation`, 布局有三种类型 `side`、`mixin` 和 `top`， 默认是 `side`： ```js export default { layout: { @@ -36,28 +47,31 @@ export default { mixin -## 启用方式 -在 `package.json` 中引入依赖： -```json -{ - "dependencies": { - "@fesjs/fes": "^2.0.0", - "@fesjs/plugin-layout": "^2.0.0" - }, -} -``` - ### 页面禁用布局 -Fes.js 渲染路由时，如果路由元信息存在配置 `layout` 为 `false`，则表示禁用此配置，用户只需要如下配置： +布局是默认开启的，但是可能某些页面不需要展示布局样式，比如登录页面。我们只需要在页面的`.vue`中添加如下配置： ```vue - + { "layout": false } - ``` +如果只是不想展示`side`，则： + +{ + "layout": { + "side": false + } +} + +``` +`layout`的可选配置有： + +- **side**： 左侧区域 + +- **top**： 头部区域 + +- **logo**：logo和标题区域。 ## 配置 @@ -174,13 +188,13 @@ export default { - 图标使用[antv icon](https://www.antdv.com/components/icon-cn/)，在这里使用组件type。 ```js { - name: "user" + icon: "user" } ``` - - 图表使用本地或者远程svg图片。 + - 图标使用本地或者远程svg图片。 ```js { - name: "/wine-outline.svg" + icon: "/wine-outline.svg" } ``` @@ -201,7 +215,7 @@ export const layout = { - **默认值**：`null` -- **详情**：布局的 Header 部位提供组件自定义功能。 +- **详情**：top的区域部分位置提供组件自定义功能。 #### unAccessHandler - **类型**：`Function` diff --git a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue index 9b0ef429..778302f8 100644 --- a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue +++ b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue @@ -1,6 +1,6 @@