diff --git a/spug_web/src/components/SHEditor.js b/spug_web/src/components/ACEditor.js similarity index 70% rename from spug_web/src/components/SHEditor.js rename to spug_web/src/components/ACEditor.js index 43f7eea..ffd962b 100644 --- a/spug_web/src/components/SHEditor.js +++ b/spug_web/src/components/ACEditor.js @@ -2,13 +2,16 @@ import React from "react"; import Editor from 'react-ace'; import 'ace-builds/src-noconflict/ext-language_tools'; import 'ace-builds/src-noconflict/mode-sh'; +import 'ace-builds/src-noconflict/mode-json'; +import 'ace-builds/src-noconflict/mode-text'; import 'ace-builds/src-noconflict/theme-tomorrow'; import 'ace-builds/src-noconflict/snippets/sh'; +import 'ace-builds/src-noconflict/snippets/json'; +import 'ace-builds/src-noconflict/snippets/text'; export default function (props) { return ( - this.setState({body})}/> + this.setState({body})}/> diff --git a/spug_web/src/pages/exec/template/Form.js b/spug_web/src/pages/exec/template/Form.js index 3572c59..97c2f92 100644 --- a/spug_web/src/pages/exec/template/Form.js +++ b/spug_web/src/pages/exec/template/Form.js @@ -1,7 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import { Modal, Form, Input, Select, Col, Button, message } from 'antd'; -import { SHEditor } from 'components'; +import { ACEditor } from 'components'; import http from 'libs/http'; import store from './store'; @@ -88,7 +88,8 @@ class ComForm extends React.Component { )} - this.setState({body: val})} height="300px"/> diff --git a/spug_web/src/pages/monitor/Form.js b/spug_web/src/pages/monitor/Form.js index 1a096d9..56deb1d 100644 --- a/spug_web/src/pages/monitor/Form.js +++ b/spug_web/src/pages/monitor/Form.js @@ -2,7 +2,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import { Modal, Form, Input, Select, Radio, message, Steps, Button, Transfer, Checkbox } from 'antd'; import TemplateSelector from '../exec/task/TemplateSelector'; -import { LinkButton, SHEditor } from 'components'; +import { LinkButton, ACEditor } from 'components'; import http from 'libs/http'; import store from './store'; import hostStore from '../host/store'; @@ -163,7 +163,7 @@ class ComForm extends React.Component { this.setState({showTmp: true})}>从模板添加}> - this.handleExtra('4', e)}/> + this.handleExtra('4', e)}/> {getFieldDecorator('desc', {initialValue: info['desc']})( diff --git a/spug_web/src/pages/schedule/Form.js b/spug_web/src/pages/schedule/Form.js index ba5d6c5..a66bbed 100644 --- a/spug_web/src/pages/schedule/Form.js +++ b/spug_web/src/pages/schedule/Form.js @@ -1,7 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import { Modal, Form, Input, Select, Col, Button, Steps, Tabs, InputNumber, DatePicker, Icon, message } from 'antd'; -import { LinkButton, SHEditor } from 'components'; +import { LinkButton, ACEditor } from 'components'; import TemplateSelector from '../exec/task/TemplateSelector'; import http from 'libs/http'; import store from './store'; @@ -149,7 +149,8 @@ class ComForm extends React.Component { required label="任务内容" extra={ this.setState({showTmp: true})}>从模板添加}> - this.setState({command: val})} height="200px"/>