From a2c43b50a6069ed48958fd142844a8568c2af452 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 24 Jul 2024 00:42:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=A0=B9=E6=8D=AEdns=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84dns=E6=8E=88=E6=9D=83=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes https://github.com/certd/certd/issues/97 --- .../ui/certd-client/src/use/use-refrence.ts | 19 +++++++++++++++++++ .../views/certd/pipeline/certd-form/crud.tsx | 5 ++++- .../certd-server/src/config/config.default.ts | 2 +- .../certd-server/src/config/config.preview.ts | 7 +++++++ .../src/config/config.production.ts | 7 +++++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 packages/ui/certd-client/src/use/use-refrence.ts diff --git a/packages/ui/certd-client/src/use/use-refrence.ts b/packages/ui/certd-client/src/use/use-refrence.ts new file mode 100644 index 000000000..a908ea62c --- /dev/null +++ b/packages/ui/certd-client/src/use/use-refrence.ts @@ -0,0 +1,19 @@ +import _ from "lodash-es"; +import { compute } from "@fast-crud/fast-crud"; + +export function useReference(form: any) { + if (!form.reference) { + return; + } + for (const reference of form.reference) { + debugger; + _.set( + form, + reference.dest, + compute((scope) => { + debugger; + return _.get(scope, reference.src); + }) + ); + } +} diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx index 5765df1c6..77e7f1051 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx @@ -1,5 +1,7 @@ import { compute, CreateCrudOptionsRet, dict } from "@fast-crud/fast-crud"; import { PluginGroup } from "@certd/pipeline"; +import { useReference } from "/@/use/use-refrence"; +import _ from "lodash-es"; export default function (certPluginGroup: PluginGroup, formWrapperRef: any): CreateCrudOptionsRet { const inputs: any = {}; @@ -10,10 +12,11 @@ export default function (certPluginGroup: PluginGroup, formWrapperRef: any): Cre inputs[inputKey].form.show = true; continue; } - const inputDefine = plugin.input[inputKey]; + const inputDefine = _.cloneDeep(plugin.input[inputKey]); if (!inputDefine.required && !inputDefine.maybeNeed) { continue; } + useReference(inputDefine); inputs[inputKey] = { title: inputDefine.title, form: { diff --git a/packages/ui/certd-server/src/config/config.default.ts b/packages/ui/certd-server/src/config/config.default.ts index 07cff24fa..1a843c67f 100644 --- a/packages/ui/certd-server/src/config/config.default.ts +++ b/packages/ui/certd-server/src/config/config.default.ts @@ -59,7 +59,7 @@ const development = { type: 'better-sqlite3', database: './data/db.sqlite', synchronize: false, // 如果第一次使用,不存在表,有同步的需求可以写 true - logging: true, + logging: false, // 配置实体模型 或者 entities: '/entity', entities: ['**/modules/*/entity/*.ts', '**/entity/*.js', '**/entity/*.d.ts', PipelineEntity, FlywayHistory, UserEntity], diff --git a/packages/ui/certd-server/src/config/config.preview.ts b/packages/ui/certd-server/src/config/config.preview.ts index 5b717e811..ebe309655 100644 --- a/packages/ui/certd-server/src/config/config.preview.ts +++ b/packages/ui/certd-server/src/config/config.preview.ts @@ -8,6 +8,13 @@ const preview = { preview: { enabled: true, }, + typeorm: { + dataSource: { + default: { + logging: false, + }, + }, + }, } as MidwayConfig; mergeConfig(preview, 'preview'); diff --git a/packages/ui/certd-server/src/config/config.production.ts b/packages/ui/certd-server/src/config/config.production.ts index 29f89aae8..41a3442a0 100644 --- a/packages/ui/certd-server/src/config/config.production.ts +++ b/packages/ui/certd-server/src/config/config.production.ts @@ -8,6 +8,13 @@ const production = { preview: { enabled: false, }, + typeorm: { + dataSource: { + default: { + logging: false, + }, + }, + }, } as MidwayConfig; mergeConfig(production, 'production');