Merge remote-tracking branch 'origin/dev5.3.2' into dev5.3.2

src/components/AddAssistCheck/Textarea/index.jsx

@@ -19,6 +19,7 @@ class Textarea extends Component {
   handleInput(e){
     const {handleChangeAssistValue,idx,handlePush} = this.props;
     const text = (e.target.innerHTML || e.target.innerText);
+    $(e.target).find('img').remove()
     // e.target.innerHTML = e.target.textContent
     const stimer = this.state.timer;
     handleChangeAssistValue&&handleChangeAssistValue(text,idx);

src/components/HistoryCaseContainer/HistoryList/index.less

@@ -11,7 +11,7 @@
     height: 86%;
     background-color: #fff;
     overflow: hidden;
-    padding-bottom:20px;
+    // padding-bottom:20px;
     .close {
         position: absolute;
         top: 0;
@@ -106,6 +106,7 @@
         overflow: auto;
         height: 100%;
         padding-top: 40px;
+        padding-bottom:20px;
         // top: 42px;
 
         float: left;

src/components/Operation/index.jsx

@@ -118,13 +118,8 @@ class Operation extends Component {
     })
   }
   handleInput(e){
-    let val = e.target.value
-    if(e.target.value.length > 30){
-        e.target.value = val.substring(0,30)
-        this.onchange(val.substring(0,30))
-    }else{
-        this.onchange(e.target.value)
-    }
+    let val = (e.target.value).substring(0,30)
+    this.onchange(val)
   }
   keypress(event) {
     let e = event?event:window.event;

src/components/PushContainer/index.jsx

@@ -134,13 +134,8 @@ class PushContainer extends Component {
     }
   }
   handleInput(e) {
-    let val = e.target.value
-    if (e.target.value.length > 30) {
-      e.target.value = val.substring(0, 30)
-      this.onchange(val.substring(0, 30))
-    } else {
-      this.onchange(e.target.value)
-    }
+    let val = (e.target.value).substring(0, 30)
+    this.onchange(val)
   }
   changeTitle() {
     return <div className={style['box']}>