|
@@ -154,7 +154,6 @@ class Operation extends Component {
|
|
|
let jsonStr = getAllDataStringList(baseList);
|
|
|
let whichSign = baseList.typeConfig.typeConfig;
|
|
|
let tmpLis = baseList.tabTemplate.items;
|
|
|
-
|
|
|
let flg = isAllClear(jsonData,jsonStr,baseList)
|
|
|
if(!flg){
|
|
|
Notify.info('模板数据不能为空')
|
|
@@ -166,8 +165,9 @@ class Operation extends Component {
|
|
|
for(let i = 0;i <tmpLis.length;i++){
|
|
|
let dataStr = tmpLis[i].preview;
|
|
|
// let dataJson = tmpLis[i].dataJson;
|
|
|
- // console.log(jsonStr.chief , JSON.stringify(eval('('+JSON.parse(dataStr).chief+')')))
|
|
|
+ // console.log(jsonStr.diag , JSON.parse(dataStr).diag)
|
|
|
if(whichSign == 0){
|
|
|
+ // console.log(filterDataArr(JSON.parse(jsonStr.present)) , filterDataArr(JSON.parse(JSON.parse(dataStr).present)))
|
|
|
if(
|
|
|
filterDataArr(JSON.parse(jsonStr.chief)) == filterDataArr(eval('('+JSON.parse(dataStr).chief+')')) &&
|
|
|
filterDataArr(JSON.parse(jsonStr.present)) == filterDataArr(eval('('+JSON.parse(dataStr).present+')')) &&
|
|
@@ -195,7 +195,6 @@ class Operation extends Component {
|
|
|
Notify.info('该模板已保存');
|
|
|
return false;
|
|
|
}
|
|
|
-
|
|
|
}else if(whichSign == 1){
|
|
|
if(
|
|
|
jsonStr.chief == JSON.stringify(eval('('+JSON.parse(dataStr).chief+')')) &&
|