Merge remote-tracking branch 'origin/master'

src/components/common/caseNotification/CaseNotification.jsx

@@ -1,4 +1,6 @@
 import React, {Component} from 'react';
+import {Input, Tooltip, Icon, Button} from 'antd';
+import './index.css';
 
 class CaseNotification extends Component {
     constructor() {
@@ -8,9 +10,59 @@ class CaseNotification extends Component {
     render() {
         return (
             <div>
-                Case Notification
+                <span className='table-title'> Notification Settings</span>
+                <div className='kind'>
+                    <p><b>Ding Talk</b></p>
+                    <div className='item'>
+                        <p>
+                            <span className='item-title'>
+                                <span>Web hook  </span>
+                                <Tooltip placement="top" title='hahahha'>
+                                    <Icon type="question-circle"/>
+                                </Tooltip>
+                            </span>
+                            <Input style={{width: 900}}/>
+                        </p>
+                        <p>
+                            <span className='item-title'>
+                                <span>Notification Name  </span>
+                                <Tooltip placement="top" title='heheheheh'>
+                                    <Icon type="question-circle"/>
+                                </Tooltip>
+                            </span>
+                            <Input style={{width: 300}}/></p>
+                    </div>
+                </div>
+
+                <div className='kind'>
+                    <p><b>QQ</b></p>
+                    <div className='item'>
+                        <p>
+                            <span className='item-title'>
+                                <span>Web hook  </span>
+                                <Tooltip placement="top" title='hahahha'>
+                                    <Icon type="question-circle"/>
+                                </Tooltip>
+                            </span>
+                            <Input style={{width: 900}}/>
+                        </p>
+                        <p>
+                            <span className='item-title'>
+                                <span>Notification Name  </span>
+                                <Tooltip placement="top" title='heheheheh'>
+                                    <Icon type="question-circle"/>
+                                </Tooltip>
+                            </span>
+                            <Input style={{width: 300}}/></p>
+                    </div>
+                </div>
+
+                <Button type="primary" onClick={() => {
+                    console.log('hello');
+                }}>SUBMIT</Button>
             </div>
         )
+
     }
 }
 

src/components/monitorNotify/notification/index.css → src/components/common/caseNotification/index.css

@@ -11,4 +11,17 @@
   font-weight: 900;
   color: #0B7FC7;
   /*border-right: */
+}
+
+.kind {
+  margin-top: 20px;
+}
+
+.item {
+
+}
+
+.item-title {
+  display: inline-block;
+  width: 180px;
 }

src/components/common/graphql/Graphql.jsx

@@ -27,7 +27,7 @@ class Graphql extends Component {
   render() {
     return (
       <div>
-        <Alert style={{marginTop: 10}} message="下面的 graphql api 对应的是是 online 的数据库"
+        <Alert message="下面的 graphql api 对应的是是 online 的数据库"
                type="warning" banner closable/>
         <Input style={{marginTop: 10}} addonBefore="POST" defaultValue={this.state.api}
                onChange={(e) => {

src/components/common/graphql/index.css

@@ -27,7 +27,7 @@
     -ms-flex-direction: row;
     flex-direction: row;
     height: 800px;
-    margin: 10px;
+    margin-top: 10px;
     overflow: hidden;
     width: 100%;
 }
@@ -83,7 +83,7 @@
     -webkit-box-flex: 1;
     -ms-flex: 1;
     flex: 1;
-    height: 34px;
+    height: 45px;
     overflow-y: visible;
     padding: 7px 14px 6px;
     -webkit-user-select: none;
@@ -1094,7 +1094,7 @@ span.CodeMirror-selectedtext { background: none; }
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
-    height: 34px;
+    height: 50px;
     line-height: 14px;
     padding: 8px 8px 5px;
     position: relative;
@@ -1111,7 +1111,7 @@ span.CodeMirror-selectedtext { background: none; }
     flex: 1;
     font-weight: bold;
     overflow-x: hidden;
-    padding: 10px 0 10px 10px;
+    padding: 10px 0 5px 10px;
     text-align: center;
     text-overflow: ellipsis;
     -webkit-user-select: initial;

src/components/monitorNotify/notification/Notification.jsx

@@ -1,6 +1,4 @@
 import React, {Component} from 'react';
-import {Input} from 'antd';
-import './index.css';
 
 class Notification extends Component {
     constructor() {
@@ -10,9 +8,7 @@ class Notification extends Component {
     render() {
         return (
             <div>
-                <span className='table-title'> Notification Settings</span>
-                <p><b>Ding Talk</b></p>
-                <p>Web hook <Input/></p>
+                <p>Notification</p>
             </div>
         )
     }