fix：修复上线版本对比问题

TencentBlueKing · Oct 27, 2023 · acba7d6 · acba7d6
1 parent 3d977c4
commit acba7d6
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 4 deletions.
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/modify-group-publish.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/modify-group-publish.vue
@@ -33,7 +33,9 @@
         </select-group>
         <template #footer>
           <section class="actions-wrapper">
-            <bk-button class="publish-btn" theme="primary" @click="isDiffSliderShow = true">对比并上线</bk-button>
+            <bk-button class="publish-btn" theme="primary" @click="handleDiffOrPublish">{{
+              versionList.length ? '对比并上线' : '上线版本'
+            }}</bk-button>
             <bk-button @click="handlePanelClose">取消</bk-button>
           </section>
         </template>
@@ -54,6 +56,7 @@
       :base-version-id="baseVersionId"
       :show-publish-btn="true"
       @publish="handleOpenPublishDialog"
+      :version-diff-list="versionList"
     />
   </section>
 </template>
@@ -71,6 +74,9 @@ import VersionLayout from '../config/components/version-layout.vue';
 import ConfirmDialog from './publish-version/confirm-dialog.vue';
 import SelectGroup from './publish-version/select-group/index.vue';
 import VersionDiff from '../config/components/version-diff/index.vue';
+import { useRoute } from 'vue-router';
+import { getConfigVersionList } from '../../../../../api/config';
+import { IConfigVersion } from '../../../../../../types/config';
 
 const { permissionQuery, showApplyPermDialog } = storeToRefs(useGlobalStore());
 const serviceStore = useServiceStore();
@@ -87,6 +93,10 @@ const props = defineProps<{
 
 const emit = defineEmits(['confirm']);
 
+const route = useRoute();
+const bkBizId = String(route.params.spaceId);
+const appId = Number(route.params.appId);
+const versionList = ref<IConfigVersion[]>([]);
 const isSelectGroupPanelOpen = ref(false);
 const isDiffSliderShow = ref(false);
 const isConfirmDialogShow = ref(false);
@@ -107,7 +117,27 @@ const permissionQueryResource = computed(() => [
   },
 ]);
 
+// 判断是否需要对比上线版本
+const handleDiffOrPublish = () => {
+  if (versionList.value.length) {
+    isDiffSliderShow.value = true;
+    return;
+  }
+  handleOpenPublishDialog();
+};
+
+// 获取所有对比基准版本
+const getVersionList = async () => {
+  try {
+    const res = await getConfigVersionList(bkBizId, appId, { start: 0, all: true });
+    versionList.value = res.data.details.filter((item: IConfigVersion) => item.id !== versionData.value.id && item.status.publish_status === 'partial_released');
+  } catch (e) {
+    console.error(e);
+  }
+};
+
 const handleBtnClick = () => {
+  getVersionList();
   if (props.hasPerm) {
     openSelectGroupPanel();
   } else {

diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue
@@ -31,7 +31,9 @@
         />
         <template #footer>
           <section class="actions-wrapper">
-            <bk-button class="publish-btn" theme="primary" @click="isDiffSliderShow = true">对比并上线</bk-button>
+            <bk-button class="publish-btn" theme="primary" @click="handleDiffOrPublish">{{
+              versionList.length ? '对比并上线' : '上线版本'
+            }}</bk-button>
             <bk-button @click="handlePanelClose">取消</bk-button>
           </section>
         </template>
@@ -52,6 +54,7 @@
       :base-version-id="baseVersionId"
       :show-publish-btn="true"
       @publish="handleOpenPublishDialog"
+      :version-diff-list="versionList"
     />
   </section>
 </template>
@@ -70,6 +73,9 @@ import VersionLayout from '../../config/components/version-layout.vue';
 import ConfirmDialog from './confirm-dialog.vue';
 import SelectGroup from './select-group/index.vue';
 import VersionDiff from '../../config/components/version-diff/index.vue';
+import { useRoute } from 'vue-router';
+import { getConfigVersionList } from '../../../../../../api/config';
+import { IConfigVersion } from '../../../../../../../types/config';
 
 const { permissionQuery, showApplyPermDialog } = storeToRefs(useGlobalStore());
 const serviceStore = useServiceStore();
@@ -86,6 +92,10 @@ const props = defineProps<{
 
 const emit = defineEmits(['confirm']);
 
+const route = useRoute();
+const bkBizId = String(route.params.spaceId);
+const appId = Number(route.params.appId);
+const versionList = ref<IConfigVersion[]>([]);
 const isSelectGroupPanelOpen = ref(false);
 const isDiffSliderShow = ref(false);
 const isConfirmDialogShow = ref(false);
@@ -104,7 +114,27 @@ const permissionQueryResource = computed(() => [
   },
 ]);
 
+// 判断是否需要对比上线版本
+const handleDiffOrPublish = () => {
+  if (versionList.value.length) {
+    isDiffSliderShow.value = true;
+    return;
+  }
+  handleOpenPublishDialog();
+};
+
+// 获取所有对比基准版本
+const getVersionList = async () => {
+  try {
+    const res = await getConfigVersionList(bkBizId, appId, { start: 0, all: true });
+    versionList.value = res.data.details.filter((item: IConfigVersion) => item.id !== versionData.value.id && item.status.publish_status === 'partial_released');
+  } catch (e) {
+    console.error(e);
+  }
+};
+
 const handleBtnClick = () => {
+  getVersionList();
   if (props.hasPerm) {
     isSelectGroupPanelOpen.value = true;
   } else {

diff --git a/...vices/bcs-bscp/ui/src/views/space/service/detail/config/components/version-diff/index.vue b/...vices/bcs-bscp/ui/src/views/space/service/detail/config/components/version-diff/index.vue
@@ -81,6 +81,7 @@ const props = defineProps<{
   unNamedVersionVariables?: IVariableEditParams[];
   baseVersionId?: number; // 默认选中的基准版本id
   selectedConfig?: IConfigDiffSelected; // 默认选中的配置文件id
+  versionDiffList?: IConfigVersion[];
 }>();
 
 const emits = defineEmits(['update:show', 'publish']);
@@ -112,7 +113,7 @@ watch(
     if (val) {
       getVersionList();
     }
-  }
+  },
 );
 
 watch(
@@ -122,13 +123,17 @@ watch(
       selectedBaseVersion.value = val;
     }
   },
-  { immediate: true }
+  { immediate: true },
 );
 
 // 获取所有对比基准版本
 const getVersionList = async () => {
   try {
     versionListLoading.value = true;
+    if (props.versionDiffList) {
+      versionList.value = props.versionDiffList;
+      return;
+    }
     const res = await getConfigVersionList(bkBizId, appId, { start: 0, all: true });
     versionList.value = res.data.details.filter((item: IConfigVersion) => item.id !== props.currentVersion.id);
   } catch (e) {