Merge branch 'client_sync' into v2

# Conflicts:
#	packages/ui/certd-client/.eslintrc.js
#	packages/ui/certd-client/LICENSE
#	packages/ui/certd-client/README.md
#	packages/ui/certd-client/package.json
#	packages/ui/certd-client/src/components/index.ts
#	packages/ui/certd-client/src/i18n/index.ts
#	packages/ui/certd-client/src/layout/layout-pass.vue
#	packages/ui/certd-client/src/main.ts
#	packages/ui/certd-client/src/router/index.ts
#	packages/ui/certd-client/src/router/source/framework.ts
#	packages/ui/certd-client/src/router/source/modules/crud.ts
#	packages/ui/certd-client/src/store/modules/settings.ts
#	packages/ui/certd-client/src/style/common.less
#	packages/ui/certd-client/src/views/crud/feature/header-group/index.vue
#	packages/ui/certd-client/src/views/crud/feature/search/crud.jsx
#	packages/ui/certd-client/src/views/crud/form/base/crud.jsx
#	packages/ui/certd-client/src/views/crud/form/base/index.vue
#	packages/ui/certd-client/src/views/framework/home/page-cover/index.vue
#	packages/ui/certd-client/tsconfig.json
#	packages/ui/certd-client/vite.config.ts

packages/ui/certd-client/src/router/source/modules/crud.ts

@@ -64,6 +64,12 @@ export const crudResources = [
             name: "BasisColumnsSet",
             path: "/crud/basis/columns-set",
             component: "/crud/basis/columns-set/index.vue"
+          },
+          {
+            title: "字段合并插件",
+            name: "BasisColumnMergePlugin",
+            path: "/crud/basis/column-merge-plugin",
+            component: "/crud/basis/column-merge-plugin/index.vue"
           }
         ]
       },
@@ -93,6 +99,25 @@ export const crudResources = [
             name: "DictPrototype",
             path: "/crud/dict/prototype",
             component: "/crud/dict/prototype/index.vue"
+          },
+          {
+            title: "页面间共享",
+            name: "DictShared",
+            path: "/crud/dict/shared",
+            children: [
+              {
+                title: "共享字典数据管理",
+                name: "DictSharedManager",
+                path: "/crud/dict/shared/manager",
+                component: "/crud/dict/shared/manager/index.vue"
+              },
+              {
+                title: "共享字典使用",
+                name: "DictSharedUse",
+                path: "/crud/dict/shared/use",
+                component: "/crud/dict/shared/use/index.vue"
+              }
+            ]
           }
         ]
       },
@@ -271,6 +296,12 @@ export const crudResources = [
             path: "/crud/form/layout",
             component: "/crud/form/layout/index.vue"
           },
+          {
+            title: "表单单列模式",
+            name: "FormSingleColumn",
+            path: "/crud/form/single-column",
+            component: "/crud/form/single-column/index.vue"
+          },
           {
             title: "表单校验",
             name: "FormValidation",