Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/developer/components/controlSetting/index.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 16:02:36
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 18:05:50
+ * @LastEditTime : 2020-01-20 17:42:06
  */
 import './index.scss';
 import React, { useState, useRef, useEffect } from 'react';
@@ -99,9 +99,17 @@ const ControlSetting = (props) => {
     // debuggerCode(identifier, values);
     onDebuggerCode(values);
   }
-
+  // icon-shangjiantou
   return (
     <div className="pane_control_area">
+      <div
+        className="pane_control_collapse" 
+        onClick={handleShowControl}
+        style={{ top: showTextResult ? '-267px' : 0 }}
+      >
+        {/* <i className="iconfont icon-xiajiantou icon"></i> */}
+        <Icon type={ showTextResult ? "down" : "up" } />
+      </div>
       <Tabs
         className={classNames}
         activeKey={defaultActiveKey} 
@@ -126,8 +134,10 @@ const ControlSetting = (props) => {
         <Button 
           type="link" 
           style={{ color: '#fff' }} 
-          onClick={handleShowControl}>
+          // onClick={handleShowControl}
-            控制台 <Icon type={ showTextResult ? "down" : "up" } />
+        >
+            控制台
+             {/* <Icon type={ showTextResult ? "down" : "up" } /> */}
           </Button>
         <p>
           <Button ghost 

public/react/src/modules/developer/components/controlSetting/index.scss

@@ -2,6 +2,30 @@
   position: absolute;
   bottom: 0;
   width: 100%;
+  .pane_control_collapse{
+    position: absolute;
+    width: 55px;
+    height: 27px;
+    background:rgba(42,58,79,1);
+    border-bottom-left-radius: 55px;
+    border-bottom-right-radius: 55px;
+    left: 50%;
+    margin-left: -27px;
+    text-align: center;
+    color: #fff;
+    line-height: 27px;
+    opacity: 0.5;
+    transition: opacity .3s;
+    z-index: 10;
+    .icon{
+      position: relative;
+      top: 0px;
+    }
+
+    &:hover{
+      opacity: .8;
+    }
+  }
   // background: red;
   // background:rgba(30,30,30,1);
   // height: 56px;

public/react/src/modules/developer/components/myMonacoEditor/index.scss

@@ -76,6 +76,13 @@
   animation-iteration-count: 3;
 }
 
+// .monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input,
+// .monaco-editor .margin,
+// .minimap slider-mouseover,
+// .minimap-decorations-layer{
+//   background:rgba(3,19,40,1) !important;
+// }
+
 @keyframes blink{
   50% {
     color: #fff;