主诉常见症状修改；键盘左右方向键移动光标完善；多选组件确定按钮样式修改；英文逗号改中文

src/common/components/EditableSpan/index.jsx

@@ -146,6 +146,7 @@ class EditableSpan extends Component{
 
   handleKeydown(e){
     const ev = e||window.event;
+    const {i} = this.props;
     const target = ev.target||ev.srcElement;
     let innerVal = target.innerText;
     //禁止回车事件
@@ -160,17 +161,27 @@ class EditableSpan extends Component{
     let range = window.getSelection();
     let textIndex = range.focusOffset;
     let textLength = range.anchorNode.length;
-    if(ev.keyCode==37){//向左
+    if(ev.keyCode==37&& i!=0){//向左
       let preObj = $(this.$span.current).prev();
       let obj = preObj[0]&&preObj[0].nodeName=="DIV"?preObj.prev():preObj;
       if(textIndex == 0){
+        if(ev.preventDefault){//阻止默认事件
+          ev.preventDefault();
+        }else{
+          ev.returnValue=false;
+        } 
         this.moveEnd(obj[0]);
       }
     }
     if(ev.keyCode==39){//向右
       let nextObj = $(this.$span.current).next();
       let obj = nextObj[0]&&nextObj[0].nodeName=="DIV"?nextObj.next():nextObj;
-      if(textIndex == textLength){
+      if(textIndex == textLength || textLength==undefined){
+        if(ev.preventDefault){//阻止默认事件
+          ev.preventDefault();
+        }else{
+          ev.returnValue=false;
+        }
         obj.focus();
       }
     }

src/common/less/variables.less

@@ -97,6 +97,8 @@
   text-align: center;
   cursor: pointer;
   margin-left: 22px;
+  position: relative;
+  bottom: -10px;
 }
 .confirm{
   width: 120px;
@@ -104,13 +106,17 @@
   line-height: 44px;
   color:@blue;
   font-size: 12px;
-  border: 1px solid @blue;
+  // border: 1px solid @blue;
   background: #fff;
   margin-left: 20px;
   float: right;
   outline: none;
-  text-align: center;
+  text-align: right;
   cursor: pointer;
+  font-weight: bold;
+  position: relative;
+  bottom: -10px;
+  padding-right: 10px;
 }
 :global(.red){
   color: @red;

src/components/CommonSymptom/index.jsx

@@ -48,13 +48,13 @@ class CommonSymptom extends Component{
     const id = item.questionId
     if(ids.includes(id)){
       ids.splice(ids.indexOf(id),1);
-      let selectData = select;
+      let selectData = select;  
       select.forEach((it,i)=>{
-        if(it.id==id){
+        if(it.questionId==id){
          selectData.splice(i,1); 
         }
       })
-      select = selectData;
+      select = selectData; 
     }else{
       ids.push(id);
       select.push(item);

src/components/CommonSymptom/index.less

@@ -37,11 +37,14 @@
   .clear{
     .clear;
     margin-left: 15px;
+    bottom: 0;
   }
   .confirm{
     .confirm;
     width: 75px;
     margin-left: 15px;
+    bottom: 0;
+    padding-right: 20px;
   }
   .oper{
     margin-top: 5px;

src/components/CurrentIll/index.jsx

@@ -105,7 +105,7 @@ class CurrentIll extends Component{
       }
       leftL = ele.offsetLeft+90
     }
-    console.log(getPageCoordinate(e).boxTop)
+    // console.log(getPageCoordinate(e).boxTop)
     getSearchLocation(getPageCoordinate(e).boxTop,leftL)
     this.setState({
       // boxLeft:getPageCoordinate(e).boxLeft,

src/config/index.js

@@ -19,7 +19,7 @@ export default {
     },
     textId:'text',        //自由文本标签的id,
     textLabel:'{"tagType":"8","id":"","name":""}',
-    _textLabel:'{"tagType":"8","id":"","name":","}',//查体每个标签后面加逗号（1-29）
+    _textLabel:'{"tagType":"8","id":"","name":"，"}',//查体每个标签后面加逗号（1-29/改成中文逗号3-18）
     tagType:"8",
     tongYId:7,      //主诉通用特征描述id
     addSId:8,      //主诉添加症状id

src/store/actions/currentIll.js

@@ -174,7 +174,7 @@ export const setData = (state,action) =>{
               if(items.length==0){//没有尾巴时给症状后加逗号(3.5)
                 for(let j=0; j<newMainCopy.length; j++){
                   if(newMainCopy[j].id==mainCopy[k].id){
-                    newMainCopy[j].value = newMainCopy[j].name = mainCopy[k].value+',';
+                    newMainCopy[j].value = newMainCopy[j].name = mainCopy[k].value+'，';
                   }
                 }
               }       
@@ -222,7 +222,7 @@ export const setData = (state,action) =>{
               if(items.length==0){//没有尾巴时给症状后加逗号(3.5)
                 for(let j=0; j<newWiths.length; j++){
                   if(newWiths[j].id==mainCopy[d].id){
-                    newWiths[j].value = newWiths[j].name = withs[d].value+',';
+                    newWiths[j].value = newWiths[j].name = withs[d].value+'，';
                   }
                 }
               }
@@ -269,7 +269,7 @@ export const setData = (state,action) =>{
               if(items.length==0){//没有尾巴时给症状后加逗号(3.5)
                 for(let j=0; j<featureData.length; j++){
                   if(featureData[j].id==symptomFeature[k].id){
-                    featureData[j].value = featureData[j].name = symptomFeature[k].value+',';
+                    featureData[j].value = featureData[j].name = symptomFeature[k].value+'，';
                   }
                 }
               }

src/store/actions/mainSuit.js

@@ -98,7 +98,7 @@ export const insertMain = (state,action) => {
   if(items.length>1){
     for(let i=1; i<items.length; i++){
       items[i].name = '、'+items[i].name;
-      items[i].value = '、'+items[i].value;
+      items[i].value = items[i].value?'、'+items[i].value:items[i].name;
     } 
   }
   let obj = [];