Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/optimize' into optimize

zhouna 6 anni fa
parent
commit
635871a199

+ 8 - 6
src/components/EmergencyProcedure/EmergencyModal/index.less

@@ -83,24 +83,26 @@
   }
   .imageModal {
     position: fixed;
-    // top: 7%;
-    // bottom: 7%;
+    top: 7%;
+    bottom: 7%;
     // height: 86%;
     background-color: #fff;
     overflow: hidden;
     z-index: 500;
     width: 1000px;
     margin-left: -500px;
-    transform: translateY(-50%);
     // margin-top: -420px;
     // height: 840px;
     // transform: translateX(-50%);
     left: 50%;
-    top: 50%;
+    // top: 50%;
     img{
-      width: 100%;
+      // width: 100%;
       height: 100%;
-      float: left;
+      position: absolute;
+      left: 50%;
+      transform: translateX(-50%);
+      // float: left;
       top: 0;
     }
   }

+ 2 - 0
src/components/EmergencyProcedure/index.jsx

@@ -11,6 +11,7 @@ class EmergencyProcedure extends React.Component {
       show:false,
       data:{}
     }
+    this.handleShow=this.handleShow.bind(this)
   }
   
   slideToggle(type){
@@ -32,6 +33,7 @@ class EmergencyProcedure extends React.Component {
     this.setState({
       show:type
     })
+    !type&&this.slideToggle(0)
   }
   render(){
     const {data,setDataIdx,idx} = this.props;

+ 1 - 0
src/store/actions/mainSuit.js

@@ -413,6 +413,7 @@ export const insertSearch = (state,action)=>{
         res.data.splice(focusIndex+1,0,nText);
         res.saveText.splice(focusIndex+1,0,searchData);
         res.data[focusIndex].value = value;
+        res.saveText[focusIndex] = value;
       }
       span.current.innerText?(span.current.innerText = value):(span.current.innerHTML=value);
     }