From ab6b053cb3e7ebff44369dd304e45a446ce22f40 Mon Sep 17 00:00:00 2001
From: jsonwan <jsonwan@tencent.com>
Date: Wed, 15 Feb 2023 16:42:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E4=BA=8C=E8=BF=9B=E5=88=B6?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=A8=A1=E6=9D=BF=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=8C=87=E5=AE=9Atrace=E6=98=AF=E5=90=A6=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E4=B8=8E=E4=B8=8A=E6=8A=A5=E6=AF=94=E4=BE=8B=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=20#1746?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 support-files/templates/#etc#job#job-common#application.yml | 6 ++++--
 support-files/templates/job.env                             | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/support-files/templates/#etc#job#job-common#application.yml b/support-files/templates/#etc#job#job-common#application.yml
index 569ee1d801..5f1031977d 100644
--- a/support-files/templates/#etc#job#job-common#application.yml
+++ b/support-files/templates/#etc#job#job-common#application.yml
@@ -11,13 +11,15 @@ spring:
   sleuth:
     otel:
       exporter:
-        enabled: __BK_JOB_TRACE_REPORT_ENABLED__
+        # 是否上报trace数据至蓝鲸监控APM
+        enabled: false
         otlp:
           endpoint: __BK_JOB_TRACE_REPORT_PUSH_URL__
       resource:
         bkDataToken: __BK_JOB_TRACE_REPORT_SECURE_KEY__
       config:
-        traceIdRatioBased: __BK_JOB_TRACE_REPORT_RATIO__
+        # trace数据上报比率，取值范围为0~1，根据作业平台与监控平台负载适当调节该比率
+        traceIdRatioBased: 0.1
 app:
   code: __BK_JOB_APP_CODE__
   secret: __BK_JOB_APP_SECRET__
diff --git a/support-files/templates/job.env b/support-files/templates/job.env
index 6e0d88a381..c608e244de 100644
--- a/support-files/templates/job.env
+++ b/support-files/templates/job.env
@@ -25,14 +25,10 @@ BK_JOB_SECURITY_USERNAME=job
 BK_JOB_SECURITY_PASSWORD=
 BK_JOB_ACTUATOR_USERNAME=job
 BK_JOB_ACTUATOR_PASSWORD=
-# 是否上报trace数据至蓝鲸监控APM
-BK_JOB_TRACE_REPORT_ENABLED=false
 # trace数据上报地址：监控平台中目标APM应用的PUSH URL
 BK_JOB_TRACE_REPORT_PUSH_URL=
 # trace数据上报密钥：监控平台中目标APM应用的SecureKey
 BK_JOB_TRACE_REPORT_SECURE_KEY=
-# trace数据上报比率，取值范围为0~1，根据作业平台与监控平台负载适当调节该比率
-BK_JOB_TRACE_REPORT_RATIO=0.1
 
 # 3.3.3新增 Job Encryption and decryption key，一旦确认不能修改
 BK_JOB_ENCRYPT_PASSWORD=

From 99feda50467d68386abc6a591b7a3f28c4cd6115 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Mon, 20 Feb 2023 17:10:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?hotfix:=20=E5=A4=8D=E5=88=B6IP=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E7=A1=AE=E8=AE=A4=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E4=BA=864=E4=B8=AA=EF=BC=8C=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E4=B8=8A=E7=B2=98=E8=B4=B4=E5=8F=AA=E6=9C=893?=
 =?UTF-8?q?=E4=B8=AA=EF=BC=8C=E5=9B=A0=E4=B8=BA1=E4=B8=AA=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89IPv4=EF=BC=88=E6=88=96=E8=80=85=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=83=BD=E9=80=89=E6=8B=A9=E5=A4=8D=E5=88=B6=20IPv6=EF=BC=89?=
 =?UTF-8?q?=20#1680?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../choose-ip/components/action-extend.vue    |   4 +-
 .../components/dropdown-menu/group.vue        |  90 +++++++++++++++
 .../components/dropdown-menu/index.vue        |  68 ++++++++++++
 .../components/dropdown-menu/item.vue         |  29 +++++
 .../task-step/common/execute-target/index.vue | 104 ++++++++++--------
 src/frontend/src/i18n/local.js                |  14 ++-
 6 files changed, 259 insertions(+), 50 deletions(-)
 create mode 100644 src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/group.vue
 create mode 100644 src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/index.vue
 create mode 100644 src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/item.vue

diff --git a/src/frontend/src/components/choose-ip/components/action-extend.vue b/src/frontend/src/components/choose-ip/components/action-extend.vue
index 56e92261d9..1e12b25e09 100644
--- a/src/frontend/src/components/choose-ip/components/action-extend.vue
+++ b/src/frontend/src/components/choose-ip/components/action-extend.vue
@@ -41,12 +41,12 @@
         <div
           class="action-item"
           @click="handleCopyAll">
-          {{ $t('复制全部IP') }}
+          {{ $t('复制所有 IP') }}
         </div>
         <div
           class="action-item"
           @click="handleCopyFail">
-          {{ $t('复制异常IP') }}
+          {{ $t('复制异常 IP') }}
         </div>
       </template>
       <slot />
diff --git a/src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/group.vue b/src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/group.vue
new file mode 100644
index 0000000000..f987653c35
--- /dev/null
+++ b/src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/group.vue
@@ -0,0 +1,90 @@
+<template>
+  <div>
+    <div
+      ref="handleRef"
+      class="dropdown-menu-group"
+      :class="{
+        active: isActive
+      }">
+      <slot />
+      <i class="toggle-flag bk-icon icon-angle-right" />
+    </div>
+    <div
+      ref="popRef"
+      style="padding: 5px 0; margin: -0.3rem -0.6rem;"
+      @click="handleClick">
+      <slot name="action" />
+    </div>
+  </div>
+</template>
+<script setup>
+  import Tippy from 'bk-magic-vue/lib/utils/tippy';
+  import {
+    onBeforeUnmount,
+    onMounted,
+    ref,
+  } from 'vue';
+
+  const handleRef = ref();
+  const popRef = ref();
+
+  const isActive = ref(false);
+
+  let tippyInstance;
+
+  const handleClick = () => {
+    tippyInstance.hide();
+  };
+
+  onMounted(() => {
+    tippyInstance = Tippy(handleRef.value, {
+      arrow: false,
+      allowHTML: false,
+      content: popRef.value,
+      placement: 'right-start',
+      trigger: 'mouseenter',
+      theme: 'light',
+      hideOnClick: false,
+      ignoreAttributes: true,
+      animateFill: false,
+      boundary: 'window',
+      interactive: true,
+      distance: 6,
+      onShow () {
+        isActive.value = true;
+      },
+      onHide () {
+        isActive.value = false;
+      },
+    });
+  });
+
+  onBeforeUnmount(() => {
+    if (tippyInstance) {
+      tippyInstance.hide();
+      tippyInstance.destroy();
+      tippyInstance = null;
+    }
+  });
+</script>
+<style lang="postcss">
+  .dropdown-menu-group {
+    display: flex;
+    height: 32px;
+    padding: 0 10px;
+    font-size: 12px;
+    color: #63656e;
+    align-items: center;
+    cursor: pointer;
+
+    &.active {
+      color: #3a84ff;
+      background: #f5f6fa;
+    }
+
+    .toggle-flag {
+      margin-left: auto;
+      font-size: 16px;
+    }
+  }
+</style>
diff --git a/src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/index.vue b/src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/index.vue
new file mode 100644
index 0000000000..bcab63ce2a
--- /dev/null
+++ b/src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/index.vue
@@ -0,0 +1,68 @@
+<template>
+  <div class="host-dropdown-menu">
+    <div
+      ref="handleRef"
+      @mouseenter="handleShow">
+      <slot />
+    </div>
+    <div
+      ref="popRef"
+      style="width: 98px; padding: 5px 0; margin: -0.3rem -0.6rem;">
+      <slot name="menu" />
+    </div>
+  </div>
+</template>
+<script setup>
+  import Tippy from 'bk-magic-vue/lib/utils/tippy';
+  import {
+    onBeforeUnmount,
+    onMounted,
+    ref,
+  } from 'vue';
+
+  const handleRef = ref();
+  const popRef = ref();
+
+  const isActive = ref(false);
+
+  let tippyInstance;
+
+  const handleShow = () => {
+    tippyInstance.show();
+  };
+
+  onMounted(() => {
+    tippyInstance = Tippy(handleRef.value, {
+      arrow: false,
+      allowHTML: false,
+      content: popRef.value,
+      placement: 'bottom-start',
+      trigger: 'manual',
+      theme: 'light',
+      hideOnClick: true,
+      animateFill: false,
+      interactive: true,
+      boundary: 'window',
+      distance: 6,
+      onShow () {
+        isActive.value = true;
+      },
+      onHide () {
+        isActive.value = false;
+      },
+    });
+  });
+
+  onBeforeUnmount(() => {
+    if (tippyInstance) {
+      tippyInstance.hide();
+      tippyInstance.destroy();
+      tippyInstance = null;
+    }
+  });
+</script>
+<style lang="postcss" scoped>
+  .host-dropdown-menu {
+    display: block;
+  }
+</style>
diff --git a/src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/item.vue b/src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/item.vue
new file mode 100644
index 0000000000..7b05d4fa2d
--- /dev/null
+++ b/src/frontend/src/components/task-step/common/execute-target/components/dropdown-menu/item.vue
@@ -0,0 +1,29 @@
+<template>
+  <div
+    class="dropdown-menu-item"
+    v-on="listeners">
+    <slot />
+  </div>
+</template>
+<script setup>
+  import { useListeners } from 'vue';
+
+  const listeners = useListeners();
+
+</script>
+<style lang="postcss" scoped>
+  .dropdown-menu-item {
+    display: flex;
+    height: 32px;
+    padding: 0 10px;
+    font-size: 12px;
+    color: #63656e;
+    align-items: center;
+    cursor: pointer;
+
+    &:hover {
+      color: #3a84ff;
+      background: #f5f6fa;
+    }
+  }
+</style>
diff --git a/src/frontend/src/components/task-step/common/execute-target/index.vue b/src/frontend/src/components/task-step/common/execute-target/index.vue
index 923a86c592..067e18a282 100644
--- a/src/frontend/src/components/task-step/common/execute-target/index.vue
+++ b/src/frontend/src/components/task-step/common/execute-target/index.vue
@@ -89,23 +89,40 @@
           </compose-form-item>
         </template>
         <template v-if="isShowServerAction">
-          <bk-dropdown-menu>
+          <dropdown-menu>
             <bk-button
-              slot="dropdown-trigger"
               class="mr10"
               type="primary">
-              <span>{{ $t('复制IP') }}</span>
+              <span>{{ $t('复制 IP') }}</span>
               <icon
                 class="action-flag"
                 type="down-small" />
             </bk-button>
-            <ul
-              slot="dropdown-content"
-              class="bk-dropdown-list">
-              <li><a @click="handleCopyAll">{{ $t('全部IP') }}</a></li>
-              <li><a @click="handleCopyFail">{{ $t('异常IP') }}</a></li>
-            </ul>
-          </bk-dropdown-menu>
+            <template slot="menu">
+              <dropdown-menu-group>
+                <span>{{ $t('所有 IP') }}</span>
+                <template slot="action">
+                  <dropdown-menu-item @click="handleCopyIPv4">
+                    IPv4
+                  </dropdown-menu-item>
+                  <dropdown-menu-item @click="handleCopyIPv6">
+                    IPv6
+                  </dropdown-menu-item>
+                </template>
+              </dropdown-menu-group>
+              <dropdown-menu-group>
+                <span>{{ $t('异常 IP') }}</span>
+                <template slot="action">
+                  <dropdown-menu-item @click="handleCopyAbnormalIPv4">
+                    IPv4
+                  </dropdown-menu-item>
+                  <dropdown-menu-item @click="handleCopyAbnormalIPv6">
+                    IPv6
+                  </dropdown-menu-item>
+                </template>
+              </dropdown-menu-group>
+            </template>
+          </dropdown-menu>
           <bk-button
             class="mr10"
             @click="handleClearAll">
@@ -117,6 +134,7 @@
             {{ $t('刷新状态') }}
           </bk-button>
         </template>
+
         <bk-input
           v-if="isShowHostSearchInput"
           class="ip-search"
@@ -125,16 +143,6 @@
           :value="searchText"
           @change="handleHostSearch" />
       </div>
-
-      <!-- <server-panel
-                    v-show="isShowServerPanel"
-                    ref="serverPanel"
-                    class="view-server-panel"
-                    :host-node-info="localHost"
-                    :search-mode="Boolean(searchText)"
-                    :search-data="searchData"
-                    editable
-                    @on-change="handleHostChange" /> -->
       <ip-selector
         ref="ipSelector"
         :show-dialog="isShowChooseIp"
@@ -144,10 +152,6 @@
         @change="handleHostChange"
         @close-dialog="handleCloseIpSelector" />
     </jb-form-item>
-    <!-- <choose-ip
-            v-model="isShowChooseIp"
-            :host-node-info="localHost"
-            @on-change="handleHostChange" /> -->
   </div>
 </template>
 <script>
@@ -159,15 +163,18 @@
 
   import ComposeFormItem from '@components/compose-form-item';
 
+  import DropdownMenu from './components/dropdown-menu';
+  import DropdownMenuGroup from './components/dropdown-menu/group';
+  import DropdownMenuItem from './components/dropdown-menu/item';
+
   import I18n from '@/i18n';
-  // import ChooseIp from '@components/choose-ip';
-  // import ServerPanel from '@components/choose-ip/server-panel';
 
   export default {
     components: {
       ComposeFormItem,
-      // ChooseIp,
-      // ServerPanel,
+      DropdownMenu,
+      DropdownMenuGroup,
+      DropdownMenuItem,
     },
     inheritAttrs: false,
     props: {
@@ -362,29 +369,41 @@
       handleCloseIpSelector () {
         this.isShowChooseIp = false;
       },
-      /**
-       * @desc 复制所有主机
-       */
-      handleCopyAll () {
-        const allIP = this.$refs.ipSelector.getHostIpList();
+      handleCopyIPv4 () {
+        const allIP = this.$refs.ipSelector.getHostIpv4List();
         if (allIP.length < 1) {
-          this.messageWarn(I18n.t('你还未选择主机'));
+          this.messageWarn(I18n.t('没有可复制的 IPv4'));
           return;
         }
 
         execCopy(allIP.join('\n'), `${I18n.t('复制成功')}（${allIP.length}${I18n.t('个IP')}）`);
       },
-      /**
-       * @desc 复制所有异常主机
-       */
-      handleCopyFail () {
-        const abnormalHostIpList = this.$refs.ipSelector.getAbnormalHostIpList();
-        if (abnormalHostIpList.length < 1) {
-          this.messageWarn(I18n.t('暂无异常主机'));
+      handleCopyIPv6 () {
+        const allIP = this.$refs.ipSelector.getHostIpv6List();
+        if (allIP.length < 1) {
+          this.messageWarn(I18n.t('没有可复制的 IPv6'));
+          return;
+        }
+
+        execCopy(allIP.join('\n'), `${I18n.t('复制成功')}（${allIP.length}${I18n.t('个IP')}）`);
+      },
+      handleCopyAbnormalIPv4 () {
+        const allIP = this.$refs.ipSelector.getAbnormalHostIpv4List();
+        if (allIP.length < 1) {
+          this.messageWarn(I18n.t('没有可复制的异常 IPv4'));
           return;
         }
 
-        execCopy(abnormalHostIpList.join('\n'), `${I18n.t('复制成功')}（${abnormalHostIpList.length}${I18n.t('个IP')}）`);
+        execCopy(allIP.join('\n'), `${I18n.t('复制成功')}（${allIP.length}${I18n.t('个IP')}）`);
+      },
+      handleCopyAbnormalIPv6 () {
+        const allIP = this.$refs.ipSelector.getAbnormalHostIpv6List();
+        if (allIP.length < 1) {
+          this.messageWarn(I18n.t('没有可复制的异常 IPv6'));
+          return;
+        }
+
+        execCopy(allIP.join('\n'), `${I18n.t('复制成功')}（${allIP.length}${I18n.t('个IP')}）`);
       },
       /**
        * @desc 复制所有主机数据
@@ -405,7 +424,6 @@
        */
       handleHostSearch (search) {
         this.searchText = _.trim(search);
-        // this.searchData = Object.freeze(this.$refs.serverPanel.getAllHost(search));
       },
     },
   };
diff --git a/src/frontend/src/i18n/local.js b/src/frontend/src/i18n/local.js
index 6e9f91b396..162c18f0bf 100644
--- a/src/frontend/src/i18n/local.js
+++ b/src/frontend/src/i18n/local.js
@@ -118,8 +118,8 @@ export default {
   你还未选择动态分组: 'No Dynamic Group selected.',
   你还未选择节点: 'No Topology node selected.',
   移除成功: 'Remove Successful',
-  复制全部IP: 'Copy All',
-  复制异常IP: 'Copy Abnormal',
+  '复制所有 IP': 'Copy All',
+  '复制异常 IP': 'Copy Abnormal',
   IP: 'IP(s)',
   'Agent 状态': 'AGENT STATUS',
   模块: 'Module',
@@ -171,9 +171,9 @@ export default {
   全局变量: 'Global Variable',
   手动添加: 'Custom',
   请选择主机列表变量: 'Choose <Host> variables',
-  复制IP: 'Copy IP',
-  全部IP: 'All IP',
-  异常IP: 'Abnormal IP',
+  '复制 IP': 'Copy IP',
+  '所有 IP': 'All IP',
+  '异常 IP': 'Abnormal IP',
   全部: 'All',
   筛选主机: 'Search hosts...',
   目标服务器必填: 'Hosts is required',
@@ -571,4 +571,8 @@ export default {
   复制: 'Copy',
   粘贴: 'Paste',
   快速执行详情: 'Quick Launch Details',
+  '没有可复制的 IPv4': 'IPv4 address({{host_count}} host) is empty',
+  '没有可复制的 IPv6': 'IPv6 address({{host_count}} host) is empty',
+  '没有可复制的异常 IPv4': 'IPv4 address of abnormal host({{host_count}} host) is empty',
+  '没有可复制的异常 IPv6': 'IPv6 address of abnormal host({{host_count}} host) is empty',
 };

From 4206909fff7a30d1636743b75ad9da4dce672986 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Mon, 20 Feb 2023 20:08:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?bugfix:=20ip=E9=80=89=E6=8B=A9=E5=99=A8tips?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=20#1750?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/package.json b/src/frontend/package.json
index 808da3a781..414865d3cf 100644
--- 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.64",
+    "@blueking/ip-selector": "0.0.1-beta.66",
     "@blueking/paas-login": "0.0.11",
     "@blueking/user-selector": "^1.0.7",
     "@vue/composition-api": "^1.5.0",