模板保存问题

src/components/Operation/index.jsx

@@ -9,7 +9,7 @@ import PreviewContainer from '@containers/PreviewContainer';
 import { ConfirmModal, Notify } from '@commonComp';
 import check_circle from './img/check-circle.png';
 import check_right from './img/check-right.png';
-import {getAllDataList,getAllDataStringList,isAllClear,filterDataArr,readyKeepHistory} from '@utils/tools';
+import {getAllDataList,getAllDataStringList,isAllPartClear,isAllClear,filterDataArr,readyKeepHistory} from '@utils/tools';
 import {dragBox} from '@utils/drag';
 import store from '@store';
 import $ from 'jquery';
@@ -95,7 +95,7 @@ class Operation extends Component {
     let baseList = store.getState();
     let jsonData = getAllDataList(baseList);
     let jsonStr = getAllDataStringList(baseList);
-    let flg = isAllClear(jsonData,jsonStr,baseList);
+    let flg = isAllPartClear(jsonData,jsonStr,baseList);
     if(flg){
       this.setState({
         type: type,
@@ -155,7 +155,7 @@ class Operation extends Component {
     let jsonStr = getAllDataStringList(baseList);
     let whichSign = baseList.typeConfig.typeConfig;
     let tmpLis = baseList.tabTemplate.items;
-    let flg = isAllClear(jsonData,jsonStr,baseList)
+    let flg = isAllClear(jsonStr)
     if(!flg){
       Notify.info('模板数据不能为空')
       return false

src/store/async-actions/diagnosticList.js

@@ -37,7 +37,7 @@ export const isChronicMag = (item) => {
         const state = getState();
         let jsonData = getAllDataList(state);
         let jsonStr = getAllDataStringList(state);
-        let flg = isAllClear(jsonData,jsonStr,state);
+        let flg = isAllClear(jsonStr);
         if(!flg) {
              // 从缓存取慢病列表
              let chronicList = JSON.parse(storageLocal.get('chronic'));

src/utils/tools.js

@@ -702,8 +702,25 @@ function didPushParamChange(){
   }
   return true;
 }
-//判断页面所有数据是否为空
-function isAllClear(jsonData,jsonStr,baseList){
+//判断模板保存时文本数据是否为空
+function isAllClear(jsonStr){
+  if (      //结构化和文本数据都为空
+    filterDataArr(JSON.parse(jsonStr.chief)) == '' &&
+    filterDataArr(JSON.parse(jsonStr.present)) == '' &&
+    filterDataArr(JSON.parse(jsonStr.other)) == '' &&           //这里都是filterDataArr不是filterArr，要去符号的
+    filterDataArr(JSON.parse(jsonStr.vital)) == '' &&
+    jsonStr.diag == '' &&
+    jsonStr.lis == '' &&
+    jsonStr.pacs == '' &&
+    jsonStr.advice == ''
+  ) {
+    return false;
+  }else{
+    return true;
+  }
+}
+//判断页面所有数据是否为空，包括空标签
+function isAllPartClear(jsonData,jsonStr,baseList){
   if (      //结构化和文本数据都为空
     JSON.stringify(jsonData.advice) == '{}' &&
     jsonData.chief.length < 1 &&
@@ -1438,5 +1455,6 @@ module.exports = {
     resetTagtype,
     handleLocalDelTag,
     shiftLocalDelTag,
-    setPosition
+    setPosition,
+    isAllPartClear
 };