From c877f24e252516824ed5c040236cc1f0b375f8ce Mon Sep 17 00:00:00 2001
From: cae545e5 <1876869218@qq.com>
Date: Fri, 25 Apr 2025 16:48:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=8A=82=E7=82=B9=E7=89=88=E6=9C=AC=E6=97=B6=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E7=9B=B8=E5=90=8C=E5=90=8D=E7=A7=B0=E7=9A=84=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/right/async-task-panel.vue            | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/workflow/workflow-editor/layout/right/async-task-panel.vue b/ui/src/components/workflow/workflow-editor/layout/right/async-task-panel.vue
index 6150b5359..af2b37130 100644
--- a/ui/src/components/workflow/workflow-editor/layout/right/async-task-panel.vue
+++ b/ui/src/components/workflow/workflow-editor/layout/right/async-task-panel.vue
@@ -97,7 +97,7 @@
             </div>
           </div>
           <jm-form-item
-            label="执行失败时"
+            :label="$t('asyncTaskPanel.failureMode')"
             class="node-item"
             prop="failureMode"
             :rules="nodeData.getFormRules().failureMode"
@@ -187,7 +187,19 @@ export default defineComponent({
     const versionLoading = ref<boolean>(false);
     const failureVisible = ref<boolean>(false);
     const tabFlag = ref<boolean>(true);
+    const mergeParams = (oldParams: any[], newParams: any[]) => {
+      return newParams.map(newItem => {
+        const oldItem = oldParams.find(
+          item => (item.ref === newItem.ref || item.name === newItem.name) && item.type === newItem.type,
+        ); // 同一节点的不同版本的某个输入参数项可能出现ref相同name不同或ref不同name相同
+        if (oldItem) {
+          return { ...newItem, value: oldItem.value };
+        }
+        return newItem;
+      });
+    };
     const changeVersion = async () => {
+      const oldInputs = [...form.value.inputs]; // 备份旧 inputs
       form.value.inputs.length = 0;
       form.value.outputs.length = 0;
       try {
@@ -204,6 +216,8 @@ export default defineComponent({
           const { inputParams: inputs, outputParams: outputs, description: versionDescription } = list;
           pushParams(form.value as AsyncTask, inputs, outputs, versionDescription);
         }
+        // 保留旧输入值,pushParams 后合并
+        form.value.inputs.splice(0, form.value.inputs.length, ...mergeParams(oldInputs, form.value.inputs));
       } catch (err) {
         proxy.$throw(err, proxy);
       } finally {
-- 
Gitee


From 1cc932a524106a03626163f70d4ccfa704179359 Mon Sep 17 00:00:00 2001
From: cae545e5 <1876869218@qq.com>
Date: Fri, 25 Apr 2025 16:51:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E9=81=97=E6=BC=8F?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow-editor/layout/right/form/cache-selector.vue  | 2 +-
 .../workflow/workflow-editor/model/data/node/base-node.ts | 3 ++-
 ui/src/locales/index.ts                                   | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/workflow/workflow-editor/layout/right/form/cache-selector.vue b/ui/src/components/workflow/workflow-editor/layout/right/form/cache-selector.vue
index 1683005f6..2c35e6ab2 100644
--- a/ui/src/components/workflow/workflow-editor/layout/right/form/cache-selector.vue
+++ b/ui/src/components/workflow/workflow-editor/layout/right/form/cache-selector.vue
@@ -2,7 +2,7 @@
   <div class="cache-selector">
     <div class="selector-container">
       <jm-form-item :prop="`${formModelName}.${index}.name`" :rules="rules.name">
-        <jm-select v-model="cacheVal" @change="changeCache">
+        <jm-select v-model="cacheVal" @change="changeCache" :placeholder="$t('cacheSelector.selectPlaceholder')">
           <template #empty>
             <div
               style="
diff --git a/ui/src/components/workflow/workflow-editor/model/data/node/base-node.ts b/ui/src/components/workflow/workflow-editor/model/data/node/base-node.ts
index 8cf9fa4ac..bbdd9bfb5 100644
--- a/ui/src/components/workflow/workflow-editor/model/data/node/base-node.ts
+++ b/ui/src/components/workflow/workflow-editor/model/data/node/base-node.ts
@@ -2,6 +2,7 @@ import Schema, { Value } from 'async-validator';
 import { CustomRule, IWorkflowNode } from '../common';
 import { NodeTypeEnum } from '../enumeration';
 import { ISelectableParam } from '../../../../workflow-expression-editor/model/data';
+import { globalT as t } from '@/utils/i18n';
 
 export abstract class BaseNode implements IWorkflowNode {
   private readonly ref: string;
@@ -48,7 +49,7 @@ export abstract class BaseNode implements IWorkflowNode {
       name: [
         {
           required: true,
-          message: '节点名称不能为空',
+          message: t('baseNode.nameEmpty'),
           trigger: 'blur',
         },
       ],
diff --git a/ui/src/locales/index.ts b/ui/src/locales/index.ts
index 42af6907e..08c4b017a 100644
--- a/ui/src/locales/index.ts
+++ b/ui/src/locales/index.ts
@@ -573,6 +573,7 @@ const messages = {
     cacheSelector: {
       empty: '暂无缓存，请先到顶部缓存模块添加缓存',
       placeholder: '请输入缓存要挂载的目录,以/开头',
+      selectPlaceholder: '请选择'
     },
     shellEnv: {
       name: '变量名称',
@@ -744,6 +745,9 @@ const messages = {
       copyFailed: '复制失败',
       cause: '原因：',
     },
+    baseNode: {
+      nameEmpty: '节点名称不能为空',
+    },
   },
 
   en: {
@@ -1316,6 +1320,7 @@ const messages = {
     cacheSelector: {
       empty: 'There is no cache at the moment, please go to the top of the cache module to add a cache',
       placeholder: 'Mount directory, start with /',
+      selectPlaceholder: 'Select'
     },
     shellEnv: {
       name: 'Variable name',
@@ -1488,6 +1493,9 @@ const messages = {
       copyFailed: 'copy failed',
       cause: 'cause: ',
     },
+    baseNode: {
+      nameEmpty: 'Node name cannot be empty',
+    },
   },
 };
 
-- 
Gitee