Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2298

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/personcard/CodeUtil.java

@@ -214,9 +214,9 @@ public class CodeUtil {
 	 */
 	public static File decoderBase64File(String targetPath, String base64Code) throws Exception {
 		byte[] buffer = Base64.decodeBase64(base64Code);
-		FileOutputStream out = new FileOutputStream(targetPath);
-		out.write(buffer);
-		out.close();
+		try (FileOutputStream out = new FileOutputStream(targetPath)) {
+			out.write(buffer);
+		}
 		File file = new File(targetPath);
 		return file;
 	}

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithIdentityObject.java

@@ -79,7 +79,9 @@ class ActionListWithIdentityObject extends BaseAction {
 		List<String> unitIds = em.createQuery(cq.select(root.get(Identity_.unit)).where(p))
 				.getResultList().stream().distinct().collect(Collectors.toList());
 		unitIds = ListTools.trim(unitIds, true, true);
-		for (Unit o : business.unit().pick(unitIds)) {
+		List<Unit> units = business.unit().pick(unitIds);
+		units = business.unit().sort(units);
+		for (Unit o : units) {
 			wos.add(this.convert(business, o, Wo.class));
 		}
 		return wos;

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithIdentitySupNestedObject.java

@@ -83,7 +83,9 @@ class ActionListWithIdentitySupNestedObject extends BaseAction {
 			unitIds.addAll(business.unit().listSupNested(str));
 		}
 		unitIds = ListTools.trim(unitIds, true, true);
-		for (Unit o : business.unit().pick(unitIds)) {
+		List<Unit> units = business.unit().pick(unitIds);
+		units = business.unit().sort(units);
+		for (Unit o : units) {
 			wos.add(this.convert(business, o, Wo.class));
 		}
 		return wos;

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithLevelObject.java

@@ -72,10 +72,10 @@ class ActionListWithLevelObject extends BaseAction {
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Unit> root = cq.from(Unit.class);
 		Predicate p = root.get(Unit_.level).in(wi.getLevelList());
-		List<String> unitIds = em.createQuery(cq.select(root.get(Unit_.id)).where(p))
-				.getResultList().stream().distinct().collect(Collectors.toList());
-		unitIds = ListTools.trim(unitIds, true, true);
-		for (Unit o : business.unit().pick(unitIds)) {
+		List<String> unitIds = em.createQuery(cq.select(root.get(Unit_.id)).where(p)).getResultList();
+		List<Unit> units = business.unit().pick(unitIds);
+		units = business.unit().sort(units);
+		for (Unit o : units) {
 			wos.add(this.convert(business, o, Wo.class));
 		}
 		return wos;

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithPersonObject.java

@@ -80,8 +80,9 @@ class ActionListWithPersonObject extends BaseAction {
 			Predicate p = root.get(Identity_.person).in(ids);
 			List<String> unitIds = em.createQuery(cq.select(root.get(Identity_.unit)).where(p))
 					.getResultList().stream().distinct().collect(Collectors.toList());
-			unitIds = ListTools.trim(unitIds, true, true);
-			for (Unit o : business.unit().pick(unitIds)) {
+			List<Unit> units = business.unit().pick(unitIds);
+			units = business.unit().sort(units);
+			for (Unit o : units) {
 				wos.add(this.convert(business, o, Wo.class));
 			}
 		}

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithPersonSupNestedObject.java

@@ -83,7 +83,9 @@ class ActionListWithPersonSupNestedObject extends BaseAction {
 			unitIds.addAll(business.unit().listSupNested(str));
 		}
 		unitIds = ListTools.trim(unitIds, true, true);
-		for (Unit o : business.unit().pick(unitIds)) {
+		List<Unit> units = business.unit().pick(unitIds);
+		units = business.unit().sort(units);
+		for (Unit o : units) {
 			wos.add(this.convert(business, o, Wo.class));
 		}
 		return wos;

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithUnitAttributeObject.java

@@ -88,7 +88,9 @@ class ActionListWithUnitAttributeObject extends BaseAction {
 		List<String> unitIds = em.createQuery(cq.select(root.get(UnitAttribute_.unit)).where(p))
 				.getResultList().stream().distinct().collect(Collectors.toList());
 		unitIds = ListTools.trim(unitIds, true, true);
-		for (Unit o : business.unit().pick(unitIds)) {
+		List<Unit> units = business.unit().pick(unitIds);
+		units = business.unit().sort(units);
+		for (Unit o : units) {
 			wos.add(this.convert(business, o, Wo.class));
 		}
 		return wos;

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/unit/ActionListWithUnitDutyObject.java

@@ -91,7 +91,9 @@ class ActionListWithUnitDutyObject extends BaseAction {
 			List<String> unitIds = em.createQuery(cq.select(root.get(UnitDuty_.unit)).where(p))
 					.getResultList().stream().distinct().collect(Collectors.toList());
 			unitIds = ListTools.trim(unitIds, true, true);
-			for (Unit o : business.unit().pick(unitIds)) {
+			List<Unit> units = business.unit().pick(unitIds);
+			units = business.unit().sort(units);
+			for (Unit o : units) {
 				wos.add(this.convert(business, o, Wo.class));
 			}
 		}

o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js

@@ -592,15 +592,18 @@ MWF.xDesktop.Actions.RestActions.Callback = new Class({
 			   case "success":
 				   if (this.appendSuccess) this.appendSuccess(responseJSON);
 				   if (this.success) return this.success(responseJSON, responseText);
+				   return responseJSON;
 			       break;
 			   case "warn":
 				   MWF.xDesktop.notice("info", {x: "right", y:"top"}, responseJSON.errorMessage.join("\n"));
 				   
 				   if (this.appendSuccess) this.appendSuccess(responseJSON);
 				   if (this.success) return this.success(responseJSON);
-			       break;
+                   return responseJSON;
+				   break;
 			   case "error":
 				   return this.doError(null, responseText, responseJSON.message);
+                   return responseJSON;
 				   break;
 			}
 		}else{

o2web/source/o2_core/o2/xScript/Environment.js

@@ -1502,8 +1502,8 @@ MWF.xScript.Environment = function(ev){
             }else{
                 optionsOrName.each(function(option){
                     _includeSingle.apply(this, [option]);
-                    if (callback) callback.apply(this);
                 }.bind(this));
+                if (callback) callback.apply(this);
             }
         }else{
             _includeSingle.apply(this, [optionsOrName , callback, async])
@@ -1523,7 +1523,8 @@ MWF.xScript.Environment = function(ev){
     //在异步调用结束后 执行 resolve.cb()；
     //目前只有表单的queryload事件支持此方法。
     this.wait = function(){
-        resolve = {};
+        var _self = this;
+        resolve = {"cb":  _self.goon.bind(_self)};
         var setResolve = function(callback){
             resolve.cb = callback;
         }.bind(this);

o2web/source/x_component_process_Xform/Form.js

@@ -1154,12 +1154,14 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
 
         if (this.businessData.control["allowSave"]) {
             this.fireEvent("beforeSave");
+            this.fireEvent("beforeSaveWork");
 
             if (this.app && this.app.fireEvent) this.app.fireEvent("beforeSave");
             this.saveFormData(function (json) {
                 if (this.app && !silent) this.app.notice(MWF.xApplication.process.Xform.LP.dataSaved, "success");
                 if (callback && typeOf(callback) === "function") callback();
                 this.fireEvent("afterSave");
+                this.fireEvent("afterSaveWork");
                 if (this.app && this.app.fireEvent) this.app.fireEvent("afterSave");
             }.bind(this));