11

src/common/components/EditableSpan/index.jsx

@@ -125,7 +125,9 @@ class EditableSpan extends Component{
       if(innerVal !==preVal){return}
       let data = innerVal.trim();
       //判断是否为空、中英文：, 。、；,且不是第一位
-      if(i!==0 &&data==""||data==","||data=="，"||data==":"||data=="："||data=="."||data=="。"||data=="、"||data==";"||data=="；"){
+      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});
       }
     }

src/components/AddInspect/index.jsx

@@ -78,10 +78,11 @@ class Inspect extends React.Component {
     componentDidMount() {
         $(document).click((event) => {
             let searchWrap = $('#searchWrap')[0];   // 搜索按钮
+            let searchImg = $('#addImg')[0];   // +号按钮
             let searchOption = $('#searchOption')[0];   // 搜索列表
             let inspectFill = $('#inspectFill')[0];         // 公共填写单
             if(searchOption){
-                if ( searchOption != event.target && searchWrap != event.target && !$.contains(searchOption, event.target)) { // Mark 1
+                if ( searchOption != event.target && searchWrap != event.target && searchImg != event.target && !$.contains(searchOption, event.target)) { // Mark 1
                     this.setState({ show: false });
                 }
             }
@@ -105,7 +106,6 @@ class Inspect extends React.Component {
     handleSearchShow(e) {
         let tmpShow = this.state.show;
         this.setState({ show: !tmpShow })
-        console.trace(789,this.state.show);
         // e.stopPropagation();
     }
     handleFillShow(e,idx) {
@@ -376,7 +376,7 @@ class Inspect extends React.Component {
                     </ul>
                 </div>
                 <div style={{position:"relative"}}>
-                    <img src={more} style={{verticalAlign:'middle',marginRight:'2px'}}/>
+                    <img src={more} id="addImg" style={{verticalAlign:'middle',marginRight:'2px'}} onClick={(e) => this.handleSearchShow(e)}/>
                     <span id="searchWrap" className={`${styles.staticTag}`} onClick={(e) => this.handleSearchShow(e)}>添加化验项</span>
                     <SearchOption handleChangeValue={handleChangeValue} visible={this.state.show}>
                         {this.getSearchList(list)}

src/components/CurrentIll/index.jsx

@@ -36,7 +36,7 @@ class CurrentIll extends Component{
     // 判断主诉是否为空
     const {mainData,mainText,setData,moduleNum,mainIds,data,changeEditIll,editClear} = this.props;
     const that = this;
-    let mainFinallyText = filterDataArr(mainText);console.log(88,mainText,mainFinallyText);
+    let mainFinallyText = filterDataArr(mainText);
     // if(mainData.length == 0 && !mainText[0]){
     if(!mainFinallyText){
       //弹窗提醒