diff --git a/package.json b/package.json index fc9dc70b..6d66fdea 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "prepublishOnly1": "npm run check && npm run before-build && lerna run build ", "before-build": "cd ./packages/core/acme-client && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"", "deploy1": "node --experimental-json-modules deploy.js ", - "check": "node --experimental-json-modules publish-check.js" + "check": "node --experimental-json-modules publish-check.js", "init": "lerna run build" }, "license": "AGPL-3.0", diff --git a/packages/ui/certd-client/src/style/common.less b/packages/ui/certd-client/src/style/common.less index bb17fdaa..a4b01ba2 100644 --- a/packages/ui/certd-client/src/style/common.less +++ b/packages/ui/certd-client/src/style/common.less @@ -48,20 +48,40 @@ h1, h2, h3, h4, h5, h6 { vertical-align: 0 !important; } +.flex-o{ + display: flex !important; + align-items: center; +} + .flex{ display: flex; align-items: center; } +.flex-1{ + flex: 1; +} + .ml-5{ margin-left:5px; } +.ml-20{ + margin-left:20px; +} +.ml-15{ + margin-left:15px; +} .mr-5{ margin-right: 5px; } - +.mr-20{ + margin-right: 20px; +} +.mr-15{ + margin-right: 15px; +} .mt-10{ margin-top:10px; } @@ -77,4 +97,14 @@ h1, h2, h3, h4, h5, h6 { } .p-10{ padding:10px; -} \ No newline at end of file +} + +.ellipsis { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.w-100{ + width: 100%; +} diff --git a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx index 4b8ada16..20ca5b13 100644 --- a/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/access/access-selector/access/crud.tsx @@ -64,9 +64,12 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat } }, rowHandle: { - width: "180px" + width: "130px" }, table: { + scroll: { + x: 800 + }, rowSelection: { type: "radio", selectedRowKeys: selectedRowKey, @@ -100,6 +103,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat type: ["text"], form: { rules: [{ required: true, message: "请填写名称" }] + }, + column: { + width: 200 } }, ...commonColumnsDefine diff --git a/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue b/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue index d44c3b82..b47d37ce 100644 --- a/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue +++ b/packages/ui/certd-client/src/views/certd/access/access-selector/index.vue @@ -7,7 +7,7 @@ 请选择 选择 - +
diff --git a/packages/ui/certd-client/src/views/certd/access/common.tsx b/packages/ui/certd-client/src/views/certd/access/common.tsx index 3a0b9ee2..2d3209eb 100644 --- a/packages/ui/certd-client/src/views/certd/access/common.tsx +++ b/packages/ui/certd-client/src/views/certd/access/common.tsx @@ -45,6 +45,9 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any) { search: { show: false }, + column: { + width: 120 + }, form: { component: { disabled: false diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx index 0f61a103..763ef6a7 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx @@ -136,6 +136,7 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp const files = await api.GetFiles(row.id); Modal.success({ title: "文件下载", + okText: "↑↑↑ 点击链接下载", content: () => { const children = []; for (const file of files) { diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue index 30598ba5..c3dc7087 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue @@ -65,7 +65,7 @@ vModel: 'value', options: [ { value: 0, label: '正常运行（证书申请任务请选择它）' }, - { value: 1, label: '成功后跳过（其他任务请选择它）' } + { value: 1, label: '成功后跳过（非证书任务请选择它）' } ] }, helper: '该任务运行成功一次之后下次运行是否跳过，保持默认即可', diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue index 531f292c..512509f2 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue @@ -82,8 +82,10 @@
- {{ task.title }} - + + {{ task.title }} + +
diff --git a/packages/ui/certd-client/tsconfig.json b/packages/ui/certd-client/tsconfig.json index e35bcdbd..36bc2aff 100644 --- a/packages/ui/certd-client/tsconfig.json +++ b/packages/ui/certd-client/tsconfig.json @@ -1,4 +1,5 @@ { + "compileOnSave": false, "compilerOptions": { // 这样就可以对 `this` 上的数据属性进行更严格的推断` "noImplicitAny": true, @@ -44,6 +45,7 @@ "tests/**/*.tsx" ], "exclude": [ - "node_modules" + "node_modules", + "vite.config.ts" ] } diff --git a/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts b/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts index b96a3fbc..974a2ffb 100644 --- a/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts +++ b/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts @@ -1,11 +1,4 @@ -import { - AbstractTaskPlugin, - IAccessService, - ILogger, - IsTaskPlugin, - RunStrategy, - TaskInput, -} from '@certd/pipeline'; +import { AbstractTaskPlugin, IAccessService, ILogger, IsTaskPlugin, RunStrategy, TaskInput } from '@certd/pipeline'; import { CertInfo, CertReader } from '@certd/plugin-cert'; @IsTaskPlugin({ @@ -69,7 +62,7 @@ export class DemoTestPlugin extends AbstractTaskPlugin { helper: 'demoAccess授权', component: { name: 'pi-access-selector', - type: 'plugins', + type: 'demo', //固定授权类型 }, rules: [{ required: true, message: '此项必填' }], }) diff --git a/plugin.md b/plugin.md index 5b59f9ad..9dcabb8f 100644 --- a/plugin.md +++ b/plugin.md @@ -7,9 +7,17 @@ # 设置环境变量 npm config set node_sqlite3_binary_host_mirror "https://registry.npmmirror.com/-/binary/sqlite3" +# 克隆代码 +git clone https://github.com/certd/certd + +#进入项目目录 cd certd + # 安装依赖 pnpm install + +# 初始化构建 +lerna run build ``` 启动 server: