|
@@ -301,7 +301,7 @@ app.controller('notificationCtr', ["$rootScope", "$scope", "$state", "$timeout",
|
301
|
alert("通知内容【" + filterArr[i].tabName + "】不能为空!");
|
301
|
alert("通知内容【" + filterArr[i].tabName + "】不能为空!");
|
302
|
return;
|
302
|
return;
|
303
|
} else {
|
303
|
} else {
|
304
|
- var nowArr = [...new Set([...filterArr[i].processContent.match(/\[\$[^\$\[\]]*?\$\]/g), ...$scope.varArr])];
|
|
|
|
|
304
|
+ var nowArr = [...new Set([...(filterArr[i].processContent.match(/\[\$[^\$\[\]]*?\$\]/g) || []), ...$scope.varArr])];
|
305
|
if (nowArr.length !== $scope.varArr.length) {
|
305
|
if (nowArr.length !== $scope.varArr.length) {
|
306
|
alert("【" + filterArr[i].tabName + "】请填写有效的变量名称!");
|
306
|
alert("【" + filterArr[i].tabName + "】请填写有效的变量名称!");
|
307
|
return;
|
307
|
return;
|