From a94bc8b797c173b156f298b91525ed4fdea8f0e7 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 12 May 2025 17:53:13 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E5=92=8C=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1417249477328896]自动化-自定义工具和组合工具支持版本号备注 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1417249477328896
---
 src/resources/assets/languages/term/en.json                 | 3 ++-
 src/resources/assets/languages/term/zh.json                 | 3 ++-
 .../pages/autoexec/detail/actionDetail/version-list.vue     | 2 ++
 src/views/pages/autoexec/detail/script-detail.vue           | 6 +++---
 .../autoexec/detail/scriptDetail/common/version-status.vue  | 2 ++
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index d1014a28..fc084a32 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -1343,7 +1343,8 @@
     "tagentupgrade": "Upgrade Package Management",
     "tagentupgradepkg": "Upgrade Package",
     "selecttagentupgradepkg": "Select an existing upgrade package",
-    "tagentuploadupgradepkg": "Upload upgrade package"
+    "tagentuploadupgradepkg": "Upload upgrade package",
+    "versionremarks": "Version Remarks"
   },
   "knowledge": {
     "document": "Document",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 438ae42a..01d8772f 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -1343,7 +1343,8 @@
     "tagentupgrade": "升级包管理",
     "tagentupgradepkg": "升级包",
     "selecttagentupgradepkg": "选择已有的升级包",
-    "tagentuploadupgradepkg": "上传升级包"
+    "tagentuploadupgradepkg": "上传升级包",
+    "versionremarks": "版本备注"
   },
   "knowledge": {
     "document": "文档",
diff --git a/src/views/pages/autoexec/detail/actionDetail/version-list.vue b/src/views/pages/autoexec/detail/actionDetail/version-list.vue
index 8d1fe24d..817e0892 100644
--- a/src/views/pages/autoexec/detail/actionDetail/version-list.vue
+++ b/src/views/pages/autoexec/detail/actionDetail/version-list.vue
@@ -23,6 +23,7 @@
                 <CommonStatus v-if="currentVersion.status" :statusValue="adjustStatusValue(currentVersion.status, currentVersion.isActive)" :statusName="getStatusText(currentVersion.status, currentVersion.isActive)"></CommonStatus>
               </div>
             </div>
+            <div v-if="currentVersion.name" class="title">{{ currentVersion.name }}</div>
             <div class="text-tip fz10">
               <span class="user overflow">
                 <UserCard v-bind="currentVersion.lcuVo" hideAvatar></UserCard>
@@ -76,6 +77,7 @@
                 <div class="version-content-top">
                   <div>{{ $t('page.versions') }}{{ row.version }}</div>
                 </div>
+                <div v-if="row.name" class="title">{{ row.name }}</div>
                 <div class="text-tip fz10">
                   <span class="user overflow">
                     <UserCard v-bind="row.lcuVo" hideAvatar></UserCard>
diff --git a/src/views/pages/autoexec/detail/script-detail.vue b/src/views/pages/autoexec/detail/script-detail.vue
index 99cdeb7d..6540b885 100644
--- a/src/views/pages/autoexec/detail/script-detail.vue
+++ b/src/views/pages/autoexec/detail/script-detail.vue
@@ -220,7 +220,7 @@ export default {
       formConfig: {
         version: {
           type: 'text',
-          label: this.$t('term.framework.pkgversion'),
+          label: this.$t('term.framework.versionremarks'),
           maxlength: 50,
           validateList: ['required']
         }
@@ -385,7 +385,7 @@ export default {
     save() {
       //编辑保存
       this.typeDialog = 'save';
-      this.$set(this.versionFormData, 'version', this.name + '_' + this.$utils.getCurrenttime('MMdd'));
+      this.$set(this.versionFormData, 'version', this.title);
       this.isShowVersionDialog = true;
     },
     async handleSave(item, isLeave) {
@@ -417,7 +417,7 @@ export default {
     },
     submit() {
       this.typeDialog = 'submit';
-      this.$set(this.versionFormData, 'version', this.name + '_' + this.$utils.getCurrenttime('MMdd'));
+      this.$set(this.versionFormData, 'version', this.title);
       this.isShowVersionDialog = true;
     },
     async submitData(item) {
diff --git a/src/views/pages/autoexec/detail/scriptDetail/common/version-status.vue b/src/views/pages/autoexec/detail/scriptDetail/common/version-status.vue
index f65bb897..4e89a2bb 100644
--- a/src/views/pages/autoexec/detail/scriptDetail/common/version-status.vue
+++ b/src/views/pages/autoexec/detail/scriptDetail/common/version-status.vue
@@ -23,6 +23,7 @@
                 <CommonStatus v-if="currentVersion.statusVo" :statusValue="currentVersion.statusVo.value" :statusName="currentVersion.statusVo.text"></CommonStatus>
               </div>
             </div>
+            <div v-if="currentVersion.title" class="title">{{ currentVersion.title }}</div>
             <div class="text-tip fz10">
               <span class="user overflow">
                 <UserCard v-bind="currentVersion.lcuVo" hideAvatar></UserCard>
@@ -76,6 +77,7 @@
                 <div class="version-content-top">
                   <div>{{ $t('page.versions') }}{{ row.version }}</div>
                 </div>
+                <div v-if="row.title" class="title">{{ row.title }}</div>
                 <div class="text-tip fz10">
                   <span class="user overflow">
                     <UserCard v-bind="row.lcuVo" hideAvatar></UserCard>
-- 
Gitee