From 6f5419d07e135c0696575ed3a83c51ed83efc944 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Sat, 20 Jun 2020 14:29:20 +0800
Subject: [PATCH] =?UTF-8?q?U=20=E4=BC=98=E5=8C=96=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=94=AF=E6=8C=81=E8=87=AA=E5=8A=A8=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_web/src/components/ACEditor.js         |  1 +
 spug_web/src/pages/deploy/app/Ext1Form.js   |  2 +-
 spug_web/src/pages/deploy/app/Ext1Setup3.js | 10 ++++++++--
 spug_web/src/pages/deploy/app/Ext2Form.js   |  2 +-
 spug_web/src/pages/deploy/app/Ext2Setup3.js |  2 ++
 spug_web/src/pages/monitor/Form.js          |  9 ++++++---
 spug_web/src/pages/schedule/Form.js         |  5 +++--
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/spug_web/src/components/ACEditor.js b/spug_web/src/components/ACEditor.js
index 1f07974..e799fd2 100644
--- a/spug_web/src/components/ACEditor.js
+++ b/spug_web/src/components/ACEditor.js
@@ -13,6 +13,7 @@ import 'ace-builds/src-noconflict/snippets/sh';
 export default function (props) {
   return (
     <Editor
+      wrapEnabled
       theme="tomorrow"
       enableLiveAutocompletion={true}
       enableBasicAutocompletion={true}
diff --git a/spug_web/src/pages/deploy/app/Ext1Form.js b/spug_web/src/pages/deploy/app/Ext1Form.js
index 005cefe..650f321 100644
--- a/spug_web/src/pages/deploy/app/Ext1Form.js
+++ b/spug_web/src/pages/deploy/app/Ext1Form.js
@@ -16,7 +16,7 @@ export default observer(function Ext1From() {
   return (
     <Modal
       visible
-      width={800}
+      width={900}
       maskClosable={false}
       title={store.deploy.id ? '编辑常规发布' : '新建常规发布'}
       onCancel={() => store.ext1Visible = false}
diff --git a/spug_web/src/pages/deploy/app/Ext1Setup3.js b/spug_web/src/pages/deploy/app/Ext1Setup3.js
index 6d9bbc1..61fd93c 100644
--- a/spug_web/src/pages/deploy/app/Ext1Setup3.js
+++ b/spug_web/src/pages/deploy/app/Ext1Setup3.js
@@ -81,6 +81,7 @@ class Ext1Setup3 extends React.Component {
               className={full === '1' ? styles.fullScreen : null}
               label={<this.FilterLabel type={info['filter_rule']['type']}/>}>
               <Editor
+                wrapEnabled
                 mode="text"
                 theme="tomorrow"
                 width="100%"
@@ -93,8 +94,9 @@ class Ext1Setup3 extends React.Component {
             <Form.Item
               colon={false}
               className={full === '3' ? styles.fullScreen : null}
-              label={<this.NormalLabel title="代码迁出前执行" id="3"/>}>
+              label={<this.NormalLabel title="代码检出前执行" id="3"/>}>
               <Editor
+                wrapEnabled
                 mode="sh"
                 theme="tomorrow"
                 width="100%"
@@ -109,6 +111,7 @@ class Ext1Setup3 extends React.Component {
               className={full === '5' ? styles.fullScreen : null}
               label={<this.NormalLabel title="应用发布前执行" id="5"/>}>
               <Editor
+                wrapEnabled
                 mode="sh"
                 theme="tomorrow"
                 width="100%"
@@ -139,6 +142,7 @@ class Ext1Setup3 extends React.Component {
               className={full === '2' ? styles.fullScreen : null}
               label={<this.NormalLabel title="自定义全局变量" id="2"/>}>
               <Editor
+                wrapEnabled
                 mode="text"
                 theme="tomorrow"
                 width="100%"
@@ -151,8 +155,9 @@ class Ext1Setup3 extends React.Component {
             <Form.Item
               colon={false}
               className={full === '4' ? styles.fullScreen : null}
-              label={<this.NormalLabel title="代码迁出后执行" id="4"/>}>
+              label={<this.NormalLabel title="代码检出后执行" id="4"/>}>
               <Editor
+                wrapEnabled
                 mode="sh"
                 theme="tomorrow"
                 width="100%"
@@ -167,6 +172,7 @@ class Ext1Setup3 extends React.Component {
               className={full === '6' ? styles.fullScreen : null}
               label={<this.NormalLabel title="应用发布后执行" id="6"/>}>
               <Editor
+                wrapEnabled
                 mode="sh"
                 theme="tomorrow"
                 width="100%"
diff --git a/spug_web/src/pages/deploy/app/Ext2Form.js b/spug_web/src/pages/deploy/app/Ext2Form.js
index 73148f2..42b9abf 100644
--- a/spug_web/src/pages/deploy/app/Ext2Form.js
+++ b/spug_web/src/pages/deploy/app/Ext2Form.js
@@ -16,7 +16,7 @@ export default observer(function Ext2From() {
   return (
     <Modal
       visible
-      width={800}
+      width={900}
       maskClosable={false}
       title={store.deploy.id ? '编辑自定义发布' : '新建自定义发布'}
       onCancel={() => store.ext2Visible = false}
diff --git a/spug_web/src/pages/deploy/app/Ext2Setup3.js b/spug_web/src/pages/deploy/app/Ext2Setup3.js
index 0e03b15..66aefa1 100644
--- a/spug_web/src/pages/deploy/app/Ext2Setup3.js
+++ b/spug_web/src/pages/deploy/app/Ext2Setup3.js
@@ -63,6 +63,7 @@ class Ext2Setup3 extends React.Component {
 
             <Form.Item required label="执行内容">
               <Editor
+                wrapEnabled
                 mode="sh"
                 theme="tomorrow"
                 width="100%"
@@ -90,6 +91,7 @@ class Ext2Setup3 extends React.Component {
 
             <Form.Item required label="执行内容">
               <Editor
+                wrapEnabled
                 mode="sh"
                 theme="tomorrow"
                 width="100%"
diff --git a/spug_web/src/pages/monitor/Form.js b/spug_web/src/pages/monitor/Form.js
index c0a45c5..ce530dc 100644
--- a/spug_web/src/pages/monitor/Form.js
+++ b/spug_web/src/pages/monitor/Form.js
@@ -173,10 +173,13 @@ class ComForm extends React.Component {
               required
               label="脚本内容"
               style={this.getStyle('4')}
-
               extra={<LinkButton onClick={() => this.setState({showTmp: true})}>从模板添加</LinkButton>}>
-              <ACEditor mode="sh" value={extra['4']} height="200px"
-                        onChange={e => this.handleExtra('4', cleanCommand(e))}/>
+              <ACEditor
+                mode="sh"
+                value={extra['4']}
+                width="100%"
+                height="200px"
+                onChange={e => this.handleExtra('4', cleanCommand(e))}/>
             </Form.Item>
             <Form.Item label="备注信息">
               {getFieldDecorator('desc', {initialValue: info['desc']})(
diff --git a/spug_web/src/pages/schedule/Form.js b/spug_web/src/pages/schedule/Form.js
index 427fe3e..85a97e7 100644
--- a/spug_web/src/pages/schedule/Form.js
+++ b/spug_web/src/pages/schedule/Form.js
@@ -193,8 +193,9 @@ class ComForm extends React.Component {
               <ACEditor
                 mode="sh"
                 value={this.state.command}
-                onChange={val => this.setState({command: val})}
-                height="150px"/>
+                width="100%"
+                height="150px"
+                onChange={val => this.setState({command: val})}/>
             </Form.Item>
             <Form.Item label="失败通知" help="任务执行失败告警通知">
               {getFieldDecorator('rst_notify.value', {initialValue: info['rst_notify']['value']})(