Browse Source

调整参数检验时获取参数方法,不再漏读

zhuth 8 years ago
parent
commit
3ef71fb62f

+ 1 - 4
kanban-console/src/main/webapp/resources/app/view/boardmodel/modeleditpanel.js

@@ -232,10 +232,7 @@ Ext.define('erp.view.boardmodel.modeleditpanel',{
 		var result = content.match(reg);
 		var params = [];
 		Ext.Array.each(result, function(r) {
-			var rs = reg.exec(r);
-			if(rs) {
-				params.push(rs[1]);
-			}
+			params.push(r.replace('$P{','').replace('}',''));
 		});
 		return params;
 	},

+ 1 - 4
kanban-console/src/main/webapp/resources/app/view/core/trigger/TextTrigger.js

@@ -104,10 +104,7 @@ Ext.define('erp.view.core.trigger.TextTrigger', {
                 var result = content.match(reg);
                 var params = [];
                 Ext.Array.each(result, function(r) {
-                    var rs = reg.exec(r);
-                    if(rs) {
-                        params.push(rs[1]);
-                    }
+                    params.push(r.replace('$P{','').replace('}',''));
                 });
                 return params;
             },