From c840cf9375c0c7e55343f102a3f03704748756c2 Mon Sep 17 00:00:00 2001
From: unknown <caixiangyi@zoneland.net>
Date: Thu, 10 Jun 2021 16:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E6=9D=BF=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8ID=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../x_component_process_Xform/Datatemplate.js  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/o2web/source/x_component_process_Xform/Datatemplate.js b/o2web/source/x_component_process_Xform/Datatemplate.js
index 942d12cf77..688064cd5d 100644
--- a/o2web/source/x_component_process_Xform/Datatemplate.js
+++ b/o2web/source/x_component_process_Xform/Datatemplate.js
@@ -235,11 +235,29 @@ MWF.xApplication.process.Xform.Datatemplate = MWF.APPDatatemplate = new Class(
 			this.node.set(this.json.properties);
 		},
 		setOuterActionsEvents: function(){
+			var dtIds = this.json.id.split("..");
 
 			//判断不在数据模板中，但是在表单内的Id
 			var getModules = function (idList) {
 				var list = [];
 				idList.each( function (id) {
+					if( id.contains("*") ){ //允许id中包含*，替代当前id的层次
+						var ids = id.split(".");
+						for( var i=0; i<ids.length; i++ ){
+							if( ids[i].contains("*") && dtIds[i] ){
+								var key = ids[i].replace("*", dtIds[i]);
+								key = this.form.Macro.exec("return "+key, this);
+								ids[i] = key.toString();
+							}
+						}
+						id = ids.join("..");
+					}else if( id.contains("./") ){
+						if( id.indexOf("./") === 0 ){
+							var ids = Array.clone(dtIds);
+							ids[ids.length-1] = id.substring(1,id.length-1);
+							id = ids.join("..");
+						}
+					}
 					if( !this.templateJson.hasOwnProperty(id) && this.form.all[id] ){
 						list.push( this.form.all[id] );
 					}
-- 
GitLab