From 701a55a1889c95f4a7c73154b69475d7ed648f91 Mon Sep 17 00:00:00 2001
From: KDZhu <carlchu0113@gmail.com>
Date: Tue, 29 Oct 2024 11:03:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(version-diff):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=88=90=E4=BB=BB=E4=BD=95=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=97=B6=E7=89=88=E6=9C=AC=E5=AF=B9=E6=AF=94=E6=97=A0=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/version-diff/index.vue      |  8 +++-----
 src/dashboard-front/src/language/lang.ts       |  3 +++
 .../setting/comps/version-sideslider.vue       | 18 ++++++++++--------
 .../src/views/resource/setting/index.vue       | 10 +++++-----
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/dashboard-front/src/components/version-diff/index.vue b/src/dashboard-front/src/components/version-diff/index.vue
index f0f746c07..f57da2d48 100644
--- a/src/dashboard-front/src/components/version-diff/index.vue
+++ b/src/dashboard-front/src/components/version-diff/index.vue
@@ -1,5 +1,3 @@
-<!-- eslint-disable vue/no-v-html -->
-
 <template>
   <div class="ag-version-diff-box">
     <p class="summary-data">
@@ -116,7 +114,7 @@
               </bk-select>
               <strong class="title" v-else>
                 <template v-if="pageType === 'publishEnvironment'">
-                  当前版本（{{ sourceVersion.version }}）
+                  {{ t('当前版本（{version}）', { version: sourceVersion.version }) }}
                 </template>
                 <template v-else>
                   {{ sourceVersion.version }} {{ sourceVersion.comment ? `(${sourceVersion.comment})` : '' }}
@@ -124,7 +122,7 @@
               </strong>
             </template>
             <strong class="title" v-else>
-              暂无版本
+              {{ t('暂无版本') }}
             </strong>
           </div>
         </div>
@@ -158,7 +156,7 @@
             <strong class="title" v-else>
               <template v-if="pageType !== 'createVersion'">
                 <template v-if="pageType === 'publishEnvironment'">
-                  待发布（{{ targetVersion.version }}）
+                  {{ t('待发布（{version}）', { version: targetVersion.version }) }}
                 </template>
                 <template v-else>
                   {{ targetVersion.version }} {{ targetVersion.comment ? `(${targetVersion.comment})` : '' }}
diff --git a/src/dashboard-front/src/language/lang.ts b/src/dashboard-front/src/language/lang.ts
index 0af70afef..fd2d523e2 100644
--- a/src/dashboard-front/src/language/lang.ts
+++ b/src/dashboard-front/src/language/lang.ts
@@ -1368,6 +1368,7 @@ const lang: ILANG = {
   '停用成功': ['Successfully disabled'],
   '已绑定的环境：': ['Bound environments:'],
   '当前版本：': ['Current version:'],
+  '当前版本（{version}）': ['Current version({version})'],
   '已绑定的资源：': ['Bound resources:'],
   '请输入插件关键字，按Enter搜索': ['Please enter plugin keyword, press Enter to search'],
   '版本：': ['Version:'],
@@ -1663,6 +1664,8 @@ const lang: ILANG = {
   '上传失败': ['Upload failed'],
   '管理网关的应用列表': ['Related App Codes'],
   '允许列表中的应用使用 sdk 或者开放 API 调用网关接口，同步环境/资源以及发布版本': ['Apps allowed to use SDK or openAPI to call gateway APIs, sync environments/resources and publish versions'],
+  '暂无版本': ['No Version'],
+  '待发布（{version}）': ['To Be Published({version})'],
 
   // 变量的使用 $t('test', { vari1: 1, vari2: 2 })
   // // 变量的使用 $t('test', { vari1: 1, vari2: 2 })
diff --git a/src/dashboard-front/src/views/resource/setting/comps/version-sideslider.vue b/src/dashboard-front/src/views/resource/setting/comps/version-sideslider.vue
index bf4444e62..535510012 100644
--- a/src/dashboard-front/src/views/resource/setting/comps/version-sideslider.vue
+++ b/src/dashboard-front/src/views/resource/setting/comps/version-sideslider.vue
@@ -220,7 +220,7 @@ const isShow = ref(false);
 const dialogShow = ref(false);
 const versionList = ref<any>([]);
 const formRef = ref(null);
-const diffSourceId = ref('');
+const diffSourceId = ref<number | string>('');
 const diffTargetId = ref('');
 const loading = ref(false);
 const createError = ref<boolean>(false);
@@ -324,12 +324,14 @@ const showReleaseSideslider = () => {
 
 // 获取资源版本列表
 const getResourceVersions = async () => {
-  try {
-    const res = await getResourceVersionsList(apigwId.value, { offset: 0, limit: 999 });
-    versionList.value = res.results;
-    diffSourceId.value = versionList.value[0]?.id || '';
-  } catch (e) {
-    console.log(e);
+  const response = await getResourceVersionsList(apigwId.value, { offset: 0, limit: 999 });
+  versionList.value = response.results;
+  // 如果此网关还未生成版本，或这是网关的第一个版本（版本号为 1.0.0），则与空网关版本对比（版本ID为0）
+  if (!response.results.length || response.results[0]?.version === '1.0.0') {
+    diffTargetId.value = response.results[0]?.id || '';
+    diffSourceId.value = 0;
+  } else {
+    diffSourceId.value = response.results[0]?.id || '';
   }
 };
 
@@ -398,7 +400,7 @@ watch(
       stepsConfig.value.curStep = 1;
       formData.version = '';
       formData.comment = '';
-    };
+    }
   },
 );
 
diff --git a/src/dashboard-front/src/views/resource/setting/index.vue b/src/dashboard-front/src/views/resource/setting/index.vue
index e46c2a8b5..20faa5670 100644
--- a/src/dashboard-front/src/views/resource/setting/index.vue
+++ b/src/dashboard-front/src/views/resource/setting/index.vue
@@ -1074,13 +1074,13 @@ const handleOutBatch = () => {
 // 版本对比
 const handleShowDiff = async () => {
   try {
-    const res = await getResourceVersionsList(props.apigwId, { offset: 0, limit: 999 });
-    // 如果是此网关的第一个版本（版本号为 1.0.0），则与空网关版本对比（版本ID为0）
-    if (res.results[0]?.version === '1.0.0') {
-      diffTargetId.value = res.results[0].id;
+    const response = await getResourceVersionsList(props.apigwId, { offset: 0, limit: 999 });
+    // 如果此网关还未生成版本，或这是网关的第一个版本（版本号为 1.0.0），则与空网关版本对比（版本ID为0）
+    if (!response.results.length || response.results[0]?.version === '1.0.0') {
+      diffTargetId.value = response.results[0]?.id || '';
       diffSourceId.value = 0;
     } else {
-      diffSourceId.value = res.results[0]?.id || '';
+      diffSourceId.value = response.results[0]?.id || '';
     }
     diffSidesliderConf.width = window.innerWidth <= 1280 ? 1040 : 1280;
     diffSidesliderConf.isShow = true;