feat: 未命名版本配置项修改态支持diff (#199)

Author: Yuikill

ui/src/views/space/service/detail/config/components/version-diff/aside-menu/configs-kv.vue

@@ -58,7 +58,7 @@
   import { Search, RightShape } from 'bkui-vue/lib/icon';
   import { IConfigKvType } from '../../../../../../../../../types/config';
   import { ISingleLineKVDIffItem } from '../../../../../../../../../types/service';
-  import { getReleaseKvList } from '../../../../../../../../api/config';
+  import { getKvList, getReleaseKvList } from '../../../../../../../../api/config';
   import SearchInput from '../../../../../../../../components/search-input.vue';
   import tableEmpty from '../../../../../../../../components/table/table-empty.vue';
 
@@ -164,10 +164,20 @@
     if (typeof releaseId !== 'number') {
       return [];
     }
-    const res = await getReleaseKvList(bkBizId.value, Number(currentAppId), releaseId, {
-      start: 0,
-      all: true,
-    });
+    let res;
+    if (releaseId === 0) {
+      // 未命名版本
+      res = await getKvList(bkBizId.value, Number(currentAppId), {
+        start: 0,
+        all: true,
+      });
+    } else {
+      res = await getReleaseKvList(bkBizId.value, Number(currentAppId), releaseId, {
+        start: 0,
+        all: true,
+      });
+    }
+
     return res.details;
   };
 

ui/src/views/space/service/detail/config/config-list/config-table-list/tables/table-with-kv.vue

@@ -109,16 +109,26 @@
                 @click="handleEditOrView(row, index)">
                 {{ versionData.id === 0 ? t('编辑') : t('查看') }}
               </bk-button>
-              <bk-button
-                v-cursor="{ active: !hasEditServicePerm }"
-                v-if="row.kv_state === 'REVISE'"
-                :class="{ 'bk-text-with-no-perm': !hasEditServicePerm }"
-                :disabled="!hasEditServicePerm"
-                text
-                theme="primary"
-                @click="handleUnModify(row, index)">
-                {{ t('撤销') }}
-              </bk-button>
+              <template v-if="row.kv_state === 'REVISE'">
+                <bk-button
+                  v-if="row.kv_state === 'REVISE'"
+                  :disabled="!hasEditServicePerm"
+                  text
+                  theme="primary"
+                  @click="handleDiff(row)">
+                  {{ t('对比') }}
+                </bk-button>
+                <bk-button
+                  v-cursor="{ active: !hasEditServicePerm }"
+                  v-if="row.kv_state === 'REVISE'"
+                  :class="{ 'bk-text-with-no-perm': !hasEditServicePerm }"
+                  :disabled="!hasEditServicePerm"
+                  text
+                  theme="primary"
+                  @click="handleUnModify(row, index)">
+                  {{ t('撤销') }}
+                </bk-button>
+              </template>
               <bk-button
                 v-if="versionData.status.publish_status !== 'editing'"
                 text

ui/src/views/space/service/detail/config/config-list/config-table-list/tables/table-with-templates.vue

@@ -135,16 +135,25 @@
                                         @click="handleEditOpen(item, itemIndex)">
                                         {{ t('编辑') }}
                                       </bk-button>
-                                      <bk-button
-                                        v-if="item.file_state === 'REVISE'"
-                                        v-cursor="{ active: !hasEditServicePerm }"
-                                        text
-                                        theme="primary"
-                                        :class="{ 'bk-text-with-no-perm': !hasEditServicePerm }"
-                                        :disabled="!hasEditServicePerm"
-                                        @click="handleUnModify(item, itemIndex)">
-                                        {{ t('撤销') }}
-                                      </bk-button>
+                                      <template v-if="item.file_state === 'REVISE'">
+                                        <bk-button
+                                          v-cursor="{ active: !hasEditServicePerm }"
+                                          text
+                                          theme="primary"
+                                          :disabled="!hasEditServicePerm"
+                                          @click="handleConfigDiff(group.id, item)">
+                                          {{ t('对比') }}
+                                        </bk-button>
+                                        <bk-button
+                                          v-cursor="{ active: !hasEditServicePerm }"
+                                          text
+                                          theme="primary"
+                                          :class="{ 'bk-text-with-no-perm': !hasEditServicePerm }"
+                                          :disabled="!hasEditServicePerm"
+                                          @click="handleUnModify(item, itemIndex)">
+                                          {{ t('撤销') }}
+                                        </bk-button>
+                                      </template>
                                       <DownloadConfigBtn
                                         type="config"
                                         :bk-biz-id="props.bkBizId"
@@ -1137,7 +1146,7 @@
       width: 140px;
     }
     .operation {
-      width: 150px;
+      width: 200px;
     }
     .exception-tips {
       margin: 20px 0;