|
@@ -60,10 +60,11 @@ export default {
|
|
let detailList = this.result;
|
|
let detailList = this.result;
|
|
let currItem = detailList[index];
|
|
let currItem = detailList[index];
|
|
currItem.value = val;
|
|
currItem.value = val;
|
|
- if(val){
|
|
|
|
|
|
+ const notNull=val.match(/\S/g);
|
|
|
|
+ if(notNull){
|
|
this.sure=true;
|
|
this.sure=true;
|
|
}else{
|
|
}else{
|
|
- if(detailList.findIndex((it)=>it.value)!==-1){
|
|
|
|
|
|
+ if(detailList.findIndex((it)=>(it.value||'').match(/\S/g))!==-1){
|
|
this.sure=true;
|
|
this.sure=true;
|
|
}else{
|
|
}else{
|
|
this.sure=false;
|
|
this.sure=false;
|
|
@@ -112,7 +113,7 @@ export default {
|
|
const msg = getExpStr(text);
|
|
const msg = getExpStr(text);
|
|
const msgp = getExpStr(textp);
|
|
const msgp = getExpStr(textp);
|
|
if(result[i].name.indexOf("${")!==-1){
|
|
if(result[i].name.indexOf("${")!==-1){
|
|
- if(result[i].value){
|
|
|
|
|
|
+ if((result[i].value||'').match(/\S/g)){
|
|
tmpResult.push(msg.prefix+(result[i].value||"")+msg.suffix);
|
|
tmpResult.push(msg.prefix+(result[i].value||"")+msg.suffix);
|
|
tmpResultp.push(msgp.prefix+(result[i].value||"")+msgp.suffix);
|
|
tmpResultp.push(msgp.prefix+(result[i].value||"")+msgp.suffix);
|
|
}
|
|
}
|