bug2857

src/common/components/EditableSpan/index.jsx

@@ -357,10 +357,12 @@ class EditableSpan extends Component{
     const hasBr = br?style['editable-br']:'';       //最后一个体征标签换行
     const selectedArea = mouseSelect?style['selected-area']:'';
     const $span = this.$span.current;
+    const val = $span&&$span.innerText.trim();
     if(br&&$span&&!$span.innerText){
       this.$span.current.innerHTML=' ';
     }
-    return classNames(style['editable-span'],isFull,unselect,hasBr,setFontColorSize(2,6),selectedArea);
+    
+    return classNames(style['editable-span'],isFull,unselect,hasBr,setFontColorSize(2,unselect?8:6),selectedArea);
   }
 
   render() {

src/store/reducers/assistCheck.js

@@ -43,16 +43,18 @@ export default (state = initSearchList, action) => {
       }
     }
     newState.assistLabel = [...tempArr]
-    newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
-    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
+    let tmpObj = getAllString(newState.checkedListImport,newState.assistLabel)
+    newState.dataString = tmpObj.str
+    newState.dataArr = tmpObj.arr
     return newState;
   }
   if (action.type == GET_ASSIST_SEARCH_LIST) { //右侧推送添加到左侧
     const newState = Object.assign({}, state);
     newState.list = action.list
     newState.assistVal = action.val
-    newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
-    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
+    let tmpObj = getAllString(newState.checkedListImport,newState.assistLabel)
+    newState.dataString = tmpObj.str
+    newState.dataArr = tmpObj.arr
     return newState;
   }
   if (action.type == GET_ASSIST_LABEL) { //默认
@@ -73,8 +75,9 @@ export default (state = initSearchList, action) => {
         newState.assistLabel = [...tempArrs];
       }
     }
-    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
-    newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
+    let tmpObj = getAllString(newState.checkedListImport,newState.assistLabel)
+    newState.dataArr = tmpObj.arr
+    newState.dataString = tmpObj.str
     return newState;
   }
   if (action.type == DEL_ASSIST_LABEL) { //删除
@@ -91,8 +94,9 @@ export default (state = initSearchList, action) => {
       }
       newState.assistLabel = [...tempArrs]
     }
-    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
-    newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
+    let tmpObj = getAllString(newState.checkedListImport,newState.assistLabel)
+    newState.dataArr = tmpObj.arr
+    newState.dataString = tmpObj.str
     return newState;
   }
   if (action.type == CHANGE_ASSIST_VAL) { //改变输入值
@@ -104,8 +108,9 @@ export default (state = initSearchList, action) => {
         newState.assistLabel = [...tempArr]
       }
     }
-    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
-    newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
+    let tmpObj = getAllString(newState.checkedListImport,newState.assistLabel)
+    newState.dataArr = tmpObj.arr
+    newState.dataString = tmpObj.str
     return newState;
   }
   if (action.type == CHANGE_DATE) { //新增
@@ -117,8 +122,9 @@ export default (state = initSearchList, action) => {
         newState.assistLabel = [...tempArr]
       }
     }
-    newState.dataArr = getAllString(newState.checkedListImport,newState.assistLabel,1)
-    newState.dataString = getAllString(newState.checkedListImport,newState.assistLabel)
+    let tmpObj = getAllString(newState.checkedListImport,newState.assistLabel)
+    newState.dataArr = tmpObj.arr
+    newState.dataString = tmpObj.str
     return newState;
   }
   if (action.type == CLEAR_ASSIST_DATA) {
@@ -126,6 +132,9 @@ export default (state = initSearchList, action) => {
     newState.assistLabel = [...action.data];
     newState.dataString = action.saveText;
     newState.checkedListImport = action.checkedListImport;
+    if(action.checkedListImport.length == 0&&action.data.length==0){
+      newState.dataArr = [];
+    }
     return newState;
   }
   return state;

src/utils/tools.js

@@ -1369,7 +1369,7 @@ function getPushLists(data1,data2){     //推送数据
 }
 
 function getAllString(checkedListImport,assistLabel,flg){
-  let tmpImportLis = [],tmpString='',tmpArr=[];
+  let tmpImportLis = [],tmpString='',tmpArr=[],tmpObj={};
   for(let i = 0;i < checkedListImport.length;i++){
     for(let j = 0;j < checkedListImport[i].length;j++){
       tmpImportLis.push(checkedListImport[i][j])
@@ -1379,20 +1379,24 @@ function getAllString(checkedListImport,assistLabel,flg){
   for (let i = 0; i < tempArr.length; i++) {
     let tmpVal = tempArr[i].value ? tempArr[i].value.trim() : tempArr[i].value;
     let obj = {
-      "dateValue": tempArr[i].time,
+      "dateValue": tempArr[i].time||"",
       "name": "",
-      "uniqueName": tempArr[i].name,
-      "desc": tempArr[i].value,
-      "result": tempArr[i].value,
+      "uniqueName": tempArr[i].name||"",
+      "desc": tempArr[i].value||"",
+      "result": tempArr[i].value||"",
     }
     tmpArr.push(obj)
     tmpString += (tempArr[i].name + (tmpVal ? (':' + tmpVal) + ', ' : ': ') + (tempArr[i].time ? '报告日期:' + tempArr[i].time : '') + '^;')
   }
-  if(flg){
-    return tmpArr;
-  }else{
-    return tmpString;
+  return tmpObj = {
+    arr:tmpArr,
+    str:tmpString
   }
+  // if(flg){
+  //   return tmpArr;
+  // }else{
+  //   return tmpString;
+  // }
 }
 
 // 模板中处理tagType==4的数据
@@ -1534,6 +1538,8 @@ const setFontColorSize = (flg,pacs) => {
         }else if(pacs == 5){
           classStr = `largeFontSize specialSize`
         }else if(pacs == 6){
+          classStr = `largeFontSize`
+        }else if(pacs == 8){
           classStr = `simpleColor largeFontSize`
         }else if(pacs == 7){
           classStr = `largeFontSize fontWeight`