Jelajahi Sumber

Merge branch 'fix/portal_op' into 'wrdp'

优化门户页面请求,合并js文件

See merge request o2oa/o2oa!2140
胡起 5 tahun lalu
induk
melakukan
fbca5e59b3
2 mengubah file dengan 12 tambahan dan 4 penghapusan
  1. 6 2
      gulpfile.js
  2. 6 2
      o2web/gulpfile.js

+ 6 - 2
gulpfile.js

@@ -545,7 +545,9 @@ function concat_Style(){
 function build_concat_basework_style(){
     return gulp.src([
         "o2web/source/x_component_process_Work/$Main/default/css.wcss",
-        "o2web/source/x_component_process_Xform/$Form/default/css.wcss"
+        "o2web/source/x_component_process_Xform/$Form/default/css.wcss",
+        "o2web/source/o2_core/o2/widget/$Tab/mobileForm/css.wcss",
+        "o2web/source/o2_core/o2/widget/$Menu/tab/css.wcss"
     ])
         .pipe(concat_Style())
         .pipe(concat('js/base_work_style_temp.js'))
@@ -641,7 +643,9 @@ function build_concat_baseportal_style(){
     return gulp.src([
         "o2web/source/x_component_process_Work/$Main/default/css.wcss",
         "o2web/source/x_component_portal_Portal/$Main/default/css.wcss",
-        "o2web/source/x_component_process_Xform/$Form/default/css.wcss"
+        "o2web/source/x_component_process_Xform/$Form/default/css.wcss",
+        "o2web/source/o2_core/o2/widget/$Tab/mobileForm/css.wcss",
+        "o2web/source/o2_core/o2/widget/$Menu/tab/css.wcss"
     ])
         .pipe(concat_Style())
         .pipe(concat('js/base_portal_style_temp.js'))

+ 6 - 2
o2web/gulpfile.js

@@ -407,7 +407,9 @@ function createBaseWorkConcatStyleTask(path){
     gulp.task(path+".base_work : style", function(){
         return gulp.src([
             "source/x_component_process_Work/$Main/default/css.wcss",
-            "source/x_component_process_Xform/$Form/default/css.wcss"
+            "source/x_component_process_Xform/$Form/default/css.wcss",
+            "source/o2_core/o2/widget/$Tab/mobileForm/css.wcss",
+            "source/o2_core/o2/widget/$Menu/tab/css.wcss"
         ])
             .pipe(concat_Style())
             .pipe(concat('js/base_work_style_temp.js'))
@@ -547,7 +549,9 @@ function createBasePortalConcatStyleTask(path){
         return gulp.src([
             "source/x_component_process_Work/$Main/default/css.wcss",
             "source/x_component_portal_Portal/$Main/default/css.wcss",
-            "source/x_component_process_Xform/$Form/default/css.wcss"
+            "source/x_component_process_Xform/$Form/default/css.wcss",
+            "source/o2_core/o2/widget/$Tab/mobileForm/css.wcss",
+            "source/o2_core/o2/widget/$Menu/tab/css.wcss"
         ])
             .pipe(concat_Style())
             .pipe(concat('js/base_portal_style_temp.js'))