Merge branch 'fix/initialScriptText' into 'wrdp'

修复初始化脚本运行两次的bug

See merge request o2oa/o2oa!2766

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java

@@ -156,6 +156,7 @@ class ActionAppend extends BaseAction {
 		bindings.put(ScriptFactory.BINDING_NAME_DICTIONARY,
 				new ApplicationDictHelper(business.entityManagerContainer(), work.getApplication()));
 		bindings.put(ScriptFactory.BINDING_NAME_APPLICATIONS, ThisApplication.context().applications());
+		// 重新创建的ScriptContext是需要初始化的
 		ScriptFactory.initialScriptText().eval(scriptContext);
 		return scriptContext;
 	}

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AeiObjects.java

@@ -1622,6 +1622,7 @@ public class AeiObjects extends GsonPropertyObject {
 					new ApplicationDictHelper(this.entityManagerContainer(), this.getWork().getApplication()));
 			bindings.put(ScriptFactory.BINDING_NAME_APPLICATIONS, ThisApplication.context().applications());
 			bindings.put(ScriptFactory.BINDING_NAME_ROUTES, this.getRoutes());
+			// 重新创建的ScriptContext是需要初始化的
 			ScriptFactory.initialScriptText().eval(this.scriptContext);
 		}
 		return this.scriptContext;

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/EmbedProcessor.java

@@ -81,8 +81,6 @@ public class EmbedProcessor extends AbstractEmbedProcessor {
 			wrap.set(gson.toJson(assginData));
 			ScriptContext scriptContext = aeiObjects.scriptContext();
 			scriptContext.getBindings(ScriptContext.ENGINE_SCOPE).put(ScriptFactory.BINDING_NAME_ASSIGNDATA, wrap);
-			/* 重新注入对象需要重新运行 */
-			ScriptFactory.initialScriptText().eval(scriptContext);
 			aeiObjects.business().element().getCompiledScript(aeiObjects.getWork().getApplication(), embed,
 					Business.EVENT_EMBEDTARGETASSIGNDATA).eval(scriptContext);
 			assginData = gson.fromJson(wrap.get(), AssginData.class);
@@ -140,8 +138,6 @@ public class EmbedProcessor extends AbstractEmbedProcessor {
 		if (this.hasIdentityScript(embed)) {
 			ScriptContext scriptContext = aeiObjects.scriptContext();
 			scriptContext.getBindings(ScriptContext.ENGINE_SCOPE).put(ScriptFactory.BINDING_NAME_IDENTITY, value);
-			/* 重新注入对象需要重新运行 */
-			ScriptFactory.initialScriptText().eval(scriptContext);
 			Object objectValue = aeiObjects.business().element()
 					.getCompiledScript(aeiObjects.getWork().getApplication(), embed, Business.EVENT_EMBEDTARGETIDENTITY)
 					.eval(scriptContext);

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java

@@ -648,8 +648,6 @@ public class ManualProcessor extends AbstractManualProcessor {
 		Bindings bindings = scriptContext.getBindings(ScriptContext.ENGINE_SCOPE);
 		bindings.put(ScriptFactory.BINDING_NAME_TASK, task);
 		bindings.put(ScriptFactory.BINDING_NAME_EXPIRE, expire);
-		// 重新注入对象需要重新运行
-		ScriptFactory.initialScriptText().eval(scriptContext);
 		aeiObjects.business().element()
 				.getCompiledScript(aeiObjects.getWork().getApplication(), manual, Business.EVENT_MANUALTASKEXPIRE)
 				.eval(scriptContext);