Merge pull request #2313 from hLinx/hotfix_master

Hotfix master
TencentBlueKing · Aug 4, 2023 · 23481bc · 23481bc
2 parents 41c8d3c + 812fdc6
commit 23481bc
Show file tree

Hide file tree

Showing 7 changed files with 218 additions and 211 deletions.
diff --git 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/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
@@ -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';
 

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
@@ -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
@@ -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
@@ -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);