feat(plugin-layout): 支持配置 403、404 的 navigation

.vscode/settings.json

@@ -1,48 +1,35 @@
 {
-  // Enable the ESlint flat config support
-  "eslint.experimental.useFlatConfig": true,
+    // Enable the ESlint flat config support
+    "eslint.experimental.useFlatConfig": true,
 
-  // Disable the default formatter, use eslint instead
-  "prettier.enable": false,
-  "editor.formatOnSave": false,
+    // Disable the default formatter, use eslint instead
+    "prettier.enable": false,
+    "editor.formatOnSave": false,
 
-  // Auto fix
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit",
-    "source.organizeImports": "never"
-  },
+    // Auto fix
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": "explicit",
+        "source.organizeImports": "never"
+    },
 
-  // Silent the stylistic rules in you IDE, but still auto fix them
-  "eslint.rules.customizations": [
-    { "rule": "style/*", "severity": "off" },
-    { "rule": "*-indent", "severity": "off" },
-    { "rule": "*-spacing", "severity": "off" },
-    { "rule": "*-spaces", "severity": "off" },
-    { "rule": "*-order", "severity": "off" },
-    { "rule": "*-dangle", "severity": "off" },
-    { "rule": "*-newline", "severity": "off" },
-    { "rule": "*quotes", "severity": "off" },
-    { "rule": "*semi", "severity": "off" }
-  ],
+    // Enable eslint for all supported languages
+    "eslint.validate": [
+        "javascript",
+        "javascriptreact",
+        "typescript",
+        "typescriptreact",
+        "vue",
+        "html",
+        "markdown",
+        "json",
+        "jsonc",
+        "yaml"
+    ],
 
-  // Enable eslint for all supported languages
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact",
-    "vue",
-    "html",
-    "markdown",
-    "json",
-    "jsonc",
-    "yaml"
-  ],
-
-  "pair-diff.patterns": [
-    {
-      "source": "./fixtures/output/**/*.*",
-      "target": "./fixtures/input/<base>"
-    }
-  ]
+    "pair-diff.patterns": [
+        {
+            "source": "./fixtures/output/**/*.*",
+            "target": "./fixtures/input/<base>"
+        }
+    ]
 }

docs/reference/plugin/plugins/layout.md

@@ -90,8 +90,9 @@ Fes.js 里约定目录下有 `layout.vue` 时会生成嵌套路由，以 `layout
 
 ```vue
 <template>
-    <Page></Page>
+    <Page />
 </template>
+
 <script>
 import { Page } from '@fesjs/fes';
 export default {
@@ -112,7 +113,7 @@ export default {
 export default {
     layout: {
         // 标题
-        title: "Fes.js",
+        title: 'Fes.js',
         // 底部文字
         footer: 'Created by MumbleFE',
         // 主题light
@@ -128,6 +129,7 @@ export default {
         }],
 
     },
+};
 ```
 
 #### 运行时配置方式
@@ -146,27 +148,29 @@ export const layout = {
 };
 ```
 
-在`fes.js`中，运行时配置有定义对象和函数两种方式，当使用函数配置`layout`时，`layoutConfig`是编译时配置结果，`initialState`是 `beforeRender.action`执行后创建的应用初始状态数据。  
+在`fes.js`中，运行时配置有定义对象和函数两种方式，当使用函数配置`layout`时，`layoutConfig`是编译时配置结果，`initialState`是 `beforeRender.action`执行后创建的应用初始状态数据。
 。
 
 ```js
-export const layout = (layoutConfig, { initialState }) => ({
-    renderCustom: () => <UserCenter />,
-    menus: () => {
-        const menusRef = ref(layoutConfig.menus);
-        watch(
-            () => initialState.userName,
-            () => {
-                menusRef.value = [
-                    {
-                        name: 'store',
-                    },
-                ];
-            },
-        );
-        return menusRef;
-    },
-});
+export function layout(layoutConfig, { initialState }) {
+    return {
+        renderCustom: () => <UserCenter />,
+        menus: () => {
+            const menusRef = ref(layoutConfig.menus);
+            watch(
+                () => initialState.userName,
+                () => {
+                    menusRef.value = [
+                        {
+                            name: 'store',
+                        },
+                    ];
+                },
+            );
+            return menusRef;
+        },
+    };
+}
 ```
 
 最终配置结果是运行时配置跟编译时配置合并的结果，运行时配置优先于编译时配置。
@@ -194,6 +198,12 @@ export const layout = (layoutConfig, { initialState }) => ({
 
 -   **详情**：页面布局类型，可选有 `side`、 `top`、 `mixin`
 
+### navigationOnError
+
+-   **类型**：`String`、`Function`
+
+-   **详情**：指定 `403`、`404` 时，页面的布局类型。值同 `navigation`。也支持函数返回。
+
 ### isFixedHeader
 
 -   **类型**：`Boolean`
@@ -382,7 +392,7 @@ import { useRoute, useTabTitle } from '@fesjs/fes';
 
 const titleRef = useTabTitle(`详情-${route.params?.id}`);
 
-//如果要更新
+// 如果要更新
 titleRef.value = 'changed';
 </script>
 ```

eslint.config.js

@@ -2,19 +2,36 @@
 import antfu from '@antfu/eslint-config';
 
 export default await antfu({
+    files: ['**/*.js', '**/*.jsx', '**/*.vue', '**/*.ts'],
+    // TODO: 使用 ignore 代替 cli 命令中的配置
     stylistic: {
-        indent: 4, // 4, or 'tab'
-        quotes: 'single', // or 'double'
+        indent: 4,
+        quotes: 'single',
         semi: 'always',
     },
     typescript: true,
     vue: true,
     rules: {
+        'curly': ['error', 'multi-line'],
         'vue/block-order': [
             'error',
             {
                 order: ['template', 'script', 'style'],
             },
         ],
+        'style/member-delimiter-style': [
+            'error',
+            {
+                multiline: {
+                    delimiter: 'semi',
+                    requireLast: true,
+                },
+                singleline: {
+                    delimiter: 'semi',
+                    requireLast: false,
+                },
+                multilineDetection: 'brackets',
+            },
+        ],
     },
 });

package.json

@@ -1,13 +1,21 @@
 {
     "name": "fes.js",
+    "type": "module",
     "version": "3.1.1",
+    "private": true,
     "description": "一个好用的前端管理台快速开发框架",
     "preferGlobal": true,
-    "private": true,
     "workspaces": [
         "packages/*"
     ],
-    "type": "module",
+    "license": "MIT",
+    "keywords": [
+        "管理端",
+        "fes",
+        "fast",
+        "easy",
+        "strong"
+    ],
     "scripts": {
         "bootstrap": "pnpm i",
         "dev": "node scripts/build.mjs --watch",
@@ -18,17 +26,10 @@
         "docs:build": "vitepress build docs",
         "docs:build-pages": "BASE=fes.js vitepress build docs",
         "test": "fes test",
-        "lint": "eslint -c ./.eslintrc.js --ignore-pattern='templates' --ext .js,.jsx,.vue,.ts",
-        "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
+        "lint": "eslint --ignore-pattern='templates'",
+        "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
+        "hooks:sync": "simple-git-hooks"
     },
-    "license": "MIT",
-    "keywords": [
-        "管理端",
-        "fes",
-        "fast",
-        "easy",
-        "strong"
-    ],
     "dependencies": {
         "chalk": "^5.0.1",
         "conventional-changelog-cli": "^4.1.0",
@@ -38,14 +39,14 @@
         "semver": "^7.3.6"
     },
     "devDependencies": {
-        "@antfu/eslint-config": "^2.1.1",
+        "@antfu/eslint-config": "^2.6.2",
         "@commitlint/cli": "^11.0.0",
         "@commitlint/config-conventional": "^11.0.0",
         "chokidar": "^3.5.3",
         "commitizen": "^4.3.0",
         "cz-conventional-changelog": "^3.3.0",
         "deepmerge": "^4.2.2",
-        "eslint": "^8.54.0",
+        "eslint": "^8.56.0",
         "fs-extra": "^11.1.1",
         "lint-staged": "^13.2.0",
         "simple-git-hooks": "^2.9.0",
@@ -54,15 +55,15 @@
         "vue": "^3.3.4",
         "yargs-parser": "^21.1.1"
     },
+    "simple-git-hooks": {
+        "pre-commit": "lint-staged",
+        "commit-msg": "commitlint"
+    },
     "lint-staged": {
         "*.{js,jsx,vue,ts}": [
             "npm run lint"
         ]
     },
-    "simple-git-hooks": {
-        "pre-commit": "lint-staged",
-        "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
-    },
     "config": {
         "commitizen": {
             "path": "./node_modules/cz-conventional-changelog"