Merge branch 'fix/open_application' into 'develop'

表单性能优化

See merge request o2oa/o2oa!1553

gulpfile.js

@@ -516,14 +516,17 @@ function build_concat_basework() {
         'o2web/source/x_component_Selector/Person.js',
         'o2web/source/x_component_Selector/Identity.js',
         'o2web/source/x_component_Selector/Unit.js',
-        'o2web/source/o2_core/o2/xScript/Environment.js',
+        'o2web/source/o2_core/o2/xScript/Actions/UnitActions.js',
         'o2web/source/o2_core/o2/xScript/Actions/ScriptActions.js',
         'o2web/source/o2_core/o2/xScript/Actions/CMSScriptActions.js',
         'o2web/source/o2_core/o2/xScript/Actions/PortalScriptActions.js',
+        'o2web/source/o2_core/o2/xScript/Environment.js',
         'o2web/source/x_component_Template/MTooltips.js',
+        'o2web/source/x_component_Template/MSelector.js',
         'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_authentication.js',
         'o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.js',
         'o2web/source/o2_core/o2/xAction/services/x_cms_assemble_control.js',
+        'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_control.js',
         'o2web/source/x_desktop/js/base_work_end.js',
         'o2web/source/x_desktop/js/base.js'
     ];

o2web/gulpfile.js

@@ -379,14 +379,17 @@ function createBaseWorkConcatTask(path, isMin, thisOptions) {
             'source/x_component_Selector/Person.js',
             'source/x_component_Selector/Identity.js',
             'source/x_component_Selector/Unit.js',
-            'source/o2_core/o2/xScript/Environment.js',
+            'source/o2_core/o2/xScript/Actions/UnitActions.js',
             'source/o2_core/o2/xScript/Actions/ScriptActions.js',
             'source/o2_core/o2/xScript/Actions/CMSScriptActions.js',
             'source/o2_core/o2/xScript/Actions/PortalScriptActions.js',
+            'source/o2_core/o2/xScript/Environment.js',
             'source/x_component_Template/MTooltips.js',
+            'source/x_component_Template/MSelector.js',
             'source/o2_core/o2/xAction/services/x_organization_assemble_authentication.js',
             'source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.js',
             'source/o2_core/o2/xAction/services/x_cms_assemble_control.js',
+            'source/o2_core/o2/xAction/services/x_organization_assemble_control.js',
             'source/' + path + '/js/base_work_end.js',
             'source/' + path + '/js/base.js'
         ];

o2web/source/o2_core/o2.js

@@ -1248,7 +1248,8 @@
         /jaxrs\/document\/.+/ig,
         /jaxrs\/applicationdict\/.+/ig,
         /jaxrs\/custom\/.+/ig,
-        /jaxrs\/definition\/idea.+/ig
+        /jaxrs\/definition\/idea.+/ig,
+        /jaxrs\/distribute\/assemble\/source\/.+/ig,
 
         ///jaxrs\/form\/workorworkcompleted\/.+/ig,
         //    /jaxrs\/script/ig,

o2web/source/x_desktop/js/base_work_end.js

@@ -6,4 +6,11 @@ MWF.xApplication.Selector.package = MWF.O2Selector;
     MWF.Actions.actions["x_organization_assemble_authentication"] = new MWF.xAction.RestActions.Action["x_organization_assemble_authentication"]("x_organization_assemble_authentication", orgActins);
     MWF.Actions.actions["x_processplatform_assemble_surface"] = new MWF.xAction.RestActions.Action["x_processplatform_assemble_surface"]("x_processplatform_assemble_surface", processActins);
     MWF.Actions.actions["x_cms_assemble_control"] = new MWF.xAction.RestActions.Action["x_cms_assemble_control"]("x_cms_assemble_control", cmsActins);
+MWF.Actions.actions["x_organization_assemble_control"] = new MWF.xAction.RestActions.Action["x_organization_assemble_control"]("x_organization_assemble_control", orgControlActins);
+MWF.Actions.actions["x_query_assemble_surface"] = new MWF.xAction.RestActions.Action["x_query_assemble_surface"]("x_query_assemble_surface", queryActins);
+
+MWF.xAction.RestActions.Action["x_program_center"] = new Class({Extends: MWF.xAction.RestActions.Action});
+this.actions["x_program_center"] = new MWF.xAction.RestActions.Action["x_program_center"]("x_program_center", centerActins);
+
+
 //});