Merge branch 'dev5.3.1' into dev/new1

src/common/components/EditableSpan/index.jsx

@@ -179,13 +179,14 @@ class EditableSpan extends Component{
     if(ev.keyCode==39){//向右
       let nextObj = $(this.$span.current).next();
       let obj = nextObj[0]&&nextObj[0].nodeName=="DIV"?nextObj.next():nextObj;
-      if(textIndex == textLength || textLength==undefined){
+      if(textIndex == textLength || textLength==undefined || (textIndex == 0 && textLength==1)){
         if(ev.preventDefault){//阻止默认事件
           ev.preventDefault();
         }else{
           ev.returnValue=false;
         }
-        obj.focus();
+        // obj.focus();
+        obj[0].focus();
       }
     }
   }  

src/common/components/EditableSpan/index.less

@@ -5,10 +5,11 @@
   word-break: break-word;
   min-width: 10px;
   // line-height: 2;
-  /*height: 16px;*/
+  height: 16px;//火狐需要
   line-height: 16px;
   vertical-align: middle;
   text-align: left;
+  padding-right: 1px;//火狐左右移动需要
 }
 .full{
   width: 100%;

src/components/AddInspect/SlideExcel/index.jsx

@@ -47,7 +47,7 @@ class SlideExcel extends Component {
               <td style={{ width: '30%' }}>
                 <span className={styles.tagSpan}>
                   {value.itemName}
-                  <span className={styles.imgInfo} onClick={() => getInfomation({ name: value.uniqueName || '', type: 12, position: 1 })}></span>
+                  <span className={styles.imgInfo1} onClick={() => getInfomation({ name: value.uniqueName || '', type: 12, position: 1 })}></span>
                 </span>
               </td>
               <td style={{ width: '20%' }}>
@@ -66,7 +66,7 @@ class SlideExcel extends Component {
                 <td style={{ width: '30%' }}>
                   <span className={styles.tagSpan}>
                     {value.itemName}
-                    <span className={styles.imgInfo} onClick={() => getInfomation({ name: value.uniqueName || '', type: 12, position: 1 })}></span>
+                    <span className={styles.imgInfo1} onClick={() => getInfomation({ name: value.uniqueName || '', type: 12, position: 1 })}></span>
                   </span>
                 </td>
                 <td style={{ width: '20%' }}>

src/components/AddInspect/SlideExcel/index.less

@@ -148,7 +148,7 @@
 .imgInfo {
   position: relative;
 }
-.imgInfo {
+.imgInfo , .imgInfo1{
   width: 15px;
   height: 17px;
   border-bottom: 0 none !important;
@@ -161,7 +161,10 @@
   display: none;
   cursor: pointer;
 }
-.imgInfo:hover {
+.imgInfo1 {
+  top: -13px;
+}
+.imgInfo:hover, .imgInfo1:hover {
   background: url('../img/info3.png') no-repeat center center;
   background-size: 100% auto; 
 }
@@ -175,7 +178,8 @@
   position: relative;
 }
 .tagSpan:hover {
-  .imgInfo {
+  .imgInfo, .imgInfo1 {
     display: block;
   }
+ 
 }

src/components/AddInspect/SlideSelect/index.jsx

@@ -128,7 +128,7 @@ class SlideSelect extends Component {
             <p className={styles.staticTagActive}>
                 <span className={styles.tagSpan} data-flg="current" style={{color:"#000"}} onClick={(e)=>this.handleLabelSub(e,item.questionId,idx)}>
                   {item.name}
-                  <span className={styles.imgInfo} onClick={()=>getInfomation({name:item.uniqueName || '', position: 1, type: 12})}></span>
+                  <span className={styles.imgInfo1} onClick={()=>getInfomation({name:item.uniqueName || '', position: 1, type: 12})}></span>
                 </span>
             </p>:
             <p >
@@ -156,7 +156,7 @@ class SlideSelect extends Component {
                                     <td style={{width:'30%'}}>
                                       <span className={styles.tagSpan}>
                                         {val.name}
-                                        <span className={styles.imgInfo} onClick={()=>getInfomation({name:val.uniqueName || '', position: 1, type: 12})}></span>                                        
+                                        <span className={styles.imgInfo1} onClick={()=>getInfomation({name:val.uniqueName || '', position: 1, type: 12})}></span>                                        
                                       </span>
                                     </td>
                                     {showDetails(val)}
@@ -174,7 +174,7 @@ class SlideSelect extends Component {
                                     <td style={{width:'30%'}}>
                                       <span className={styles.tagSpan}>
                                         {val.name}
-                                        <span className={styles.imgInfo} onClick={()=>getInfomation({name:val.uniqueName || '', position: 1, type: 12})}></span>
+                                        <span className={styles.imgInfo1} onClick={()=>getInfomation({name:val.uniqueName || '', position: 1, type: 12})}></span>
                                       </span>
                                     </td>
                                     {showDetails(val)}

src/components/AddInspect/SlideSelect/index.less

@@ -168,7 +168,7 @@
 .imgInfo {
   position: relative;
 }
-.imgInfo {
+.imgInfo, .imgInfo1 {
   width: 15px;
   height: 17px;
   border-bottom: 0 none !important;
@@ -181,15 +181,18 @@
   display: none;
   cursor: pointer;
 }
-.imgInfo:hover {
-  background: url('../img/info3.png') no-repeat center center;
-  background-size: 100% auto; 
-}
+.imgInfo1 {
+    top: -13px;
+  }
+  .imgInfo:hover, .imgInfo1:hover {
+    background: url('../img/info3.png') no-repeat center center;
+    background-size: 100% auto; 
+  }
 .tagSpan {
   position: relative;
 }
 .tagSpan:hover {
-  .imgInfo {
-    display: block;
-  }
+    .imgInfo, .imgInfo1 {
+        display: block;
+      }
 }

src/components/PushItems/DetailsModal/index.jsx

@@ -66,7 +66,7 @@ class DetailsModal extends Component {
                                         <span className={styles['details-content-title-name']}>{item.title}</span>
                                         <div className={styles['details-content-title-line']}></div>
                                     </div>
-                                    <div dangerouslySetInnerHTML ={{__html: item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)}}></div>
+                                    <pre dangerouslySetInnerHTML ={{__html: item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)}}></pre>
                                 </div>)
                             })}
                             

src/components/PushItems/DetailsModal/index.less

@@ -67,7 +67,6 @@
     height: 100%;
     padding: 0 180px 0 40px;
     overflow-y: auto;
-    white-space:pre;
     ul, ol {
         padding: 0 0 0 15px;
       }
@@ -132,3 +131,8 @@
     filter:alpha(opacity=60);
     -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=60);";
 }
+pre {
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    font-family: inherit;
+  }

src/components/PushItems/TipsMsg/index.jsx

@@ -45,7 +45,7 @@ class TipsMsg extends Component {
                             __html: item.title
                           }}
                         />
-                        <div
+                        <pre
                           dangerouslySetInnerHTML={{
                             __html: item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)
                           }}

src/components/PushItems/TipsMsg/index.less

@@ -12,7 +12,7 @@
    ol li{
     list-style: decimal;
   }
-  white-space:pre;
+
   border:1px solid #EAEDF1;
     .tips-title,h1{
       font-size: 14px;
@@ -132,4 +132,9 @@
     img {
       display: none;
     }
+    pre {
+      white-space: pre-wrap;
+      word-wrap: break-word;
+      font-family: inherit;
+    }
   }

src/components/TreatDesc/DrugInfo/index.jsx

@@ -62,7 +62,7 @@ class DrugInfo extends Component {
                     {drugInfo.drugDesc.map((item, index) =>{
                         return <div className={style['drug-desc-item']} id={item.title.trim()}>
                             <div className={style['drug-desc-title']} >{item.title.trim()}</div> 
-                            <div className={style['drug-desc-content']} dangerouslySetInnerHTML ={{__html: item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)}}></div> 
+                            <pre className={style['drug-desc-content']} dangerouslySetInnerHTML ={{__html: item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)}}></pre> 
                         </div>
                     })}
                     <div className={style['content-menu-box']}>

src/components/TreatDesc/DrugInfo/index.less

@@ -13,7 +13,6 @@
     box-shadow: 0px 0px 5px -2px #7d7c7c;
     word-break: break-all;
     max-width: 100%;
-    white-space:pre;
     ul, ol {
         padding: 0 0 0 15px;
       }
@@ -135,4 +134,9 @@
     margin-top: 5px;
     background-color: #eee;
     margin-right: 10px;
-}
+}
+pre {
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    font-family: inherit;
+  }

src/store/actions/checkBody.js

@@ -505,6 +505,8 @@ export function backspaceText(state,action){
       data.splice(delIndex,1);
       res.selecteds.splice(delIndex,1);      //杂音类样式选中状态对应
       res.saveText.splice(delIndex,1);
+    }else if(!data[delIndex+1]){//最后一个文本标签不删除
+      
     }
     else{
       handleLocalDelTag(4,delIndex,data[delIndex+1]);

src/store/actions/currentIll.js

@@ -913,6 +913,8 @@ export function backspaceText(state,action){
       data.splice(delIndex,1);
       res.selecteds.splice(delIndex,1);      //杂音类样式选中状态对应
       res.saveText.splice(delIndex,1);
+    }else if(!data[delIndex+1]){//最后一个文本标签不删除
+      // console.log("删除最后一个啦");
     }
     else{
       handleLocalDelTag(2,delIndex,data[delIndex+1]);

src/store/actions/mainSuit.js

@@ -857,6 +857,8 @@ export function backspaceText(state,action){
     }else if(data[delIndex+1] && data[delIndex+1].tagType==8){
       data.splice(delIndex,1);
       res.saveText.splice(delIndex,1);
+    }else if(data[delIndex-1] && data[delIndex-1].tagType !=8){//最后一个文本标签
+      console.log("删除最后一个啦")
     }
     else{
       handleLocalDelTag(1,delIndex,data[delIndex+1]);

src/store/actions/otherHistory.js

@@ -476,6 +476,8 @@ export function backspaceText(state,action){
       data.splice(delIndex,1);
       res.selecteds.splice(delIndex,1);      //杂音类样式选中状态对应
       res.saveText.splice(delIndex,1);
+    }else if(!data[delIndex+1]){//最后一个文本标签不删除
+      
     }
     else{
       //月经史删除处理