From 6cfa3370c275fb823870b332cc832c39004ddac3 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Fri, 21 Jul 2023 17:59:09 +0800
Subject: [PATCH 1/4] =?UTF-8?q?perf:=20=E6=AD=A5=E9=AA=A4=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E8=AF=A6=E6=83=85=E9=A1=B5agent=20id=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96=20#2271?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/package.json                     | 124 +++++++++---------
 .../step-detail/components/ip-list/index.vue  |   2 +-
 .../components/ip-list/list-body.vue          |   4 +-
 .../components/ip-list/list-head.vue          |   6 +-
 4 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/src/frontend/package.json b/src/frontend/package.json
index 60d8e6ccce..1fac4a17db 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -16,25 +16,25 @@
   "dependencies": {
     "@blueking/ip-selector": "0.0.1-beta.124",
     "@blueking/paas-login": "0.0.11",
-    "@blueking/user-selector": "^1.0.7",
-    "@vue/composition-api": "^1.5.0",
-    "ace-builds": "1.23.1",
+    "@blueking/user-selector": "1.0.7",
+    "@vue/composition-api": "1.5.0",
+    "ace-builds": "1.23.4",
     "axios": "1.4.0",
     "bk-magic-vue": "2.5.4-beta.6",
     "core-js": "3.31.1",
-    "cron-parser-custom": "^2.13.0",
-    "diff": "^5.0.0",
-    "diff2html": "^3.4.4",
-    "echarts": "^5.4.2",
-    "highlight.js": "^11.4.0",
-    "html2canvas": "^1.4.0",
-    "js-base64": "^3.6.1",
-    "js-cookie": "^3.0.1",
-    "lodash": "^4.17.21",
-    "marked": "5.1.0",
+    "cron-parser-custom": "2.13.0",
+    "diff": "5.0.0",
+    "diff2html": "3.4.4",
+    "echarts": "5.4.2",
+    "highlight.js": "11.4.0",
+    "html2canvas": "1.4.0",
+    "js-base64": "3.6.1",
+    "js-cookie": "3.0.1",
+    "lodash": "4.17.21",
+    "marked": "5.1.1",
     "marked-gfm-heading-id": "3.0.4",
     "marked-mangle": "1.1.0",
-    "tippy.js": "^6.3.7",
+    "tippy.js": "6.3.7",
     "vue": "2.7.8",
     "vue-content-loader": "0.2.2",
     "vue-i18n": "8.14.1",
@@ -45,74 +45,74 @@
     "xss": "1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "7.22.8",
-    "@babel/eslint-parser": "^7.16.3",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-syntax-jsx": "^7.12.13",
+    "@babel/core": "7.22.9",
+    "@babel/eslint-parser": "7.16.3",
+    "@babel/plugin-proposal-class-properties": "7.16.7",
+    "@babel/plugin-proposal-export-namespace-from": "7.16.7",
+    "@babel/plugin-syntax-dynamic-import": "7.8.3",
+    "@babel/plugin-syntax-jsx": "7.12.13",
     "@babel/plugin-transform-modules-commonjs": "7.22.5",
-    "@babel/plugin-transform-runtime": "^7.13.15",
-    "@babel/preset-env": "^7.13.15",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-    "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-    "@vue/babel-sugar-inject-h": "^1.4.0",
-    "@vue/eslint-config-standard": "^8.0.1",
+    "@babel/plugin-transform-runtime": "7.13.15",
+    "@babel/preset-env": "7.13.15",
+    "@vue/babel-helper-vue-jsx-merge-props": "1.4.0",
+    "@vue/babel-plugin-transform-vue-jsx": "1.4.0",
+    "@vue/babel-sugar-inject-h": "1.4.0",
+    "@vue/eslint-config-standard": "8.0.1",
     "ajv": "8.12.0",
-    "babel-loader": "9.1.2",
-    "babel-plugin-import-bk-magic-vue": "^2.1.10",
-    "babel-plugin-lodash": "^3.3.4",
-    "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.5.1",
+    "babel-loader": "9.1.3",
+    "babel-plugin-import-bk-magic-vue": "2.1.10",
+    "babel-plugin-lodash": "3.3.4",
+    "copy-webpack-plugin": "11.0.0",
+    "css-loader": "6.5.1",
     "css-minimizer-webpack-plugin": "5.0.1",
-    "dotenv": "^16.0.0",
-    "eslint": "^8.14.0",
-    "eslint-config-standard": "^17.0.0",
+    "dotenv": "16.0.0",
+    "eslint": "8.14.0",
+    "eslint-config-standard": "17.0.0",
     "eslint-config-tencent": "1.0.4",
-    "eslint-plugin-html": "^7.1.0",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-html": "7.1.0",
+    "eslint-plugin-import": "2.25.4",
     "eslint-plugin-n": "16.0.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "6.0.0",
     "eslint-plugin-simple-import-sort": "10.0.0",
     "eslint-plugin-vue": "9.15.1",
     "eslint-webpack-plugin": "4.0.1",
-    "figlet": "^1.5.0",
-    "html-loader": "^4.1.0",
-    "html-webpack-plugin": "^5.5.0",
-    "lodash-webpack-plugin": "^0.11.6",
-    "markdown-loader": "^8.0.0",
-    "mini-css-extract-plugin": "^2.6.0",
+    "figlet": "1.5.0",
+    "html-loader": "4.1.0",
+    "html-webpack-plugin": "5.5.0",
+    "lodash-webpack-plugin": "0.11.6",
+    "markdown-loader": "8.0.0",
+    "mini-css-extract-plugin": "2.6.0",
     "node-xlsx": "0.23.0",
-    "postcss": "^8.4.13",
+    "postcss": "8.4.13",
     "postcss-advanced-variables": "~3.0.0",
-    "postcss-atroot": "^0.2.3",
-    "postcss-extend-rule": "^4.0.0",
-    "postcss-html": "^1.2.0",
-    "postcss-import": "^15.0.0",
+    "postcss-atroot": "0.2.3",
+    "postcss-extend-rule": "4.0.0",
+    "postcss-html": "1.2.0",
+    "postcss-import": "15.0.0",
     "postcss-import-webpack-resolver": "~1.0.1",
-    "postcss-loader": "^7.0.1",
-    "postcss-mixins": "^9.0.2",
+    "postcss-loader": "7.0.1",
+    "postcss-mixins": "9.0.2",
     "postcss-nested": "6.0.1",
     "postcss-preset-env": "9.0.0",
-    "postcss-property-lookup": "^3.0.0",
-    "postcss-syntax": "^0.36.2",
-    "postcss-url": "^10.1.3",
-    "speed-measure-webpack-plugin": "^1.5.0",
-    "style-loader": "^3.3.1",
-    "stylelint": "15.10.1",
-    "stylelint-config-standard": "33.0.0",
+    "postcss-property-lookup": "3.0.0",
+    "postcss-syntax": "0.36.2",
+    "postcss-url": "10.1.3",
+    "speed-measure-webpack-plugin": "1.5.0",
+    "style-loader": "3.3.1",
+    "stylelint": "15.10.2",
+    "stylelint-config-standard": "34.0.0",
     "stylelint-order": "6.0.3",
     "stylelint-scss": "5.0.1",
     "stylelint-webpack-plugin": "4.1.1",
-    "terser-webpack-plugin": "^5.2.5",
+    "terser-webpack-plugin": "5.2.5",
     "thread-loader": "4.0.2",
     "vue-loader": "15.10.0",
     "vue-style-loader": "4.1.3",
-    "webpack": "5.88.1",
+    "webpack": "5.88.2",
     "webpack-cli": "5.1.4",
-    "webpack-dev-server": "^4.9.0",
-    "webpack-merge": "^5.2.0"
+    "webpack-dev-server": "4.9.0",
+    "webpack-merge": "5.2.0"
   },
   "engines": {
     "node": ">= 16.6.0",
diff --git a/src/frontend/src/views/executive-history/step-detail/components/ip-list/index.vue b/src/frontend/src/views/executive-history/step-detail/components/ip-list/index.vue
index 983db0fa81..653c626393 100644
--- a/src/frontend/src/views/executive-history/step-detail/components/ip-list/index.vue
+++ b/src/frontend/src/views/executive-history/step-detail/components/ip-list/index.vue
@@ -145,7 +145,7 @@
     {
       label: 'Agent ID',
       name: 'agentId',
-      width: 140,
+      width: 240,
       checked: true,
     },
     {
diff --git a/src/frontend/src/views/executive-history/step-detail/components/ip-list/list-body.vue b/src/frontend/src/views/executive-history/step-detail/components/ip-list/list-body.vue
index dddfc12573..0cbdfdd572 100644
--- a/src/frontend/src/views/executive-history/step-detail/components/ip-list/list-body.vue
+++ b/src/frontend/src/views/executive-history/step-detail/components/ip-list/list-body.vue
@@ -53,7 +53,9 @@
           v-for="(showKey, colIndex) in showColumns"
           :key="showKey"
           :class="colIndex === 0 && item.result">
-          <div class="cell-text">
+          <div
+            v-bk-overflow-tips="item[showKey]"
+            class="cell-text">
             <template v-if="showKey === 'exitCode'">
               {{ item[showKey] }}
             </template>
diff --git a/src/frontend/src/views/executive-history/step-detail/components/ip-list/list-head.vue b/src/frontend/src/views/executive-history/step-detail/components/ip-list/list-head.vue
index a2e5dcdd00..af53e1ea61 100644
--- a/src/frontend/src/views/executive-history/step-detail/components/ip-list/list-head.vue
+++ b/src/frontend/src/views/executive-history/step-detail/components/ip-list/list-head.vue
@@ -51,7 +51,9 @@
                 sort: item.orderField,
               }"
               @click="handleSort(item)">
-              <span>{{ item.label }}</span>
+              <span style="display: inline-block; height: 20px; overflow: hidden; line-height: 20px; vertical-align: middle;">
+                {{ item.label }}
+              </span>
               <span
                 v-if="item.name === 'ipv4'"
                 v-bk-tooltips="$t('history.复制 IP')"
@@ -112,7 +114,7 @@
        * @returns { undefined }
        */
       handleSort(payload) {
-        if (payload.label === 'IP') {
+        if (payload.label === 'IP' || !payload.orderField) {
           return;
         }
         this.$emit('on-sort', payload);

From 87a98de5551db605f9940d4a67172c06a292ab5e Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Fri, 4 Aug 2023 16:51:41 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feature:=20=E5=9B=BD=E5=AF=86=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E4=B8=8B=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA=20#2237?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-step/script/strategy/script-param.vue     | 14 ++++++++++++--
 .../cron-job/list/components/operation/index.vue   |  3 ---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/frontend/src/components/task-step/script/strategy/script-param.vue b/src/frontend/src/components/task-step/script/strategy/script-param.vue
index a213483ce8..c141a940fb 100644
--- a/src/frontend/src/components/task-step/script/strategy/script-param.vue
+++ b/src/frontend/src/components/task-step/script/strategy/script-param.vue
@@ -27,7 +27,11 @@
 
 <template>
   <jb-form-item :label="$t('脚本参数')">
-    <div class="muti-item">
+    <div
+      class="execute-script-params-block"
+      :class="{
+        'is-secure-field': formData[secureField]
+      }">
       <jb-input
         :maxlength="5000"
         :placeholder="$t('脚本执行时传入的参数，同脚本在终端执行时的传参格式，如：./test.sh xxxx xxx xxx')"
@@ -82,10 +86,16 @@
   };
 </script>
 <style lang='postcss'>
-  .muti-item {
+  .execute-script-params-block {
     display: flex;
     width: 100%;
 
+    &.is-secure-field{
+      .control-icon{
+        display: none;
+      }
+    }
+
     .jb-input {
       flex: 1;
     }
diff --git a/src/frontend/src/views/cron-job/list/components/operation/index.vue b/src/frontend/src/views/cron-job/list/components/operation/index.vue
index 776efcd171..bfcc168502 100644
--- a/src/frontend/src/views/cron-job/list/components/operation/index.vue
+++ b/src/frontend/src/views/cron-job/list/components/operation/index.vue
@@ -190,12 +190,9 @@
   import TimeTaskService from '@service/time-task';
 
   import {
-    checkIllegalHostFromVariableStep,
     checkIllegalHostFromVariableTargetValue,
     findUsedVariable,
     generatorDefaultCronTime,
-    removeIllegalHostFromStep,
-    removeIllegalHostFromVariable,
   } from '@utils/assist';
   import { timeTaskNameRule } from '@utils/validator';
 

From 5062193757167679e86b7534698bc46bb5e728fd Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Fri, 4 Aug 2023 17:07:48 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E8=84=9A=E6=9C=AC=E7=9A=84=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=AF=B9=E6=AF=94=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E5=A4=B1=E6=95=88=20#2309?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/script-manage/common/diff.vue   | 276 +++++++++---------
 1 file changed, 136 insertions(+), 140 deletions(-)

diff --git a/src/frontend/src/views/script-manage/common/diff.vue b/src/frontend/src/views/script-manage/common/diff.vue
index a6706f74e3..ad9e8280b9 100644
--- a/src/frontend/src/views/script-manage/common/diff.vue
+++ b/src/frontend/src/views/script-manage/common/diff.vue
@@ -88,16 +88,19 @@
           </bk-select>
         </div>
       </div>
-      <scroll-faker class="content-wraper">
-        <jb-diff
-          ref="diff"
-          class="diff-details"
-          :context="Infinity"
-          format="side-by-side"
-          :language="language"
-          :new-content="newContent"
-          :old-content="oldContent" />
-      </scroll-faker>
+      <div class="content-wraper">
+        <scroll-faker>
+          <jb-diff
+            ref="diff"
+            class="diff-details"
+            :context="Infinity"
+            format="side-by-side"
+            :language="language"
+            :new-content="newContent"
+            :old-content="oldContent"
+            theme="dark" />
+        </scroll-faker>
+      </div>
     </div>
     <i
       class="bk-icon icon-close"
@@ -184,11 +187,7 @@
       this.statisticsDiff();
       this.$once('hook:beforeDestroy', () => {
         window.removeEventListener('keydown', this.handleEsc);
-        try {
-          document.body.removeChild(this.$el);
-        } catch {
-          console.log('error');
-        }
+        this.$el.parentNode.removeChild(this.$el);
       });
     },
     methods: {
@@ -298,167 +297,164 @@
   };
 </script>
 <style lang="postcss">
-  .jb-diff-layout {
-    position: fixed;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    padding: 8px 24px;
-    background-color: #fff;
-
-    .header {
-      display: flex;
-      align-items: center;
-      padding-right: 16px;
-
-      .title {
-        font-size: 20px;
-        line-height: 28px;
-        color: #313238;
-      }
+    .jb-diff-layout {
+      position: fixed;
+      inset: 0;
+      padding: 8px 24px;
+      background-color: #fff;
 
-      .diff-info {
+      .header {
         display: flex;
-        margin-top: 15px;
-        margin-left: auto;
-        font-size: 12px;
-        line-height: 1em;
         align-items: center;
+        padding-right: 16px;
 
-        .diff-del,
-        .diff-change,
-        .diff-ins {
-          display: flex;
-          margin-left: 30px;
-          cursor: pointer;
-          user-select: none;
+        .title {
+          font-size: 20px;
+          line-height: 28px;
+          color: #313238;
         }
 
-        .diff-del {
-          color: #bd5c58;
-
-          .before {
-            background: #b1615b;
+        .diff-info {
+          display: flex;
+          margin-top: 15px;
+          margin-left: auto;
+          font-size: 12px;
+          line-height: 1em;
+          align-items: center;
+
+          .diff-del,
+          .diff-change,
+          .diff-ins {
+            display: flex;
+            margin-left: 30px;
+            cursor: pointer;
+            user-select: none;
           }
 
-          .after {
-            background: #dcdcdc;
-          }
-        }
+          .diff-del {
+            color: #bd5c58;
 
-        .diff-change {
-          color: #63656e;
+            .before {
+              background: #b1615b;
+            }
 
-          .before {
-            background: #b1615b;
+            .after {
+              background: #dcdcdc;
+            }
           }
 
-          .after {
-            background: #9aad76;
+          .diff-change {
+            color: #63656e;
+
+            .before {
+              background: #b1615b;
+            }
+
+            .after {
+              background: #9aad76;
+            }
           }
-        }
 
-        .diff-ins {
-          color: #9aad76;
+          .diff-ins {
+            color: #9aad76;
+
+            .before {
+              background: #dcdcdc;
+            }
 
-          .before {
-            background: #dcdcdc;
+            .after {
+              background: #9aad76;
+            }
           }
 
+          .before,
           .after {
-            background: #9aad76;
+            width: 1em;
+            height: 1em;
           }
-        }
 
-        .before,
-        .after {
-          width: 1em;
-          height: 1em;
+          .after {
+            margin-right: 6px;
+            margin-left: 1px;
+          }
         }
+      }
 
-        .after {
-          margin-right: 6px;
-          margin-left: 1px;
+      .version-select-layout {
+        display: flex;
+        height: 48px;
+        margin-top: 18px;
+        background: #eaebf0;
+        border-radius: 2px 2px 0 0;
+
+        .version-left,
+        .version-right {
+          display: flex;
+          padding: 0 8px;
+          flex: 0 0 50%;
+          align-items: center;
         }
-      }
-    }
 
-    .version-select-layout {
-      display: flex;
-      height: 48px;
-      margin-top: 18px;
-      background: #eaebf0;
-      border-radius: 2px 2px 0 0;
+        .version-left {
+          border-right: 1px solid #dcdee5;
+        }
 
-      .version-left,
-      .version-right {
-        display: flex;
-        padding: 0 8px;
-        flex: 0 0 50%;
-        align-items: center;
+        .bk-select {
+          color: #63656e;
+          background: #fff;
+        }
       }
 
-      .version-left {
-        border-right: 1px solid #dcdee5;
+      .version-selector {
+        width: 300px;
       }
 
-      .bk-select {
-        color: #63656e;
-        background: #fff;
+      .content-wraper {
+        height: calc(100vh - 92px);
       }
-    }
-
-    .version-selector {
-      width: 300px;
-    }
-
-    .content-wraper {
-      max-height: calc(100vh - 92px);
-    }
 
-    .d2h-file-wrapper {
-      border: none;
-    }
+      .d2h-file-wrapper {
+        border: none;
+      }
 
-    .diff-details {
-      position: relative;
-      background-color: #fff;
-    }
+      .diff-details {
+        position: relative;
+        background-color: #fff;
+      }
 
-    .d2h-code-side-linenumber {
-      line-height: 20px;
+      .d2h-code-side-linenumber {
+        line-height: 20px;
+
+        &.active::before {
+          float: left;
+          width: 10px;
+          height: 10px;
+          margin-top: 5px;
+          margin-left: 13px;
+          background: #666;
+          border-radius: 50%;
+          content: "";
+        }
+      }
 
-      &.active::before {
-        float: left;
-        width: 10px;
-        height: 10px;
-        margin-top: 5px;
-        margin-left: 13px;
-        background: #666;
+      .icon-close {
+        position: absolute;
+        top: 8px;
+        right: 8px;
+        display: flex;
+        width: 26px;
+        height: 26px;
+        font-size: 22px;
+        color: #979ba5;
+        cursor: pointer;
         border-radius: 50%;
-        content: "";
-      }
-    }
+        transition: all 0.1s;
+        align-items: center;
+        justify-content: center;
 
-    .icon-close {
-      position: absolute;
-      top: 8px;
-      right: 8px;
-      display: flex;
-      width: 26px;
-      height: 26px;
-      font-size: 22px;
-      color: #979ba5;
-      cursor: pointer;
-      border-radius: 50%;
-      transition: all 0.1s;
-      align-items: center;
-      justify-content: center;
-
-      &:hover {
-        background-color: #f0f1f5;
+        &:hover {
+          background-color: #f0f1f5;
+        }
       }
     }
-  }
 </style>

From 812fdc6cd13caa8558d4632bd271c08a19ee07b6 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Fri, 4 Aug 2023 17:26:12 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E8=84=9A=E6=9C=AC=E7=9A=84=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=AF=B9=E6=AF=94=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E5=A4=B1=E6=95=88=20#2309?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/src/views/script-manage/common/diff.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/src/views/script-manage/common/diff.vue b/src/frontend/src/views/script-manage/common/diff.vue
index ad9e8280b9..d00568ede5 100644
--- a/src/frontend/src/views/script-manage/common/diff.vue
+++ b/src/frontend/src/views/script-manage/common/diff.vue
@@ -410,7 +410,7 @@
       }
 
       .content-wraper {
-        height: calc(100vh - 92px);
+        height: calc(100vh - 120px);
       }
 
       .d2h-file-wrapper {