From 155319e72df646642812f0cd79b2224355334826 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Tue, 30 Nov 2021 10:52:02 +0800
Subject: [PATCH] =?UTF-8?q?A=20=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_api/apps/exec/executors.py                |  1 +
 spug_web/src/pages/exec/task/index.js          |  3 ++-
 spug_web/src/pages/exec/task/index.module.less | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/spug_api/apps/exec/executors.py b/spug_api/apps/exec/executors.py
index c57fcf1..6b1057a 100644
--- a/spug_api/apps/exec/executors.py
+++ b/spug_api/apps/exec/executors.py
@@ -26,6 +26,7 @@ class Job:
             SPUG_HOST_HOSTNAME=hostname,
             SPUG_SSH_PORT=str(port),
             SPUG_SSH_USERNAME=username,
+            SPUG_INTERPRETER=interpreter
         )
 
     def _send(self, message, with_expire=False):
diff --git a/spug_web/src/pages/exec/task/index.js b/spug_web/src/pages/exec/task/index.js
index ac9b1cd..0e6afb1 100644
--- a/spug_web/src/pages/exec/task/index.js
+++ b/spug_web/src/pages/exec/task/index.js
@@ -66,7 +66,7 @@ function TaskIndex() {
             style={{marginBottom: 24}}
             icon={<PlusOutlined/>}
             onClick={() => store.showHost = true}>从主机列表中选择</Button>
-          <Form.Item required label="执行命令">
+          <Form.Item required label="执行命令" style={{position: 'relative'}}>
             <Radio.Group
               buttonStyle="solid"
               style={{marginBottom: 12}}
@@ -75,6 +75,7 @@ function TaskIndex() {
               <Radio.Button value="sh">Shell</Radio.Button>
               <Radio.Button value="python">Python</Radio.Button>
             </Radio.Group>
+            <a href="https://spug.cc/docs/batch-exec" target="_blank" className={style.tips}>全局变量</a>
             <ACEditor mode={interpreter} value={command} height="350px" width="100%" onChange={setCommand}/>
           </Form.Item>
           <Form.Item>
diff --git a/spug_web/src/pages/exec/task/index.module.less b/spug_web/src/pages/exec/task/index.module.less
index 4f0e1ad..2096ed2 100644
--- a/spug_web/src/pages/exec/task/index.module.less
+++ b/spug_web/src/pages/exec/task/index.module.less
@@ -43,6 +43,12 @@ pre {
   margin: 0;
 }
 
+.tips {
+  position: absolute;
+  top: 10px;
+  left: 180px;
+}
+
 .hisBlock {
   width: 40%;
   display: flex;
@@ -118,4 +124,8 @@ pre {
     border-color: #1890ff;
     background-color: #e6f7ff;
   }
+}
+
+.output {
+
 }
\ No newline at end of file