Merge pull request #2577 from hLinx/hotfix_master

Hotfix master
TencentBlueKing · Nov 3, 2023 · ff3643d · ff3643d
2 parents aaa78a5 + 33a5036
commit ff3643d
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 33 deletions.
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -14,7 +14,7 @@
   "keywords": [],
   "license": "ISC",
   "dependencies": {
-    "@blueking/ip-selector": "0.0.1-beta.134",
+    "@blueking/ip-selector": "0.0.1-beta.136",
     "@blueking/paas-login": "0.0.11",
     "@blueking/user-selector": "1.0.7",
     "@vue/babel-preset-jsx": "1.4.0",

diff --git a/src/frontend/src/domain/service/ticket-manage.js b/src/frontend/src/domain/service/ticket-manage.js
@@ -38,6 +38,10 @@ export default {
         return data;
       });
   },
+  getBasicInfoList(params) {
+    return TicketSource.getBasicInfoList(params)
+      .then(({ data }) => data);
+  },
   fetchListWithRelate(params) {
     return TicketSource.getAll(params)
       .then(({ data }) => {

diff --git a/src/frontend/src/domain/source/ticket-manage.js b/src/frontend/src/domain/source/ticket-manage.js
@@ -39,6 +39,12 @@ class TicketManage extends ModuleBase {
       params,
     });
   }
+  // 获取凭证列表
+  getBasicInfoList(params = {}) {
+    return Request.get(`${this.path}/basicInfo/list`, {
+      params,
+    });
+  }
 
   // 新建凭证
   create(params = {}) {

diff --git a/src/frontend/src/i18n/local.js b/src/frontend/src/i18n/local.js
@@ -596,4 +596,5 @@ export default {
   '复制 IPv6': 'Copy IPv6',
   无该应用的访问权限: 'Do not have access permission for the current application.',
   '所有 IP': 'All IP',
+  '异常 IP': 'Copy abnormal',
 };
diff --git a/src/frontend/src/views/account-manage/index/index.vue b/src/frontend/src/views/account-manage/index/index.vue
@@ -98,7 +98,7 @@
         prop="categoryName"
         show-overflow-tooltip
         sortable="custom"
-        width="120" />
+        width="180" />
       <bk-table-column
         v-if="allRenderColumnMap.typeName"
         key="typeName"

diff --git a/src/frontend/src/views/executive-history/local.js b/src/frontend/src/views/executive-history/local.js
@@ -227,5 +227,6 @@ export default {
     '复制 IPv6': 'Copy IPv6',
     '没有可复制的 IPv4': 'IPv4 address not found',
     '没有可复制的 IPv6': 'IPv6 address not found',
+    'IP 与 IPv6 至少需保留一个': 'At least one of IP or IPv6 must be selected',
   },
 };
diff --git a/...rontend/src/views/executive-history/step-detail/components/ip-list/column-setting-new.vue b/...rontend/src/views/executive-history/step-detail/components/ip-list/column-setting-new.vue
@@ -26,14 +26,19 @@
 -->
 
 <template>
-  <div>
+  <bk-popover
+    ref="popoverRef"
+    placement="bottom-start"
+    theme="light"
+    trigger="click"
+    :width="450">
     <div
       id="stepDetailIpListSettingBtn"
       class="select-btn">
       <i class="bk-icon icon-cog-shape" />
     </div>
     <div
-      ref="settingRef"
+      slot="content"
       class="list-column-setting">
       <div class="select-body">
         <div class="title">
@@ -99,14 +104,11 @@
         </bk-button>
       </div>
     </div>
-  </div>
+  </bk-popover>
 </template>
 <script setup>
-  import Tippy from 'bk-magic-vue/lib/utils/tippy';
   import {
     computed,
-    onBeforeUnmount,
-    onMounted,
     ref,
   } from 'vue';
 
@@ -125,9 +127,7 @@
     'close',
   ]);
 
-  let settingPopover;
-
-  const settingRef = ref();
+  const popoverRef = ref();
   const tempAllShowColumn = ref([...props.value]);
 
   const isIndeterminate = computed(() => tempAllShowColumn.value.length !== props.columnList.length);
@@ -149,31 +149,12 @@
 
   const handleSubmitSetting = () => {
     emits('change', [...tempAllShowColumn.value]);
-    settingPopover.hide();
+    popoverRef.value.hideHandler();
   };
 
   const handleHideSetting = () => {
-    settingPopover.hide();
+    popoverRef.value.hideHandler();
   };
-
-  onMounted(() => {
-    settingPopover = Tippy(document.querySelector('#stepDetailIpListSettingBtn'), {
-      theme: 'light step-execution-history-ip-list-setting',
-      arrow: true,
-      interactive: true,
-      placement: 'bottom-start',
-      content: settingRef.value,
-      animation: 'slide-toggle',
-      trigger: 'click',
-      width: '450px',
-    });
-
-    onBeforeUnmount(() => {
-      settingPopover.destroy();
-      settingPopover.hide();
-      settingPopover = null;
-    });
-  });
 </script>
 <style lang="postcss" scoped>
   .select-btn{
@@ -223,3 +204,4 @@
     }
   }
 </style>
+
diff --git a/src/frontend/src/views/file-manage/file-source-list/components/opertion/index.vue b/src/frontend/src/views/file-manage/file-source-list/components/opertion/index.vue
@@ -410,7 +410,7 @@
        * @desc 获取身份凭证列表数据
        */
       fetchTicketList() {
-        return TicketManageService.fetchList()
+        return TicketManageService.getBasicInfoList()
           .then((res) => {
             this.fileFourceTicketList = Object.freeze(res.data);
           });