liucf 6 gadi atpakaļ
vecāks
revīzija
adc853a4b7

+ 10 - 5
src/common/components/EditableSpan/index.jsx

@@ -23,7 +23,8 @@ class EditableSpan extends Component{
       clearTimer:null,
       oldText:props.value,
       labelVal:'',  //存放标签原有的值--主诉字数限制用
-      preVal:''
+      preVal:'',
+      index:null
     };
     this.$span = React.createRef();
     this.handleFocus = this.handleFocus.bind(this);
@@ -38,7 +39,8 @@ class EditableSpan extends Component{
     let text = e.target.innerText;
     setFocusIndex&&setFocusIndex({i,boxMark,dom:this.$span});
     this.setState({
-      labelVal:text
+      labelVal:text,
+      index:i
     });
   }
   onChange(e){
@@ -119,7 +121,7 @@ class EditableSpan extends Component{
   }
   handleKeyup(e){
      const {boxMark,handleKeydown,i,value} = this.props;
-     const {preVal} = this.state;
+     const {preVal,index} = this.state;console.log(22,i,index);
     let innerVal = e.target.innerText;
     if(e.keyCode==8){
       if(innerVal !==preVal){return}
@@ -127,8 +129,11 @@ class EditableSpan extends Component{
       //判断是否为空、中英文:, 。、;,且不是第一位
       let pattern = new RegExp(/^\,?$|^\,?$|^\.?$|^\。?$|^\、?$|^\;?$|^\;?$|^\:?$|^\:?$\s/);
       // if(i!==0 &&data==""||data==","||data==","||data==":"||data==":"||data=="."||data=="。"||data=="、"||data==";"||data==";"){
-      if(i!==0 && pattern.test(data)){
-        handleKeydown&&handleKeydown({boxMark,i});
+      if(index!==0 && pattern.test(data)){
+        handleKeydown&&handleKeydown({boxMark,i:index});
+        this.setState({
+          index:index-1
+        })
       }
     }
     

+ 1 - 1
src/components/AddAssistCheck/index.jsx

@@ -129,7 +129,7 @@ class AddAssistCheck extends React.Component {
                         <div>
                             <p>报告日期:<span>{item.time || this.state.dateTime}</span></p>
                             <i onClick={()=>this.handleShowDate(idx)}></i>
-                            <a href="javascript:void(0);" onClick={(idx)=>{this.handleDelClick(idx)}}></a>
+                            <a href="javascript:void(0);" onClick={()=>{this.handleDelClick(idx)}}></a>
                             <div style={{display:this.state.date && idx == this.state.active?"block":"none",position:"relative"}}>
                                 <Calendar isShow={true} handleChange={(info)=>{handleChangeDate(info,idx);this.setState({date:false})}}></Calendar>
                             </div>

+ 3 - 3
src/components/AddInspect/index.jsx

@@ -265,11 +265,11 @@ class Inspect extends React.Component {
             <div className={styles.wrapper}>
                 <div className={styles.check}>
                     {
-                        getExcelDataList.length > 0 && getExcelDataList.map((items,idx)=>{
+                        getExcelDataList.length > 0 && getExcelDataList.map((items,id)=>{
                             return <div style={{marginTop:'10px'}}>
                                 {
                                     items && items.lisExcelRes.length > 0 ? <ul className={styles.excelDataLists}>
-                                    <img className={styles.close} src={close} alt="关闭导入excel数据" onClick={(idx)=>{this.handleDelClick(2,idx)}}/>
+                                    <img className={styles.close} src={close} alt="关闭导入excel数据" onClick={()=>{this.handleDelClick(2,id)}}/>
                                     {
                                         items.lisExcelRes.map((item,idx)=>{
                                             return <li className={styles.excelDataLis} style={{border:items.lisExcelRes.length-1 == idx? 0:''}}>
@@ -368,7 +368,7 @@ class Inspect extends React.Component {
                                             : null
                                         }
                                     </div>
-                                    <img className={styles.partDel} src={close} alt="删除项" onClick={(idx)=>{this.handleDelClick(1,idx)}}/>
+                                    <img className={styles.partDel} src={close} alt="删除项" onClick={()=>{this.handleDelClick(1,idx)}}/>
                                 </li>
                             })
                         }

+ 1 - 1
src/containers/CurrentIll.js

@@ -12,7 +12,7 @@ import {getModule} from '@store/async-actions/fetchModules.js';
 import {didPushParamChange} from '@utils/tools.js';
 
 
-function mapStateToProps(state) {console.log(11,state);
+function mapStateToProps(state) {//console.log(11,state);
   const {homePage} = state;
     return {
         data:state.currentIll.data,//主诉模板