s

template.js

@@ -107,10 +107,10 @@ try {
 	if (/yes/ig.test(par.auto_save)) { 
 		GEN.checkInout({ job: job, mode: "out" }); 
 		GEN.saveJob({ job: job }); 
+		GEN.checkInout({ job: job, mode: "in" });
 	} 
-	GEN.checkInout({ job: job, mode: "in" });
 	
-	// 结尾返回 固定写法
+	// 结尾返回  固定写法
 	var Return = "Done"
 	if (mode === "aimdfm") {
 		IKM.crud("updateRow", {
@@ -126,7 +126,7 @@ try {
 		resultData.push(tmperr);
 		Return = { status: Status, result_data: resultData };
 	}
-	return Return
+	_Return_Label_ = Return
 } catch (e) {
 	if(GEN.STATUS.length > 0) {
 		IKM.msg(GEN.STATUS.join("\n")); 
@@ -134,40 +134,44 @@ try {
 	IKM.msg(e); 
 	Status = 'error';
 	resultData.push({ type: "error", title: "脚本执行出错!", detail: [{ desc: _.toString(e) }] });
-	return (mode === "aimdfm") ? { status: Status, result_data: resultData } : "Error";
+	_Return_Label_ = (mode === "aimdfm") ? { status: Status, result_data: resultData } : "Error";
 }
 
-// 获取层别
-// func (Object) ([]string)
-function getLayer(props){ // 获取层
-    if (!props) {
-    	return
-    }
-    if (!props.context) {
-    	props.context = "board"
-    }
-    var matrix = GEN.getMatrix({job:job})
-    return Object.keys(matrix).reduce(function(a,b){
-        var info = matrix[b];
-        var ret = true;
-        for (var key in props) {
-        	if (info[key]) {
-				if(/string/ig.test(typeof props[key])){
-					var reg = new RegExp(props[key],"ig")
-					if(!reg.test(info[key])){
-						ret = false
+/**
+ * 获取层别
+ * @param {Object} 过滤选项
+ * @returns {Array}
+ */
+ function getLayer(props) {
+	if (!props) {
+		props = {};
+	}
+	var matrix = GEN.getMatrix({ job: job });
+	return Object.keys(matrix).reduce(function (a, b) {
+		var info = matrix[b];
+		var ret = true;
+		for (var _key in props) {
+			if (info[_key]) {
+				if (/object string|object number/ig.test({}.toString.call(props[_key]))) {
+					if (props[_key] != info[_key]) {
+						ret = false;
+					}
+				}
+				if (/object RegExp/ig.test({}.toString.call(props[_key]))) {
+					if (!props[_key].test(info[_key])) {
+						ret = false;
 					}
 				}
-				if(/function/ig.test(typeof props[key])){
-					if(!props[key](info[key])){
-						ret = false
+				if (/object function/ig.test({}.toString.call(props[_key]))) {
+					if (!props[_key](info[_key])) {
+						ret = false;
 					}
 				}
-        	}
-        }
-        if (ret) {
-        	a.push(props.res == "info" ? info : b)
-        }
-        return a
-    },[])
+			}
+		}
+		if (ret) {
+			a.push(props.res == "info" ? info : b);
+		}
+		return a;
+	}, []);
 }
\ No newline at end of file