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

src/components/ChronicInfo/index.jsx

@@ -222,9 +222,9 @@ class ChronicInfo extends React.Component{
     chronicMagItem&&this.handleAddAssessItem(v,pIndex,i);
   }
   handleReg(e){   //只能输入数字
-    const hasDot = e.target.value.indexOf('.')!=-1;
+    //const hasDot = e.target.value.indexOf('.')!=-1;
     const key = e.key;
-    if(key!='Backspace'&&((/[^\d]/.test(key)&&key!='.')||(key=='.'&&(hasDot||!e.target.value)))){
+    if(key!='Backspace'&&((/[^\d|.\/%*~]/.test(key)))){
       e.preventDefault();
     }
   }
@@ -233,10 +233,10 @@ class ChronicInfo extends React.Component{
     let obj = deepClone(calcuValues);
     let values = (obj&&obj[id])||deepClone(calcuContent);
     const txt = e.target.value;
-    values[i].value = txt.replace(/[\u4e00-\u9fa5]|[^\d|.]/g,'');       //处理中文输入法的情况
+    values[i].value = txt.replace(/[\u4e00-\u9fa5]|[^\d|.\/%*~]/g,'');       //处理中文输入法的情况
     obj[id] = values;
-    if(/[\u4e00-\u9fa5]|[^\d|.]/g.test(txt)){
-      e.target.value = txt.replace(/[\u4e00-\u9fa5]|[^\d|.]/g,'');
+    if(/[\u4e00-\u9fa5]|[^\d|.\/%*~]/g.test(txt)){
+      e.target.value = txt.replace(/[\u4e00-\u9fa5]|[^\d|.\/%*~]/g,'');
     }
     this.setState({
       isCalculated:false,

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -50,7 +50,6 @@ class HistoryCaseContainer extends React.Component {
       }else{
         tmpItems=items[idx]
       }
-      console.log(tmpItems)
       this.setState({
         activeId:idx,
         activeHis:tmpItems,

src/components/MultSpread/index.jsx

@@ -198,7 +198,9 @@ class MultSpread extends Component{
     const {saveAddItem,fullData,copyId,showAdd} = this.props;
     if(showAdd){
       const data = tools.deepClone(fullData);
+    setTimeout(function(){        //修改个别历史病例引用报错bug
       saveAddItem&&saveAddItem(copyId,data);
+    })
     }
   }
   getContClass(){
@@ -218,7 +220,7 @@ class MultSpread extends Component{
                  ref = {this.$cont}
                  contentEditable={this.state.editable}
                  onBlur={this.handleEdit}
-                 onkeydown={tools.handleEnter}>
+                 onKeyDown={tools.handleEnter}>
       {textPrefix?<span>{textPrefix}</span>:''}
       <div className={this.getClass()}>
       {this.getLabels()}

src/containers/MultSpread.js

@@ -58,9 +58,9 @@ function mapDispatchToProps(dispatch){
         num:1
       });
     },
-    saveAddItem(id,data){       //保存有加号的标签原始数据
+    saveAddItem(id,data){      //保存有加号的标签原始数据
       dispatch({
-        type: SETADDITEMINIT,
+        type:SETADDITEMINIT,
         id,
         data
       });

src/containers/eleType.js

@@ -123,7 +123,6 @@ function multLabels(params){
                      ikey={boxMark+'-'+i}
                      selecteds={selecteds&&selecteds[i]}
                      saveText={saveText}
-                     /*name={data.name||data.tagName}*/
                      textPrefix={data.prefix}
                      textSuffix={data.suffix}></MultSpread>
 }