diff --git a/packages/ui/certd-client/.npmrc b/packages/ui/certd-client/.npmrc new file mode 100644 index 00000000..beae5694 --- /dev/null +++ b/packages/ui/certd-client/.npmrc @@ -0,0 +1,2 @@ +link-workspace-packages=deep +prefer-workspace-packages=true diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index ff25d96c..75fc146e 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -30,6 +30,8 @@ "@fast-crud/fast-extends": "^1.21.0", "@fast-crud/ui-antdv4": "^1.21.0", "@fast-crud/ui-interface": "^1.21.0", + "@iconify/iconify": "^3.1.1", + "@iconify/json": "^2.2.98", "@iconify/vue": "^4.1.1", "@soerenmartius/vue3-clipboard": "^0.1.2", "ant-design-vue": "^4.1.2", diff --git a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx index 1c2d9a1d..40532bfa 100644 --- a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx +++ b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx @@ -1,7 +1,7 @@ import { request, requestForMock } from "/src/api/service"; import { ColumnCompositionProps, CrudOptions, FastCrud, PageQuery, PageRes, setLogger, TransformResProps, useColumns, UseCrudProps, UserPageQuery, useTypes, useUi } from "@fast-crud/fast-crud"; import "@fast-crud/fast-crud/dist/style.css"; -import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader, FsUploaderS3SignedUrlType } from "@fast-crud/fast-extends"; +import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader, FsUploaderAliossSTS, FsUploaderGetAuthContext, FsUploaderS3SignedUrlType } from "@fast-crud/fast-extends"; import "@fast-crud/fast-extends/dist/style.css"; import UiAntdv from "@fast-crud/ui-antdv4"; import _ from "lodash-es"; @@ -135,7 +135,7 @@ function install(app: App, options: any = {}) { region: "ap-guangzhou", secretId: "", // secretKey: "", // 传了secretKey 和secretId 代表使用本地签名模式(不安全,生产环境不推荐) - async getAuthorization(custom: any) { + async getAuthorization(context: FsUploaderGetAuthContext): Promise { // 不传secretKey代表使用临时签名模式,此时此参数必传(安全,生产环境推荐) const ret = request({ url: "http://www.docmirror.cn:7070/api/upload/cos/getAuthorization", @@ -147,6 +147,7 @@ function install(app: App, options: any = {}) { // TmpSecretKey, // XCosSecurityToken, // ExpiredTime, // SDK 在 ExpiredTime 时间前,不会再次调用 getAuthorization + // key //【可选】后台生成的文件key,如果不传则用前端自己生成的key // } return ret; }, diff --git a/packages/ui/certd-client/src/router/index.ts b/packages/ui/certd-client/src/router/index.ts index c57cf102..ed537241 100644 --- a/packages/ui/certd-client/src/router/index.ts +++ b/packages/ui/certd-client/src/router/index.ts @@ -18,7 +18,10 @@ const router = createRouter({ router.beforeEach(async (to, from, next) => { // 进度条 NProgress.start(); - + // 修复三级以上路由页面无法缓存的问题 + if (to.matched && to.matched.length > 2) { + to.matched.splice(1, to.matched.length - 2); + } // 验证当前路由所有的匹配中是否需要有登录验证的 if ( to.matched.some((r) => { diff --git a/packages/ui/certd-client/src/views/crud/form/new-page/crud.tsx b/packages/ui/certd-client/src/views/crud/form/new-page/crud.tsx index 32a97cdd..ab1058b7 100644 --- a/packages/ui/certd-client/src/views/crud/form/new-page/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/form/new-page/crud.tsx @@ -78,7 +78,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti }, content: { title: "详情", - type: ["editor-wang", "colspan"], + type: ["editor-wang5", "colspan"], form: { itemProps: { labelWidth: "0px" } } diff --git a/packages/ui/certd-client/src/views/framework/error/404.vue b/packages/ui/certd-client/src/views/framework/error/404.vue index 7191e656..395bfd0c 100644 --- a/packages/ui/certd-client/src/views/framework/error/404.vue +++ b/packages/ui/certd-client/src/views/framework/error/404.vue @@ -8,9 +8,11 @@