Merge branch 'fix/menu_width' into 'wrdp'

gulpfile打包修改

See merge request o2oa/o2oa!2770

gulpfile.js

@@ -426,7 +426,8 @@ function build_concat_o2(){
 }
 function build_concat_base(){
     var src = [
-        'o2web/source/x_desktop/js/base.js'
+        'o2web/source/x_desktop/js/base.js',
+        'o2web/source/x_desktop/js/base_loader.js'
     ];
     var dest = 'target/o2server/servers/webServer/x_desktop/js/';
     return gulp.src(src)
@@ -437,7 +438,7 @@ function build_concat_base(){
         .pipe(uglify())
         //.pipe(rename({ extname: '.min.js' }))
         .pipe(sourceMap.write(""))
-        .pipe(gulp.dest(dest))
+        .pipe(gulp.dest(dest));
 }
 function build_concat_desktop(){
     let path = "o2_core";
@@ -510,6 +511,7 @@ function build_bundle(){
         'o2web/source/o2_lib/mootools/plugin/mBox.js',
         'o2web/source/o2_core/o2.js',
         'o2web/source/x_desktop/js/base.js',
+        'o2web/source/x_desktop/js/base_loader.js',
         "o2web/source/o2_core/o2/framework.js"
     ];
     var dest = 'target/o2server/servers/webServer/'+path+'/';
@@ -666,7 +668,8 @@ function build_concat_basework_body() {
 
         'o2web/source/x_desktop/js/base_work_actions_temp.js',
 
-        'o2web/source/x_desktop/js/base.js'
+        'o2web/source/x_desktop/js/base.js',
+        'o2web/source/x_desktop/js/base_loader.js'
     ];
     var dest = 'target/o2server/servers/webServer/x_desktop/js/';
     return gulp.src(src)
@@ -770,7 +773,8 @@ function build_concat_baseportal_body() {
 
         'o2web/source/x_desktop/js/base_portal_actions_temp.js',
 
-        'o2web/source/x_desktop/js/base.js'
+        'o2web/source/x_desktop/js/base.js',
+        'o2web/source/x_desktop/js/base_loader.js'
     ];
     var dest = 'target/o2server/servers/webServer/x_desktop/js/';
     return gulp.src(src)

o2web/source/o2_core/o2/xDesktop/$Default/blue/style-pc.css

@@ -452,10 +452,10 @@
     display: none;
 }
 
-.layout_start_item{
-    width: 67px;
+.layout_start_item {
+    width: 72px;
     height: 90px;
-    margin-left: 20px;
+    margin-left: 18px;
     margin-bottom: 10px;
     float: left;
     text-align: center;

o2web/source/o2_core/o2/xDesktop/$Default/cyan/style-pc.css

@@ -453,9 +453,9 @@
 }
 
 .layout_start_item{
-    width: 67px;
+    width: 72px;
     height: 90px;
-    margin-left: 20px;
+    margin-left: 18px;
     margin-bottom: 10px;
     float: left;
     text-align: center;

o2web/source/o2_core/o2/xDesktop/$Default/darkgreen/style-pc.css

@@ -453,9 +453,9 @@
 }
 
 .layout_start_item{
-    width: 67px;
+    width: 72px;
     height: 90px;
-    margin-left: 20px;
+    margin-left: 18px;
     margin-bottom: 10px;
     float: left;
     text-align: center;

o2web/source/o2_core/o2/xDesktop/$Default/gray/style-pc.css

@@ -453,9 +453,9 @@
 }
 
 .layout_start_item{
-    width: 67px;
+    width: 72px;
     height: 90px;
-    margin-left: 20px;
+    margin-left: 18px;
     margin-bottom: 10px;
     float: left;
     text-align: center;

o2web/source/o2_core/o2/xDesktop/$Default/green/style-pc.css

@@ -453,9 +453,9 @@
 }
 
 .layout_start_item{
-    width: 67px;
+    width: 72px;
     height: 90px;
-    margin-left: 20px;
+    margin-left: 18px;
     margin-bottom: 10px;
     float: left;
     text-align: center;

o2web/source/o2_core/o2/xDesktop/$Default/navy/style-pc.css

@@ -453,9 +453,9 @@
 }
 
 .layout_start_item{
-    width: 67px;
+    width: 72px;
     height: 90px;
-    margin-left: 20px;
+    margin-left: 18px;
     margin-bottom: 10px;
     float: left;
     text-align: center;

o2web/source/o2_core/o2/xDesktop/$Default/orange/style-pc.css

@@ -453,9 +453,9 @@
 }
 
 .layout_start_item{
-    width: 67px;
+    width: 72px;
     height: 90px;
-    margin-left: 20px;
+    margin-left: 18px;
     margin-bottom: 10px;
     float: left;
     text-align: center;

o2web/source/o2_core/o2/xDesktop/$Default/purple/style-pc.css

@@ -453,9 +453,9 @@
 }
 
 .layout_start_item{
-    width: 67px;
+    width: 72px;
     height: 90px;
-    margin-left: 20px;
+    margin-left: 18px;
     margin-bottom: 10px;
     float: left;
     text-align: center;

o2web/source/o2_core/o2/xDesktop/$Default/red/style-pc.css

@@ -453,9 +453,9 @@
 }
 
 .layout_start_item{
-    width: 67px;
+    width: 72px;
     height: 90px;
-    margin-left: 20px;
+    margin-left: 18px;
     margin-bottom: 10px;
     float: left;
     text-align: center;

o2web/source/o2_core/o2/xDesktop/$Default/tan/style-pc.css

@@ -453,9 +453,9 @@
 }
 
 .layout_start_item{
-    width: 67px;
+    width: 72px;
     height: 90px;
-    margin-left: 20px;
+    margin-left: 18px;
     margin-bottom: 10px;
     float: left;
     text-align: center;