From d34adbf9cfe724cd147f0eb311f0e57ebc89c5ba Mon Sep 17 00:00:00 2001
From: huqi <hq_1980@hotmail.com>
Date: Fri, 20 Nov 2020 17:37:14 +0800
Subject: [PATCH] =?UTF-8?q?gulp=E6=89=93=E5=8C=85=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=A1=BA=E5=BA=8F=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gulpfile.js       | 8 ++++----
 o2web/gulpfile.js | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index d33f8daba8..c1039f0add 100644
--- a/gulpfile.js
+++ b/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/';
diff --git a/o2web/gulpfile.js b/o2web/gulpfile.js
index 1aa70b4951..3613c69c71 100644
--- a/o2web/gulpfile.js
+++ b/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 + '/';
-- 
GitLab