Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2174

gulpfile.js

@@ -629,8 +629,6 @@ function build_concat_basework_body() {
         'o2web/source/x_component_Template/MTooltips.js',
         'o2web/source/x_component_Template/MSelector.js',
 
-        'o2web/source/x_desktop/js/base_work_actions_temp.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',
@@ -638,6 +636,8 @@ function build_concat_basework_body() {
         'o2web/source/o2_core/o2/xAction/services/x_query_assemble_surface.js',
         'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_personal.js',
 
+        'o2web/source/x_desktop/js/base_work_actions_temp.js',
+
         'o2web/source/x_desktop/js/base.js'
     ];
     var dest = 'target/o2server/servers/webServer/x_desktop/js/';
@@ -731,14 +731,14 @@ function build_concat_baseportal_body() {
         'o2web/source/o2_core/o2/xScript/Actions/PortalScriptActions.js',
         'o2web/source/o2_core/o2/xScript/PageEnvironment.js',
 
-        'o2web/source/x_desktop/js/base_portal_actions_temp.js',
-
         'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_authentication.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/o2_core/o2/xAction/services/x_query_assemble_surface.js',
         'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_personal.js',
 
+        'o2web/source/x_desktop/js/base_portal_actions_temp.js',
+
         'o2web/source/x_desktop/js/base.js'
     ];
     var dest = 'target/o2server/servers/webServer/x_desktop/js/';

o2web/gulpfile.js

@@ -493,8 +493,6 @@ function createBaseWorkConcatBodyTask(path, isMin, thisOptions) {
             'source/x_component_Template/MTooltips.js',
             'source/x_component_Template/MSelector.js',
 
-            'source/' + path + '/js/base_work_actions_temp.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',
@@ -502,6 +500,8 @@ function createBaseWorkConcatBodyTask(path, isMin, thisOptions) {
             'source/o2_core/o2/xAction/services/x_query_assemble_surface.js',
             'source/o2_core/o2/xAction/services/x_organization_assemble_personal.js',
 
+            'source/' + path + '/js/base_work_actions_temp.js',
+
             'source/' + path + '/js/base.js'
         ];
         var dest = option.dest+'/' + path + '/';
@@ -640,14 +640,14 @@ function createBasePortalConcatBodyTask(path, isMin, thisOptions) {
             'source/o2_core/o2/xScript/Actions/PortalScriptActions.js',
             'source/o2_core/o2/xScript/PageEnvironment.js',
 
-            'source/' + path + '/js/base_portal_actions_temp.js',
-
             'source/o2_core/o2/xAction/services/x_organization_assemble_authentication.js',
             'source/o2_core/o2/xAction/services/x_cms_assemble_control.js',
             'source/o2_core/o2/xAction/services/x_organization_assemble_control.js',
             'source/o2_core/o2/xAction/services/x_query_assemble_surface.js',
             'source/o2_core/o2/xAction/services/x_organization_assemble_personal.js',
 
+            'source/' + path + '/js/base_portal_actions_temp.js',
+
             'source/' + path + '/js/base.js'
         ];
         var dest = option.dest+'/' + path + '/';