Merge branch 'client_sync' into v2

# Conflicts:
#	packages/ui/certd-client/CHANGELOG.md
#	packages/ui/certd-client/package.json
#	packages/ui/certd-client/src/api/tools.ts
#	packages/ui/certd-client/src/components/index.ts
#	packages/ui/certd-client/src/main.ts
#	packages/ui/certd-client/src/plugin/fast-crud/index.tsx
#	packages/ui/certd-client/src/plugin/index.ts
#	packages/ui/certd-client/src/router/source/framework.ts
#	packages/ui/certd-client/src/store/modules/page.ts
#	packages/ui/certd-client/src/style/common.less
#	packages/ui/certd-client/src/utils/util.env.ts
#	packages/ui/certd-client/src/views/crud/form/independent/index.vue
#	packages/ui/certd-client/src/views/framework/register/index.vue
#	packages/ui/certd-client/vite.config.ts

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

@@ -8,6 +8,15 @@ export const crudResources = [
       icon: "ion:apps-sharp"
     },
     children: [
+      {
+        title: "debug",
+        name: "debug",
+        path: "/crud/debug",
+        component: "/crud/debug/index.vue",
+        meta: {
+          isMenu: false
+        }
+      },
       {
         title: "基本特性",
         name: "basis",
@@ -18,11 +27,17 @@ export const crudResources = [
         },
         children: [
           {
-            title: "HelloWorld",
+            title: "FirstDemo",
             name: "FsCrudFirst",
             path: "/crud/basis/first",
             component: "/crud/basis/first/index.vue"
           },
+          {
+            title: "HelloWorld",
+            name: "FsCrudHelloWorld",
+            path: "/crud/basis/helloworld",
+            component: "/crud/basis/helloworld/index.vue"
+          },
           {
             title: "动态计算",
             name: "BasisCompute",
@@ -59,6 +74,12 @@ export const crudResources = [
             path: "/crud/basis/layout-custom",
             component: "/crud/basis/layout-custom/index.vue"
           },
+          {
+            title: "自定义组件",
+            name: "BasisCustom",
+            path: "/crud/basis/custom",
+            component: "/crud/basis/custom/index.vue"
+          },
           {
             title: "列设置",
             name: "BasisColumnsSet",
@@ -70,6 +91,12 @@ export const crudResources = [
             name: "BasisColumnMergePlugin",
             path: "/crud/basis/column-merge-plugin",
             component: "/crud/basis/column-merge-plugin/index.vue"
+          },
+          {
+            title: "ResetCrudOptions",
+            name: "BasisReset",
+            path: "/crud/basis/reset",
+            component: "/crud/basis/reset/index.vue"
           }
         ]
       },
@@ -165,6 +192,12 @@ export const crudResources = [
             path: "/crud/component/select",
             component: "/crud/component/select/index.vue"
           },
+          {
+            title: "表格选择(table-select)",
+            name: "ComponentTableSelect",
+            path: "/crud/component/table-select",
+            component: "/crud/component/table-select/index.vue"
+          },
           {
             title: "级联(cascader)",
             name: "ComponentCascader",
@@ -243,6 +276,12 @@ export const crudResources = [
             path: "/crud/component/uploader/qiniu",
             component: "/crud/component/uploader/qiniu/index.vue"
           },
+          {
+            title: "s3上传",
+            name: "ComponentUploaderS3",
+            path: "/crud/component/uploader/s3",
+            component: "/crud/component/uploader/s3/index.vue"
+          },
           {
             title: "富文本编辑器",
             name: "ComponentEditor",
@@ -260,6 +299,12 @@ export const crudResources = [
             name: "ComponentJson",
             path: "/crud/component/json",
             component: "/crud/component/json/index.vue"
+          },
+          {
+            title: "组件独立使用",
+            name: "ComponentIndependent",
+            path: "/crud/component/independent",
+            component: "/crud/component/independent/index.vue"
           }
         ]
       },
@@ -391,6 +436,18 @@ export const crudResources = [
             name: "FormNest",
             path: "/crud/form/nest",
             component: "/crud/form/nest/index.vue"
+          },
+          {
+            title: "字段组件render",
+            name: "FormRender",
+            path: "/crud/form/render",
+            component: "/crud/form/render/index.vue"
+          },
+          {
+            title: "查看表单使用单元格组件",
+            name: "FormView",
+            path: "/crud/form/view",
+            component: "/crud/form/view/index.vue"
           }
         ]
       },
@@ -444,6 +501,12 @@ export const crudResources = [
             path: "/crud/feature/header-group",
             component: "/crud/feature/header-group/index.vue"
           },
+          {
+            title: "自定义表头",
+            name: "FeatureHeader",
+            path: "/crud/feature/header",
+            component: "/crud/feature/header/index.vue"
+          },
           {
             title: "合并单元格",
             name: "FeatureMerge",
@@ -498,6 +561,12 @@ export const crudResources = [
             path: "/crud/feature/search-multi",
             component: "/crud/feature/search-multi/index.vue"
           },
+          {
+            title: "Tabs快捷查询",
+            name: "FeatureTabs",
+            path: "/crud/feature/tabs",
+            component: "/crud/feature/tabs/index.vue"
+          },
           {
             title: "字段排序",
             name: "FeatureColumnSort",
@@ -525,9 +594,21 @@ export const crudResources = [
           {
             title: "v-model",
             name: "FeatureVModel",
-            path: "/crud/feature/v-model",
+            path: "/crud/feature/local-v-model",
             component: "/crud/feature/local-v-model/index.vue"
           },
+          {
+            title: "导入",
+            name: "FeatureImport",
+            path: "/crud/feature/local-import",
+            component: "/crud/feature/local-import/index.vue"
+          },
+          {
+            title: "导出",
+            name: "FeatureExport",
+            path: "/crud/feature/export",
+            component: "/crud/feature/export/index.vue"
+          },
           {
             title: "自定义删除",
             name: "FeatureRemove",

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

@@ -0,0 +1,22 @@
+export const integrationResources = [
+  {
+    title: "集成",
+    name: "integration",
+    path: "/integration",
+    redirect: "/integration/bpmn",
+    meta: {
+      icon: "ion:apps-sharp"
+    },
+    children: [
+      {
+        title: "FsBpmn",
+        name: "FsBpmn",
+        path: "/integration/bpmn",
+        component: "/integration/bpmn/index.vue",
+        meta: {
+          icon: "ion:disc-outline"
+        }
+      }
+    ]
+  }
+];

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

@@ -0,0 +1,30 @@
+export const uiResources = [
+  {
+    title: "UI示例",
+    name: "ui",
+    path: "/ui",
+    redirect: "/ui/form",
+    meta: {
+      icon: "ion:apps-sharp"
+    },
+    children: [
+      {
+        title: "表单组件",
+        name: "UIForm",
+        path: "/ui/form",
+        redirect: "/ui/form/input",
+        meta: {
+          icon: "ion:disc-outline"
+        },
+        children: [
+          {
+            title: "input",
+            name: "UIFormInput",
+            path: "/ui/form/input",
+            component: "/ui/form/input/index.vue"
+          }
+        ]
+      }
+    ]
+  }
+];