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

src/common/components/EditableSpan/index.less

@@ -5,7 +5,7 @@
   word-break: break-word;
   min-width: 10px;
   // line-height: 2;
-  height: 16px;//火狐需要
+  min-height: 16px;//火狐需要
   line-height: 16px;
   vertical-align: middle;
   text-align: left;

src/components/Advice/Textarea/index.jsx

@@ -57,13 +57,13 @@ class Textarea extends Component {
     return (
       <div>
         <div 
-            style={{outline: 'none'}}
+            style={{outline: 'none',minHeight:'20px'}}
             contenteditable={true}
             ref={this.$dom}
             onInput={this.handleInput}
             onKeyUp={this.handleInput}
             onkeydown={(e) => {e.stopPropagation()}}
-        ></div>
+        > </div>
       </div>
     );
   }

src/components/EmergencyProcedure/EmergencyModal/index.less

@@ -49,6 +49,7 @@
     background-color: #fff;
     box-shadow: 0 10px 20px 0 #989DA3;
     border: 1px solid #dedede;
+    z-index: 1;
     i {
       width: 0;
       height: 0;

src/components/Preview/index.jsx

@@ -25,7 +25,7 @@ class Preview extends Component {
         <div className={style['shade']} onClick={onClose}></div>
         <div className={style['modal']} id="previewWrapper">
           <div id="previewStatic" className={`${style['close']} drag-title`}>预览</div>
-          <img src={close} onClick={onClose} />
+          <img className={style.closeImg} src={close} onClick={onClose} />
           <PreviewBody
               preInfo={preInfo}
               dataJson={dataJson}

src/components/Preview/index.less

@@ -34,7 +34,7 @@
     width: 100%;
     top: 0;
   }
-  img{
+  img.closeImg{
     cursor: pointer;
     position: absolute;
     right: 10px;

src/components/PrintPreview/index.jsx

@@ -27,7 +27,7 @@ class PrintPreview extends Component {
                 <div className={style['shade']} onClick={onClose}></div>
                 <div className={style['modal']} id="previewPrintWrapper">
                     <div id="previewPrintStatic" className={`${style['close']} drag-title`}>打印</div>
-                    <img src={close} onClick={onClose} />
+                    <img className={style.closeImg} src={close} onClick={onClose} />
                     <PreviewBody
                         preInfo={preInfo}
                         dataJson={dataJson}

src/components/PrintPreview/index.less

@@ -34,7 +34,7 @@
       width: 100%;
       top: 0;
     }
-    img{
+    .closeImg{
       cursor: pointer;
       position: absolute;
       top: 10px;

src/components/PushItems/DetailsModal/index.less

@@ -72,9 +72,11 @@
       }
       ul li {
         list-style: disc;
+        list-style-position: inside;
       }
       ol li{
        list-style: decimal;
+       list-style-position: inside;
      }
 }
 .content-menu-box {

src/components/PushItems/PushDiag/index.jsx

@@ -3,7 +3,7 @@ import style from './index.less';
 import DiagnosticItem from '@containers/DiagnosticItem'
 import showImg from "@common/images/show.png";
 import hideImg from "@common/images/close.png";
-
+import $ from 'jquery'
 
 /***
  * 接收参数：
@@ -18,8 +18,10 @@ class PushDiag extends Component {
     constructor(props) {
         super(props)
         this.state = {
-            showMore: true,
+            domH:'',
+            showSlide:true
         }
+        this.$ide = React.createRef()
         this.handleShow = this.handleShow.bind(this)
     }
     componentWillMount() {
@@ -27,37 +29,34 @@ class PushDiag extends Component {
             moreNum: this.props.maxShowNum
         })
     }
-
-    handleShow(ItemNum) {
+    componentDidMount(){
+        let domH = this.$ide.current.offsetHeight
+        this.setState({
+            domH:domH
+        })
+    }
+    handleShow() {
         this.setState({
-            showMore: !this.state.showMore
-        },()=>{
-            this.setState({
-                moreNum: this.state.showMore ?  this.props.maxShowNum : ItemNum
-            })
+            showSlide:!this.state.showSlide
         })
     }
 
     render() {
-        const { icon, title, titleBg,  diagList, maxShowNum } = this.props
-        const { showMore,moreNum } = this.state
+        const { icon, title, titleBg,  diagList } = this.props
+        const { domH,showSlide } = this.state
         let ItemNum = 0;
         return (<div className={style['push-diag-wrapper']}>
             <h1 className={style['push-diag-title']} style={{background:titleBg}}><img className={style['push-diag-icon']} src={icon} />{title}</h1>
-            <div className={style['push-diag-box']}>
-                {maxShowNum ? diagList.map((item, index) => {
-                    ItemNum = ItemNum + item.name.length + 1;
-                    if (ItemNum <= moreNum) {
+            <div className={`${style['push-diag-box']} ${domH>50&&showSlide?style['push-diag-more-slide-d']:style['push-diag-more-slide-u']}`} ref={this.$ide}>
+                {
+                    diagList.map((item, index) => {
+                        ItemNum = ItemNum + item.name.length + 1;
                         return <div key={item.id} className={style['push-diag-item']}><DiagnosticItem item={item} type='disSelect'/></div>
-                    }
-                }) : diagList.map((item, index) => {
-                return <div key={item.id} className={style['push-diag-item']}><DiagnosticItem item={item} type='disSelect'/></div>
-                })}
-                {ItemNum > maxShowNum && <div onClick={() => this.handleShow(ItemNum)} className={style['push-diag-more']}>{showMore ? ' 更多': '收起'}<img className={style['push-diag-more-icon']} src={showMore ? showImg : hideImg}/></div>}
+                    })
+                }
+                {domH>50&&<div onClick={() => this.handleShow()} className={`${style['push-diag-more']} ${showSlide?style['push-diag-more-d']:style['push-diag-more-u']}`}>{showSlide ? ' 更多': '收起'}<img className={style['push-diag-more-icon']} src={showSlide ? showImg : hideImg}/></div>}
 
             </div>
-            
-            
         </div>)
     }
 } 

src/components/PushItems/PushDiag/index.less

@@ -14,7 +14,8 @@
     margin-right: 5px;
 }
 .push-diag-box {
-    padding: 0 0 15px 15px;
+    padding: 5px 0 15px 15px;
+    position: relative;
 }
 .push-diag-item {
     display: inline-block;
@@ -29,6 +30,13 @@
     clear: both;
     margin-top: 10px;
     margin-right: 9px;
+}
+.push-diag-more-d {
+    position: absolute;
+    right: 0;
+    top: 5px;
+}
+.push-diag-more-u {
     float: right;
 }
 .push-diag-box:after{display:block;clear:both;content:"";visibility:hidden;height:0}
@@ -37,4 +45,12 @@
     width: 10px;
     height: 10px;
     position: relative;
+}
+.push-diag-more-slide-d {
+    padding-right: 55px;
+    overflow: hidden;
+    height: 44px;
+}
+.push-diag-more-slide-u {
+    height: auto;
 }

src/components/PushItems/RecommendInspect/index.jsx

@@ -8,7 +8,7 @@ class RecommendInspect extends Component {
     constructor(props) {
         super(props)
         this.state = {
-            showAll: false,
+            showAll: false
         }
         this.renderItem = this.renderItem.bind(this)
     }

src/components/PushItems/TipsMsg/index.less

@@ -8,9 +8,11 @@
    }
    ul li {
      list-style: disc;
+     list-style-position: inside;
    }
    ol li{
     list-style: decimal;
+    list-style-position: inside;
   }
 
   border:1px solid #EAEDF1;

src/components/PushItems/index.jsx

@@ -199,7 +199,6 @@ class PushItems extends Component {
                 icon={doubtImg}
                 title="初步诊断"
                 diagList={doubt}
-                maxShowNum={24}
               />
             )}
             {possible && possible.length > 0 && (
@@ -208,7 +207,6 @@ class PushItems extends Component {
                 icon={possibleImg}
                 title="可能诊断"
                 diagList={possible}
-                maxShowNum={24}
               />
             )}
             {likely && likely.length > 0 && (
@@ -217,7 +215,6 @@ class PushItems extends Component {
                 icon={likelyImg}
                 title="鉴别诊断"
                 diagList={likely}
-                maxShowNum={24}
               />
             )}
             <div className={style["diagnose"]}>

src/components/TreatDesc/DrugInfo/index.less

@@ -18,9 +18,11 @@
       }
       ul li {
         list-style: disc;
+        list-style-position: inside;
       }
       ol li{
        list-style: decimal;
+       list-style-position: inside;
      }
 }
 .drug-desc-wrapper {

src/components/WrapModalBody/index.less

@@ -24,6 +24,7 @@
     line-height: 46px;
     background-color: @ipt-bg-color;
     padding: 0 20px;
+    overflow: hidden;
   }
   .items {
     .search {
@@ -103,6 +104,7 @@
     padding: 0 20px;
     position: absolute;
     width: 100%;
+    overflow: hidden;
     span.tip {
       font-size: 12px;
       float: left;

src/components/WrapModalBodyPac/index.less

@@ -24,6 +24,7 @@
     line-height: 46px;
     background-color: @ipt-bg-color;
     padding: 0 20px;
+    overflow: hidden;
   }
   .items {
     .search {