From 04bae459552b72c59aa10014c592d28e25c84112 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 10 Jul 2024 11:46:07 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=8F=82=E6=95=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/dto/ExecParameterSchemaDTO.java | 7 ++---- .../service/impl/ExecCommandServiceImpl.java | 3 --- .../src/components/view/exec-editor/const.ts | 1 - .../components/exec-template-exec-drawer.vue | 2 +- .../components/exec-template-form-drawer.vue | 23 +++++++++++-------- .../components/exec-job-form-drawer.vue | 21 ++++++++++------- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java index 1f00530d..ea148c2d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java @@ -20,16 +20,13 @@ import lombok.NoArgsConstructor; @Schema(name = "ExecParameterSchemaDTO", description = "命令执行参数 schema 对象") public class ExecParameterSchemaDTO { - @Schema(description = "参数名称") + @Schema(description = "参数名") private String name; @Schema(description = "参数描述") private String desc; - @Schema(description = "默认值") - private Object defaultValue; - - @Schema(description = "值") + @Schema(description = "参数值") private Object value; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java index f46e0686..f4e1ad37 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java @@ -335,9 +335,6 @@ public class ExecCommandServiceImpl implements ExecCommandService { .collect(Collectors.toMap(ExecParameterSchemaDTO::getName, s -> { Object value = s.getValue(); - if (value == null) { - value = s.getDefaultValue(); - } if (value == null) { value = Const.EMPTY; } diff --git a/orion-visor-ui/src/components/view/exec-editor/const.ts b/orion-visor-ui/src/components/view/exec-editor/const.ts index e4df3a67..778a22b3 100644 --- a/orion-visor-ui/src/components/view/exec-editor/const.ts +++ b/orion-visor-ui/src/components/view/exec-editor/const.ts @@ -11,7 +11,6 @@ export const templateSuffix = ' }}'; export interface TemplateParam { name?: string; desc?: string; - defaultValue?: any; value?: any; } diff --git a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue index b505071a..f5e149f7 100644 --- a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue +++ b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue @@ -180,7 +180,7 @@ parameterSchema.value = JSON.parse(record.parameterSchema); const params = {} as any; for (let param of parameterSchema.value) { - params[param.name as keyof any] = param.defaultValue; + params[param.name as keyof any] = param.value; } parameterFormModel.value = params; } else { diff --git a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue index 6f88c4d6..ccf7df84 100644 --- a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue +++ b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue @@ -9,7 +9,7 @@ :cancel-button-props="{ disabled: loading }" :on-before-ok="handlerOk" @cancel="handleClose"> - + 参数名 - - + @@ -329,6 +329,11 @@ } } + .form-container { + width: 100%; + min-height: 100%; + } + .parameter-form-item { user-select: none; margin-top: 4px; @@ -353,15 +358,15 @@ } &-name { - width: 29%; + width: 30%; } - &-default { - width: 29%; + &-value { + width: 40%; } &-description { - width: calc(39% - 44px); + width: calc(30% - 44px); } &-close { diff --git a/orion-visor-ui/src/views/job/exec-job/components/exec-job-form-drawer.vue b/orion-visor-ui/src/views/job/exec-job/components/exec-job-form-drawer.vue index 9ec93d69..0106658c 100644 --- a/orion-visor-ui/src/views/job/exec-job/components/exec-job-form-drawer.vue +++ b/orion-visor-ui/src/views/job/exec-job/components/exec-job-form-drawer.vue @@ -9,7 +9,7 @@ :cancel-button-props="{ disabled: loading }" :on-before-ok="handlerOk" @cancel="handleClose"> - + -