diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 7c72141c..fb0e1a86 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -63,6 +63,7 @@ "@rollup/plugin-commonjs": "^23.0.4", "@rollup/plugin-node-resolve": "^15.0.1", "@types/chai": "^4.3.4", + "@types/lodash-es": "^4.17.7", "@types/mocha": "^10.0.1", "@types/node": "^18.11.15", "@typescript-eslint/eslint-plugin": "^5.46.1", diff --git a/packages/ui/certd-client/src/plugin/fast-crud/index.ts b/packages/ui/certd-client/src/plugin/fast-crud/index.ts deleted file mode 100644 index c89c25fa..00000000 --- a/packages/ui/certd-client/src/plugin/fast-crud/index.ts +++ /dev/null @@ -1,225 +0,0 @@ -import { request, requestForMock } from "/src/api/service"; -import "/src/mock"; -import UiAntdv from "@fast-crud/ui-antdv"; -import { FastCrud, UseCrudProps, useTypes, setLogger } from "@fast-crud/fast-crud"; -import "@fast-crud/fast-crud/dist/style.css"; -import { FsExtendsUploader, FsExtendsEditor, FsExtendsJson, FsExtendsCopyable, FsExtendsTime } from "@fast-crud/fast-extends"; -import "@fast-crud/fast-extends/dist/style.css"; - -import { useCrudPermission } from "../permission"; - -function install(app, options: any = {}) { - app.use(UiAntdv); - //设置日志级别 - setLogger({ level: "debug" }); - app.use(FastCrud, { - i18n: options.i18n, - async dictRequest({ url }) { - if (url && url.startsWith("/mock")) { - //如果是crud开头的dict请求视为mock - return await requestForMock({ url, method: "post" }); - } - return await request({ url, method: "post" }); - }, - /** - * useCrud时会被执行 - * @param context，useCrud的参数 - */ - commonOptions(context: UseCrudProps) { - const crudBinding = context.expose?.crudBinding; - const opts = { - table: { - size: "small", - pagination: false, - onResizeColumn: (w, col) => { - crudBinding.value.table.columnsMap[col.key].width = w; - } - }, - rowHandle: { - buttons: { - view: { type: "link", text: null, icon: "ion:eye-outline" }, - edit: { type: "link", text: null, icon: "ion:create-outline" }, - remove: { type: "link", style: { color: "red" }, text: null, icon: "ion:trash-outline" } - }, - dropdown: { - more: { - type: "link" - } - } - }, - request: { - transformQuery: ({ page, form, sort }) => { - const limit = page.pageSize; - const currentPage = page.currentPage ?? 1; - const offset = limit * (currentPage - 1); - - sort = sort == null ? {} : sort; - - return { - page: { - limit, - offset - }, - query: form, - sort - }; - }, - transformRes: ({ res }) => { - const pageSize = res.limit; - let currentPage = res.offset / pageSize; - if (res.offset % pageSize === 0) { - currentPage++; - } - return { currentPage, pageSize, ...res }; - } - }, - form: { - display: "flex", - labelCol: { - //固定label宽度 - span: null, - style: { - width: "120px" - } - }, - wrapperCol: { - span: null - } - } - }; - - // 从 useCrud({permission}) 里获取permission参数，去设置各个按钮的权限 - const crudPermission = useCrudPermission({ permission: context.permission }); - return crudPermission.merge(opts); - } - }); - - // fast-extends里面的扩展组件均为异步组件，只有在使用时才会被加载，并不会影响首页加载速度 - //安装uploader 公共参数 - app.use(FsExtendsUploader, { - defaultType: "cos", - cos: { - domain: "https://d2p-demo-1251260344.cos.ap-guangzhou.myqcloud.com", - bucket: "d2p-demo-1251260344", - region: "ap-guangzhou", - secretId: "", // - secretKey: "", // 传了secretKey 和secretId 代表使用本地签名模式（不安全，生产环境不推荐） - getAuthorization(custom) { - // 不传secretKey代表使用临时签名模式,此时此参数必传（安全，生产环境推荐） - return request({ - url: "http://www.docmirror.cn:7070/api/upload/cos/getAuthorization", - method: "get" - }).then((ret) => { - // 返回结构如下 - // ret.data:{ - // TmpSecretId, - // TmpSecretKey, - // XCosSecurityToken, - // ExpiredTime, // SDK 在 ExpiredTime 时间前，不会再次调用 getAuthorization - // } - return ret; - }); - }, - successHandle(ret) { - // 上传完成后可以在此处处理结果，修改url什么的 - console.log("success handle:", ret); - return ret; - } - }, - alioss: { - domain: "https://d2p-demo.oss-cn-shenzhen.aliyuncs.com", - bucket: "d2p-demo", - region: "oss-cn-shenzhen", - accessKeyId: "", - accessKeySecret: "", - async getAuthorization(custom, context) { - // 不传accessKeySecret代表使用临时签名模式,此时此参数必传（安全，生产环境推荐） - const ret = await request({ - url: "http://www.docmirror.cn:7070/api/upload/alioss/getAuthorization", - method: "get" - }); - console.log("ret", ret); - return ret; - }, - sdkOpts: { - // sdk配置 - secure: true // 默认为非https上传,为了安全，设置为true - }, - successHandle(ret) { - // 上传完成后可以在此处处理结果，修改url什么的 - console.log("success handle:", ret); - return ret; - } - }, - qiniu: { - bucket: "d2p-demo", - async getToken(options) { - const ret = await request({ - url: "http://www.docmirror.cn:7070/api/upload/qiniu/getToken", - method: "get" - }); - return ret; // {token:xxx,expires:xxx} - }, - successHandle(ret) { - // 上传完成后可以在此处处理结果，修改url什么的 - console.log("success handle:", ret); - return ret; - }, - domain: "http://d2p.file.handsfree.work/" - }, - form: { - action: "http://www.docmirror.cn:7070/api/upload/form/upload", - name: "file", - withCredentials: false, - uploadRequest: async ({ action, file, onProgress }) => { - // @ts-ignore - const data = new FormData(); - data.append("file", file); - return await request({ - url: action, - method: "post", - headers: { - "Content-Type": "multipart/form-data" - }, - timeout: 60000, - data, - onUploadProgress: (p) => { - onProgress({ percent: Math.round((p.loaded / p.total) * 100) }); - } - }); - }, - successHandle(ret) { - // 上传完成后的结果处理， 此处应返回格式为{url:xxx} - return { - url: "http://www.docmirror.cn:7070" + ret, - key: ret.replace("/api/upload/form/download?key=", "") - }; - } - } - }); - - //安装editor - app.use(FsExtendsEditor, { - //编辑器的公共配置 - wangEditor: {} - }); - app.use(FsExtendsJson); - app.use(FsExtendsTime); - app.use(FsExtendsCopyable); - - const { addTypes } = useTypes(); - addTypes({ - time2: { - //如果与官方字段类型同名，将会覆盖官方的字段类型 - form: { component: { name: "a-date-picker" } }, - column: { component: { name: "fs-date-format", format: "YYYY-MM-DD" } }, - valueBuilder(context) { - console.log("time2,valueBuilder", context); - } - } - }); -} - -export default { - install -}; 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 95938b85..3ef75a58 100644 --- a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx +++ b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx @@ -1,17 +1,17 @@ import { request, requestForMock } from "/src/api/service"; -import "/src/mock"; -import { FastCrud, UseCrudProps, useTypes, setLogger, useColumns, ColumnCompositionProps, MergeColumnPlugin, CrudOptions } from "@fast-crud/fast-crud"; +import { ColumnCompositionProps, CrudOptions, FastCrud, setLogger, useColumns, UseCrudProps, useTypes } from "@fast-crud/fast-crud"; import "@fast-crud/fast-crud/dist/style.css"; -import { FsExtendsUploader, FsExtendsEditor, FsExtendsJson, FsExtendsCopyable, FsExtendsTime } from "@fast-crud/fast-extends"; +import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader } from "@fast-crud/fast-extends"; import "@fast-crud/fast-extends/dist/style.css"; import UiAntdv from "@fast-crud/ui-antdv"; -import _ from "lodash"; +import _ from "lodash-es"; import { useCrudPermission } from "../permission"; +import { App } from "vue"; -function install(app, options: any = {}) { +function install(app: App, options: any = {}) { app.use(UiAntdv); //设置日志级别 - setLogger({ level: "debug" }); + setLogger({ level: "info" }); app.use(FastCrud, { i18n: options.i18n, async dictRequest({ url }) { @@ -31,7 +31,7 @@ function install(app, options: any = {}) { table: { size: "small", pagination: false, - onResizeColumn: (w, col) => { + onResizeColumn: (w: any, col: any) => { crudBinding.value.table.columnsMap[col.key].width = w; } }, @@ -70,7 +70,7 @@ function install(app, options: any = {}) { if (res.offset % pageSize === 0) { currentPage++; } - return { currentPage, pageSize, ...res }; + return { currentPage, pageSize, total: res.total, records: res.records }; } }, form: { @@ -96,7 +96,9 @@ function install(app, options: any = {}) { // fast-extends里面的扩展组件均为异步组件，只有在使用时才会被加载，并不会影响首页加载速度 //安装uploader 公共参数 + app.use(FsExtendsUploader, { + // @ts-ignore defaultType: "cos", cos: { domain: "https://d2p-demo-1251260344.cos.ap-guangzhou.myqcloud.com", @@ -109,7 +111,7 @@ function install(app, options: any = {}) { return request({ url: "http://www.docmirror.cn:7070/api/upload/cos/getAuthorization", method: "get" - }).then((ret) => { + }).then((ret: any) => { // 返回结构如下 // ret.data:{ // TmpSecretId, @@ -132,7 +134,7 @@ function install(app, options: any = {}) { region: "oss-cn-shenzhen", accessKeyId: "", accessKeySecret: "", - async getAuthorization(custom, context) { + async getAuthorization(custom: any, context: any) { // 不传accessKeySecret代表使用临时签名模式,此时此参数必传（安全，生产环境推荐） const ret = await request({ url: "http://www.docmirror.cn:7070/api/upload/alioss/getAuthorization", @@ -183,7 +185,7 @@ function install(app, options: any = {}) { }, timeout: 60000, data, - onUploadProgress: (p) => { + onUploadProgress: (p: any) => { onProgress({ percent: Math.round((p.loaded / p.total) * 100) }); } }); @@ -214,7 +216,7 @@ function install(app, options: any = {}) { //如果与官方字段类型同名，将会覆盖官方的字段类型 form: { component: { name: "a-date-picker" } }, column: { component: { name: "fs-date-format", format: "YYYY-MM-DD" } }, - valueBuilder(context) { + valueBuilder(context: any) { console.log("time2,valueBuilder", context); } } diff --git a/packages/ui/certd-client/src/plugin/iconfont/index.ts b/packages/ui/certd-client/src/plugin/iconfont/index.ts index e1f5d7f5..0df41ba1 100644 --- a/packages/ui/certd-client/src/plugin/iconfont/index.ts +++ b/packages/ui/certd-client/src/plugin/iconfont/index.ts @@ -1 +1 @@ -import "./iconfont.js" +import "./iconfont.js"; diff --git a/packages/ui/certd-client/src/plugin/index.ts b/packages/ui/certd-client/src/plugin/index.ts index 4a73280d..91a48eb5 100644 --- a/packages/ui/certd-client/src/plugin/index.ts +++ b/packages/ui/certd-client/src/plugin/index.ts @@ -1,8 +1,9 @@ import "./iconify"; import "./iconfont"; -import FastCrud from "./fast-crud"; +import FastCrud from "./fast-crud/index"; import permission from "./permission"; -function install(app, options: any = {}) { +import { App } from "vue"; +function install(app: App, options: any = {}) { app.use(FastCrud, options); app.use(permission); } diff --git a/packages/ui/certd-client/src/style/common.less b/packages/ui/certd-client/src/style/common.less index 821757da..ad43d5b6 100644 --- a/packages/ui/certd-client/src/style/common.less +++ b/packages/ui/certd-client/src/style/common.less @@ -5,6 +5,8 @@ @import './scroll.less'; @import './transition.less'; @import './fix-windicss.less'; + + svg { vertical-align: baseline; } html, body { diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/status-show.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/status-show.vue index 162f3b6e..7d9e1cd3 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/status-show.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/status-show.vue @@ -10,8 +10,9 @@