Merge branch 'feature/portal_script_imported' into 'wrdp'

编译脚本顺序bug修复

See merge request o2oa/o2oa!2157

gulpfile.js

@@ -584,10 +584,6 @@ function build_concat_basework_clean(cb) {
 function build_concat_basework_body() {
     var src = [
         'o2web/source/' + path + '/js/base_concat_head.js',
-        'o2web/source/o2_core/o2/lp/'+(options.lp || 'zh-cn')+'.js',
-        'o2web/source/x_component_process_Work/lp/'+(options.lp || 'zh-cn')+'.js',
-        'o2web/source/x_component_process_Xform/lp/'+(options.lp || 'zh-cn')+'.js',
-        'o2web/source/x_component_Selector/lp/'+(options.lp || 'zh-cn')+'.js',
 
         'o2web/source/' + path + '/js/base_work_style_temp.js',
 
@@ -608,6 +604,12 @@ function build_concat_basework_body() {
         'o2web/source/o2_core/o2/xDesktop/Dialog.js',
         'o2web/source/o2_core/o2/xDesktop/Window.js',
         'o2web/source/x_component_Common/Main.js',
+
+        'o2web/source/o2_core/o2/lp/'+(options.lp || 'zh-cn')+'.js',
+        'o2web/source/x_component_process_Work/lp/'+(options.lp || 'zh-cn')+'.js',
+        'o2web/source/x_component_process_Xform/lp/'+(options.lp || 'zh-cn')+'.js',
+        'o2web/source/x_component_Selector/lp/'+(options.lp || 'zh-cn')+'.js',
+
         'o2web/source/x_component_process_Work/Main.js',
         'o2web/source/x_component_Selector/package.js',
         'o2web/source/x_component_Selector/Person.js',

o2web/source/x_component_process_Work/lp/zh-cn.js

+MWF.xApplication = MWF.xApplication || {};
 MWF.xApplication.process = MWF.xApplication.process || {};
 MWF.xApplication.process.Work = MWF.xApplication.process.Work || {};
 MWF.xApplication.process.Work.LP = {

o2web/source/x_desktop/portal.html

@@ -22,7 +22,7 @@
 
         <script src="../o2_core/o2.min.js"></script>
         <script src="../o2_lib/Decimal.js"></script>
-        <script src="js/base_work.min.js"></script>
+        <script src="js/base_portal.min.js"></script>
         <script src="js/portal.min.js"></script>
     </body>
 </html>