Merge branch 'dev/new1' of http://192.168.2.236:10080/zhouna/newICSS into dev/new1

src/common/components/ItemBox/index.jsx

@@ -57,17 +57,13 @@ componentWillReceiveProps(nextP){
         that.context.scrollArea&&that.context.scrollArea.refresh();
       });
     }
-    //bug2276,FF26初始光标位置问题
-    if(!nextP.children&&!nextP.fuzhen){
-      this.$div.current.innerHTML='';
-    }
 }
   render(){
     const {title,children,editable,className,handleFocus,fuzhen,border,handleBlur,titleTop,backgroundColor,boxId} = this.props;
     return <div className={style["box"]+" "+"clearfix"} >
       <div className={style["title"] + ' '+(className||'')} style={{marginTop:titleTop?'22px':''}}>{title}</div>
       <div ref={this.$div} className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:''}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={editable?handleFocus:null} onInput={this.handleInput} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur} id={boxId} onkeydown={handleEnter}>
-        {fuzhen?children||fuzhen||'':children||''}
+        {fuzhen?children||fuzhen:children}
       </div>
     </div>
   }

src/common/components/NumberPan/index.jsx

@@ -46,7 +46,7 @@ class NumberPan extends Component{
     const text = value.substring(0,len);
     this.setState({
       value:text
-    });console.log(text)
+    });
     onSelect&&onSelect(text);
   }
   getStyle(){
@@ -58,8 +58,11 @@ class NumberPan extends Component{
     }
   }
   componentWillReceiveProps(next){
+    //超过范围后重新打开下拉点删除，显示原值bug修改
     if(next.toClear&&!this.props.toClear){
-      this.handleClear();
+      this.setState({
+        value: this.props.value
+      });
     }
   }
   render(){

src/components/MainSuit/index.jsx

@@ -294,7 +294,7 @@ class MainSuit extends Component{
       handleBlur={this.handleBlur}
       data={datas}
       boxId="mainSuit">
-        {datas.length>0?<div style={{display:'inline-block'}}>{this.getInlineTag()}</div>:(saveText[0]?saveText[0]:'')}
+        {''}{datas.length>0?<div style={{display:'inline-block'}}>{this.getInlineTag()}</div>:(saveText[0]?saveText[0]:'')}
       </ItemBox>
       {/*没有推送结果就不显示*/}
       {symptomFlag && !searchFlag ? <CommonSymptom data={CommonSymptoms} show={!totalHide&&symptom} onSelect={this.handleSelect} /> : ( searchFlag ? <SearchDrop data={searchData} show={!commSymHide} onSelect={this.handleSearchSelect} left={boxLeft1} top={boxTop1} mainEmpty={datas.length==0?true:false}/>:"")}

src/components/NumberDrop/index.jsx

@@ -264,6 +264,7 @@ class NumberDrop extends Component{
       <NumberPan handleSelect={this.select.bind(this)}
                  noString={formulaCode?true:false}
                  onClose={handleHide}
+                 value={this.state.value}
                  show={show}
                  toClear={!hasSelect}/>
     </div>