Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!1789

o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_okr_assemble_control.java

@@ -1,23 +0,0 @@
-package com.x.base.core.project;
-
-import com.x.base.core.entity.StorageType;
-import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.annotation.ModuleCategory;
-import com.x.base.core.project.annotation.ModuleType;
-
-@Module(type = ModuleType.ASSEMBLE, category = ModuleCategory.OFFICIAL, name = "OKR", packageName = "com.x.okr.assemble.control", containerEntities = {
-		"com.x.okr.entity.OkrAttachmentFileInfo", "com.x.okr.entity.OkrCenterWorkInfo",
-		"com.x.okr.entity.OkrConfigSecretary", "com.x.okr.entity.OkrConfigSystem",
-		"com.x.okr.entity.OkrConfigWorkLevel", "com.x.okr.entity.OkrConfigWorkType", "com.x.okr.entity.OkrTask",
-		"com.x.okr.entity.OkrTaskHandled", "com.x.okr.entity.OkrWorkAuthorizeRecord",
-		"com.x.okr.entity.OkrWorkBaseInfo", "com.x.okr.entity.OkrWorkDetailInfo", "com.x.okr.entity.OkrWorkDynamics",
-		"com.x.okr.entity.OkrWorkPerson", "com.x.okr.entity.OkrWorkReportBaseInfo",
-		"com.x.okr.entity.OkrWorkReportDetailInfo", "com.x.okr.entity.OkrWorkReportPersonLink",
-		"com.x.okr.entity.OkrWorkReportProcessLog", "com.x.okr.entity.OkrWorkChat",
-		"com.x.okr.entity.OkrStatisticReportContent", "com.x.okr.entity.OkrStatisticReportStatus",
-		"com.x.okr.entity.OkrUserInfo", "com.x.okr.entity.OkrErrorSystemIdentityInfo",
-		"com.x.okr.entity.OkrErrorIdentityRecords",
-		"com.x.okr.entity.OkrWorkAppraiseInfo" }, storageTypes = { StorageType.okr }, storeJars = {
-				"x_organization_core_entity", "x_organization_core_express", "x_okr_core_entity" })
-public class x_okr_assemble_control extends Deployable {
-}

o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_okr_core_entity.java

@@ -1,10 +0,0 @@
-package com.x.base.core.project;
-
-import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.annotation.ModuleCategory;
-import com.x.base.core.project.annotation.ModuleType;
-
-@Module(type = ModuleType.ENTITY, category = ModuleCategory.OFFICIAL, name = "OKR实体类", packageName = "com.x.okr.core.entity")
-public class x_okr_core_entity extends Compilable {
-
-}

o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java

@@ -50,7 +50,6 @@ import com.x.base.core.project.x_hotpic_assemble_control;
 import com.x.base.core.project.x_meeting_assemble_control;
 import com.x.base.core.project.x_message_assemble_communicate;
 import com.x.base.core.project.x_mind_assemble_control;
-import com.x.base.core.project.x_okr_assemble_control;
 import com.x.base.core.project.x_organization_assemble_authentication;
 import com.x.base.core.project.x_organization_assemble_control;
 import com.x.base.core.project.x_organization_assemble_express;
@@ -102,7 +101,7 @@ public class ApplicationServerTools extends JettySeverTools {
 			x_portal_assemble_surface.class.getName(), x_attendance_assemble_control.class.getName(),
 			x_bbs_assemble_control.class.getName(), x_file_assemble_control.class.getName(),
 			x_meeting_assemble_control.class.getName(), x_mind_assemble_control.class.getName(),
-			x_okr_assemble_control.class.getName(), x_hotpic_assemble_control.class.getName(),
+			x_hotpic_assemble_control.class.getName(),
 			x_query_service_processing.class.getName(), x_query_assemble_designer.class.getName(),
 			x_query_assemble_surface.class.getName());
 

o2web/source/x_component_Selector/Identity.js

@@ -23,6 +23,10 @@ MWF.xApplication.Selector.Identity = new Class({
         this.className = "Identity";
     },
     loadSelectItems : function(){
+        if( this.options.disabled ){
+            this.afterLoadSelectItem();
+            return;
+        }
         if( this.className === "Identity" && (this.options.isCheckStatus || this.options.showSelectedCount )) {
 
             var unitList = [];

o2web/source/x_component_Selector/IdentityWidthDuty.js

@@ -24,8 +24,11 @@ MWF.xApplication.Selector.IdentityWidthDuty = new Class({
 	    this.className = "IdentityWidthDuty"
     },
     loadSelectItems: function(addToNext){
-
         var afterLoadSelectItemFun = this.afterLoadSelectItem.bind(this);
+        if( this.options.disabled ){
+            this.afterLoadSelectItem();
+            return;
+        }
 
         if( this.options.resultType === "person" ){
             if( this.titleTextNode ){

o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js

@@ -33,6 +33,10 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
                 this.options.title = MWF.xApplication.Selector.LP.selectPerson;
             }
         }
+        if( this.options.disabled ){
+            this.afterLoadSelectItem();
+            return;
+        }
 
         if (this.options.dutys.length){
             this.loadInclude( function () {

o2web/source/x_component_Selector/Unit.js

@@ -21,6 +21,12 @@ MWF.xApplication.Selector.Unit = new Class({
         this.className = "Unit";
     },
     loadSelectItems: function(addToNext){
+
+        if( this.options.disabled ){
+            this.afterLoadSelectItem();
+            return;
+        }
+
         var afterLoadSelectItemFun = this.afterLoadSelectItem.bind(this);
 
         if (this.options.units.length){

o2web/source/x_component_Selector/UnitWithType.js

@@ -21,6 +21,12 @@ MWF.xApplication.Selector.UnitWithType = new Class({
         this.className = "UnitWithType";
     },
     loadSelectItems: function(addToNext){
+
+        if( this.options.disabled ){
+            this.afterLoadSelectItem();
+            return;
+        }
+
         var afterLoadSelectItemFun = this.afterLoadSelectItem.bind(this);
 
         var data = {};

o2web/source/x_component_process_Work/Processor.js

@@ -1725,13 +1725,15 @@ if( MWF.xApplication.process.Xform && MWF.xApplication.process.Xform.Form ){
                 if (this.json.identityRange!=="all"){
                     if ( !identityOpt.noUnit && (!identityOpt.units || !identityOpt.units.length) ){
                         this.form.notice(MWF.xApplication.process.Xform.LP.noIdentitySelectRange, "error", this.node);
-                        return false;
+                        identityOpt.disabled = true;
+                        // return false;
                     }
                 }
                 if ( !identityOpt.noUnit && this.json.dutyRange && this.json.dutyRange!=="all"){
                     if (!identityOpt.dutys || !identityOpt.dutys.length){
                         this.form.notice(MWF.xApplication.process.Xform.LP.noIdentityDutySelectRange, "error", this.node);
-                        return false;
+                        identityOpt.disabled = true;
+                        // return false;
                     }
                 }
                 if( this.ignoreOldData ){
@@ -1748,7 +1750,8 @@ if( MWF.xApplication.process.Xform && MWF.xApplication.process.Xform.Form ){
                 if (this.json.unitRange!=="all"){
                     if ( !unitOpt.units || !unitOpt.units.length){
                         this.form.notice(MWF.xApplication.process.Xform.LP.noUnitSelectRange, "error", this.node);
-                        return false;
+                        unitOpt.disabled = true;
+                        // return false;
                     }
                 }
                 if( this.ignoreOldData ){

o2web/source/x_component_process_Xform/Org.js

@@ -166,13 +166,15 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             if (this.json.identityRange!=="all"){
                 if ( !identityOpt.noUnit && (!identityOpt.units || !identityOpt.units.length) ){
                     this.form.notice(MWF.xApplication.process.Xform.LP.noIdentitySelectRange, "error", this.node);
-                    return false;
+                    identityOpt.disabled = true;
+                    // return false;
                 }
             }
             if ( !identityOpt.noUnit && this.json.dutyRange && this.json.dutyRange!=="all"){
                 if (!identityOpt.dutys || !identityOpt.dutys.length){
                     this.form.notice(MWF.xApplication.process.Xform.LP.noIdentityDutySelectRange, "error", this.node);
-                    return false;
+                    identityOpt.disabled = true;
+                    // return false;
                 }
             }
             identityOpt.values = (this.json.isInput) ? [] : values;
@@ -186,7 +188,8 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             if (this.json.unitRange!=="all"){
                 if ( !unitOpt.units || !unitOpt.units.length){
                     this.form.notice(MWF.xApplication.process.Xform.LP.noUnitSelectRange, "error", this.node);
-                    return false;
+                    unitOpt.disabled = true;
+                    // return false;
                 }
             }
             unitOpt.values = (this.json.isInput) ? [] : values;