Merge branch 'dev-1.10.0-webank' into dev-1.10.0-bug-fix

WeDataSphere · Jan 7, 2025 · bd32e93 · bd32e93
2 parents bff0228 + cc1ae41
commit bd32e93
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.../org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala b/.../org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
@@ -688,7 +688,7 @@ class TaskExecutionServiceImpl
     if (null != executor) {
       executor.getTaskById(taskId)
     } else {
-      logger.error(s"Executor of taskId : $taskId is not cached.")
+      logger.info(s"Executor of taskId : $taskId is not cached.")
       null
     }
   }

diff --git a/...el-common/src/main/java/org/apache/linkis/manager/label/builder/CombinedLabelBuilder.java b/...el-common/src/main/java/org/apache/linkis/manager/label/builder/CombinedLabelBuilder.java
@@ -46,7 +46,7 @@ public boolean canBuild(String labelKey) {
 
   @Override
   public Label<?> build(String labelKey, @Nullable Object valueObj) throws LabelErrorException {
-    if (null != valueObj || valueObj instanceof List) {
+    if (null != valueObj && valueObj instanceof List) {
       try {
         List<Label<?>> labels = (List<Label<?>>) valueObj;
         return new CombinedLabelImpl(labels);

diff --git a/linkis-web/src/components/consoleComponent/term.vue b/linkis-web/src/components/consoleComponent/term.vue
@@ -65,6 +65,7 @@ export default {
   watch: {
     logs(newVal) {
       if (this.terminal && newVal) {
+        this.terminal.clear()
         this.terminal.write(newVal)
         setTimeout(() => {
           this.terminal.scrollToTop();