feature: 白名单IP添加时增加对“执行方式”的判断，如仅开文件分发则在脚本执行中不可选中 TencentBlueKing#115

hLinx · Jul 27, 2021 · 3ea4a5a · 3ea4a5a
1 parent f99070c
commit 3ea4a5a
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 2 deletions.
diff --git a/src/frontend/src/components/choose-ip/components/render-ip-input.vue b/src/frontend/src/components/choose-ip/components/render-ip-input.vue
@@ -270,7 +270,14 @@
 
                 this.isSubmiting = true;
 
-                AppManageService.fetchHostOfHost(IPList)
+                const params = {
+                    ipList: IPList,
+                };
+                if (window.IPInputScope) {
+                    params.actionScope = window.IPInputScope;
+                }
+
+                AppManageService.fetchHostOfHost(params)
                     .then((data) => {
                         // 输入的有效 IP
                         const hostList = [];

diff --git a/src/frontend/src/components/choose-ip/view/host.vue b/src/frontend/src/components/choose-ip/view/host.vue
@@ -165,7 +165,9 @@
                     ipList.push(realId);
                     ipMap[realId] = Object.assign({ realId }, currentHost);
                 });
-                AppManageService.fetchHostOfHost(ipList)
+                AppManageService.fetchHostOfHost({
+                    ipList,
+                })
                     .then((data) => {
                         const list = [];
                         this.invalidList = [];

diff --git a/src/frontend/src/main.js b/src/frontend/src/main.js
@@ -52,6 +52,13 @@ console.log(process.env.JOB_WELCOME);
  */
 window.changeAlert = false;
 
+/**
+ * @desc 因为 IP 有白名单功能，生效范围需要更新场景区分
+ * - '' 所有
+ * - SCRIPT_EXECUTE 生效范围脚本执行
+ * - FILE_DISTRIBUTION 生效范围文件分发
+ */
+window.IPInputScope = '';
 /**
  * @desc 开启路由回溯
  */

diff --git a/src/frontend/src/views/fast-execution/distro-file/index.vue b/src/frontend/src/views/fast-execution/distro-file/index.vue
@@ -185,6 +185,10 @@
             this.$once('hook:beforeDestroy', () => {
                 window.removeEventListener('resize', this.calcTargetPathTipsPlacement);
             });
+            window.IPInputScope = 'FILE_DISTRIBUTION';
+            this.$once('hook:beforeDestroy', () => {
+                window.IPInputScope = '';
+            });
         },
         methods: {
             /**

diff --git a/src/frontend/src/views/fast-execution/exec-script/index.vue b/src/frontend/src/views/fast-execution/exec-script/index.vue
@@ -166,6 +166,12 @@
         created () {
             this.parseUrlParams();
         },
+        mounted () {
+            window.IPInputScope = 'SCRIPT_EXECUTE';
+            this.$once('hook:beforeDestroy', () => {
+                window.IPInputScope = '';
+            });
+        },
         /**
          * @desc 销毁时清空脚本调试的数据
          */

diff --git a/src/frontend/src/views/task-manage/common/render-task-step/task-step/distro-file.vue b/src/frontend/src/views/task-manage/common/render-task-step/task-step/distro-file.vue
@@ -197,6 +197,12 @@
                 immediate: true,
             },
         },
+        mounted () {
+            window.IPInputScope = 'FILE_DISTRIBUTION';
+            this.$once('hook:beforeDestroy', () => {
+                window.IPInputScope = '';
+            });
+        },
         methods: {
             /**
              * @desc 表单字段更新

diff --git a/src/frontend/src/views/task-manage/common/render-task-step/task-step/exec-script.vue b/src/frontend/src/views/task-manage/common/render-task-step/task-step/exec-script.vue
@@ -176,6 +176,12 @@
                 immediate: true,
             },
         },
+        mounted () {
+            window.IPInputScope = 'SCRIPT_EXECUTE';
+            this.$once('hook:beforeDestroy', () => {
+                window.IPInputScope = '';
+            });
+        },
         methods: {
             handleChange (field, value) {
                 this.formData[field] = value;