From 06a45c9cf2b57066eeb583afac25357b43fc3a65 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 29 May 2024 00:41:57 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=89=A7=E8=A1=8C=E6=8A=A5=E9=94=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/about/change-log.md                              |  6 ++++--
 .../asset/service/impl/ExecCommandServiceImpl.java    | 11 ++++++++++-
 .../module/asset/service/impl/ExecJobServiceImpl.java |  9 +++++++--
 .../components/exec-command-panel-history.vue         |  4 +++-
 .../setting/display/terminal-display-block.vue        |  3 +++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/docs/about/change-log.md b/docs/about/change-log.md
index 7d551e4a..072d6e8e 100644
--- a/docs/about/change-log.md
+++ b/docs/about/change-log.md
@@ -16,9 +16,11 @@
 
 ### v2.0.3
 
-`2024-05-2` `release`
+`2024-05-29` `release`
 
-* 🐞 修复 抽屉 ui 显示错误
+* 🐞 修复 部分 ui 显示错误
+* 🐞 修复 计划任务编辑时报错
+* 🐞 修复 计划任务手动触发时报错
 * 🩰 修改 logo
 * 🔨 修改 docker 时区
 
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 f3f71900..cc717d1b 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
@@ -330,7 +330,16 @@ public class ExecCommandServiceImpl implements ExecCommandService {
         // 解析参数
         return schemaList.stream()
                 .collect(Collectors.toMap(ExecParameterSchemaDTO::getName,
-                        ExecParameterSchemaDTO::getValue,
+                        s -> {
+                            Object value = s.getValue();
+                            if (value == null) {
+                                value = s.getDefaultValue();
+                            }
+                            if (value == null) {
+                                value = Const.EMPTY;
+                            }
+                            return value;
+                        },
                         Functions.right()));
     }
 
diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecJobServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecJobServiceImpl.java
index 68b17d5b..7486b0fa 100644
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecJobServiceImpl.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecJobServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.orion.lang.define.wrapper.DataGrid;
 import com.orion.lang.utils.Booleans;
 import com.orion.lang.utils.Strings;
+import com.orion.lang.utils.collect.Lists;
 import com.orion.lang.utils.time.cron.Cron;
 import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs;
 import com.orion.visor.framework.common.constant.ErrorMessage;
@@ -163,8 +164,12 @@ public class ExecJobServiceImpl implements ExecJobService {
         List<Long> hostIdList = execJobHostService.getHostIdByJobId(id);
         vo.setHostIdList(hostIdList);
         // 查询主机列表
-        List<HostDO> hostList = hostDAO.selectBatchIds(hostIdList);
-        vo.setHostList(HostConvert.MAPPER.toList(hostList));
+        if (!Lists.isEmpty(hostIdList)) {
+            List<HostDO> hostList = hostDAO.selectBatchIds(hostIdList);
+            vo.setHostList(HostConvert.MAPPER.toList(hostList));
+        } else {
+            vo.setHostList(Lists.empty());
+        }
         return vo;
     }
 
diff --git a/orion-visor-ui/src/views/exec/exec-command/components/exec-command-panel-history.vue b/orion-visor-ui/src/views/exec/exec-command/components/exec-command-panel-history.vue
index ce29e346..6566c45a 100644
--- a/orion-visor-ui/src/views/exec/exec-command/components/exec-command-panel-history.vue
+++ b/orion-visor-ui/src/views/exec/exec-command/components/exec-command-panel-history.vue
@@ -142,8 +142,10 @@
     }
 
     &-desc {
-      color: var(--color-text-2);
       width: calc(100% - 36px);
+      height: 24px;
+      padding-top: 3px;
+      color: var(--color-text-2);
       overflow: hidden;
       white-space: nowrap;
       text-align: end;
diff --git a/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue b/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue
index 78a99e88..9195f7bc 100644
--- a/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue
@@ -25,6 +25,9 @@
               <template #option="{ data }">
                 <span :style="{ fontFamily: data.value }">{{ data.label }}</span>
               </template>
+              <template #label="{ data }">
+                <span :style="{ fontFamily: data.value }">{{ data.label }}</span>
+              </template>
             </a-select>
           </a-form-item>
           <!-- 字体大小 -->