Merge pull request #3430 from hLinx/feature_3.11

feature: 支持指定脚本解释器运行脚本 #3321
TencentBlueKing · Feb 18, 2025 · dabead8 · dabead8
2 parents 08e29c8 + 5c123fb
commit dabead8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
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
@@ -370,7 +370,7 @@
                     draggable: false,
                     showFooter: false,
                     closeIcon: false,
-                    width: 450,
+                    width: 550,
                     subHeader: (
                       <div>
                         <div style="font-size: 14px; line-height: 22px; color: #63656E; text-align: center">

diff --git a/src/frontend/src/components/task-step/script/strategy/script-source-of-execution.vue b/src/frontend/src/components/task-step/script/strategy/script-source-of-execution.vue
@@ -236,7 +236,7 @@
         immediate: true,
       },
       'formData.scriptId'(value) {
-        if (value) {
+        if (value && this.$refs.scriptId) {
           this.$refs.scriptId.clearValidator();
         }
       },

diff --git a/src/frontend/src/components/task-step/script/strategy/script-source-of-template.vue b/src/frontend/src/components/task-step/script/strategy/script-source-of-template.vue
@@ -264,7 +264,7 @@
         immediate: true,
       },
       'formData.scriptId'(value) {
-        if (value) {
+        if (value && this.$refs.scriptId) {
           this.$refs.scriptId.clearValidator();
         }
       },

diff --git a/src/frontend/src/components/task-step/script/strategy/window-interpreter.vue b/src/frontend/src/components/task-step/script/strategy/window-interpreter.vue
@@ -1,7 +1,6 @@
 <template>
   <bk-form-item
     v-show="isShow"
-    class="form-item-content"
     error-display-type="normal"
     :label="t('解释器')"
     :property="field"
@@ -22,6 +21,7 @@
       <bk-input
         class="form-item-content"
         :placeholder="t('输入目标机器上的自定义解释器软件路径，如：D:\\Software\\python3\\python.exe。请勿指定命令行选项。')"
+        style="width: 100%"
         :value="formData[field]"
         @change="handleChange" />
     </div>

diff --git a/src/frontend/src/css/bk-patch.css b/src/frontend/src/css/bk-patch.css
@@ -257,6 +257,10 @@
   }
 }
 
+.bk-form-item.is-checking .bk-form-content ::after{
+  z-index: 9;
+}
+
 /**
     覆盖 bk-radio-button 样式
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -257,6 +257,10 @@ @@
       }
     }
+    .bk-form-item.is-checking .bk-form-content ::after{
+      z-index: 9;
+    }
     /**
         覆盖 bk-radio-button 样式
      */
@@ Expand Down @@