From b1cec576b5b0fe41f6dba0dd474c4133de88dd26 Mon Sep 17 00:00:00 2001 From: ivan deng Date: Sun, 19 Feb 2023 03:09:49 +0800 Subject: [PATCH] update odoo customize --- app_web_enterprise/__manifest__.py | 5 +- .../static/src/scss/app_style_after.scss | 89 +++++++++++++++++++ .../static/src/scss/app_style_before.scss | 8 ++ .../static/src/scss/views_style.scss | 27 ------ .../static/src/xml/form_label.xml | 4 +- app_web_fullwidth/__manifest__.py | 21 +++-- .../static/src/scss/app_style_after.scss | 60 +++++++++++++ app_web_fullwidth/static/src/scss/style.scss | 87 ------------------ app_web_fullwidth/views/template_view.xml | 10 --- 9 files changed, 172 insertions(+), 139 deletions(-) create mode 100644 app_web_enterprise/static/src/scss/app_style_after.scss create mode 100644 app_web_enterprise/static/src/scss/app_style_before.scss delete mode 100644 app_web_enterprise/static/src/scss/views_style.scss create mode 100644 app_web_fullwidth/static/src/scss/app_style_after.scss delete mode 100644 app_web_fullwidth/static/src/scss/style.scss delete mode 100644 app_web_fullwidth/views/template_view.xml diff --git a/app_web_enterprise/__manifest__.py b/app_web_enterprise/__manifest__.py index 62de0efb..4b62d7dc 100644 --- a/app_web_enterprise/__manifest__.py +++ b/app_web_enterprise/__manifest__.py @@ -18,7 +18,7 @@ { 'name': "App web enterprise enhance,企业版界面增强", - 'version': '16.23.02.16', + 'version': '16.23.02.19', 'author': 'Sunpop.cn', 'category': 'Base', 'website': 'https://www.sunpop.cn', @@ -61,7 +61,8 @@ ('before', 'web_enterprise/static/src/scss/primary_variables.scss', 'app_web_enterprise/static/src/scss/primary_variables.scss'), ], 'web.assets_backend': [ - ('after', 'web/static/src/views/**/*', 'app_web_enterprise/static/src/scss/views_style.scss'), + ('before', 'web/static/src/views/**/*', 'app_web_enterprise/static/src/scss/app_style_before.scss'), + ('after', 'web/static/src/views/**/*', 'app_web_enterprise/static/src/scss/app_style_after.scss'), 'app_web_enterprise/static/src/components/*/*.xml', 'app_web_enterprise/static/src/webclient/**/*.xml', 'app_web_enterprise/static/src/xml/**/*.xml', diff --git a/app_web_enterprise/static/src/scss/app_style_after.scss b/app_web_enterprise/static/src/scss/app_style_after.scss new file mode 100644 index 00000000..ea311ef9 --- /dev/null +++ b/app_web_enterprise/static/src/scss/app_style_after.scss @@ -0,0 +1,89 @@ +// 上方菜单下拉，group 也有箭头 +.o_main_navbar { + .o-dropdown { + .dropdown-menu_group.dropdown-header::after { + display: inline-block; + margin-left: 3.4px; + vertical-align: 3.4px; + content: ""; + border-top: 4px solid; + border-right: 4px solid transparent; + border-bottom: 0; + border-left: 4px solid transparent; + } + } +} + +//list +.o_list_renderer.table-responsive .o_list_table { + //list 改标头背景，o2m这里分开写 + :not(.o_field_x2many_list) > & thead, tfoot { + tr { + background-color: $o-gray-100; + } + } + .o_field_x2many_list > & thead, tfoot { + tr { + background-color: $o-gray-100; + } + } + + //列表标头下显示边框，标尾头显示边框 + > :not(:first-child) { + border-top-width: 2px; + } + //列表标头左右下显示边框 + --ListRenderer-thead-border-end-color: #{map-get($grays, '300')}; + + //内容显示边框 + .o_data_row > .o_data_cell { + border-left: 1px solid map-get($grays, '300'); + border-right: 1px solid map-get($grays, '300'); + } + + .o_data_row:not(.o_selected_row) > .o_data_cell:not(.o_readonly_modifier):not(:last-child) { + border-left: 1px solid map-get($grays, '300'); + border-right: 1px solid map-get($grays, '300'); + } + +} + +//form +@media (min-width: 768px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + margin: 6px auto; + } +} + +@media (min-width: 576px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + +@media (min-width: 768px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + +@media (min-width: 992px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + +@media (min-width: 1200px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + + +@media (min-width: 1400px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + + diff --git a/app_web_enterprise/static/src/scss/app_style_before.scss b/app_web_enterprise/static/src/scss/app_style_before.scss new file mode 100644 index 00000000..9c29a8a8 --- /dev/null +++ b/app_web_enterprise/static/src/scss/app_style_before.scss @@ -0,0 +1,8 @@ +// 编辑模式默认 input下方border 有颜色 +.o_form_view { + .o_form_view_container { + &:not(.o_field_highlight) .o_field_widget:not(.o_field_invalid):not(.o_field_highlight) .o_input:not(:hover):not(:focus) { + --o-input-border-color: #{map-get($grays, '200')}; + } + } +} diff --git a/app_web_enterprise/static/src/scss/views_style.scss b/app_web_enterprise/static/src/scss/views_style.scss deleted file mode 100644 index bde234af..00000000 --- a/app_web_enterprise/static/src/scss/views_style.scss +++ /dev/null @@ -1,27 +0,0 @@ -//list 改标头背景 -.o_list_renderer { - .o_list_table { - :not(.o_field_x2many_list) > & thead, tfoot { - tr > :not(:empty) { - padding-top: var(--ListRenderer-thead-padding-v); - padding-bottom: var(--ListRenderer-thead-padding-v); - background-color: $o-gray-100; - } - } - } -} -// 上方菜单下拉，group 也有箭头 -.o_main_navbar { - .o-dropdown { - .dropdown-menu_group.dropdown-header::after { - display: inline-block; - margin-left: 3.4px; - vertical-align: 3.4px; - content: ""; - border-top: 4px solid; - border-right: 4px solid transparent; - border-bottom: 0; - border-left: 4px solid transparent; - } - } -} \ No newline at end of file diff --git a/app_web_enterprise/static/src/xml/form_label.xml b/app_web_enterprise/static/src/xml/form_label.xml index 9614d141..269760dd 100644 --- a/app_web_enterprise/static/src/xml/form_label.xml +++ b/app_web_enterprise/static/src/xml/form_label.xml @@ -5,6 +5,6 @@ - - + + diff --git a/app_web_fullwidth/__manifest__.py b/app_web_fullwidth/__manifest__.py index 0af0f511..22a9e135 100644 --- a/app_web_fullwidth/__manifest__.py +++ b/app_web_fullwidth/__manifest__.py @@ -22,12 +22,15 @@ { 'name': 'App Web Responsive Fullwidth (form view full width)', - 'version': '13.19.11.01', + 'version': '16.23.02.19', 'category': 'web', 'author': 'Sunpop.cn', 'website': 'https://www.sunpop.cn', 'license': 'LGPL-3', 'sequence': 2, + "price": 18.00, + "currency": "EUR", + 'images': ['static/description/banner.png'], 'summary': """ Form view Responsive full width (fullwidth). Ready for small, medium, large, extra large screen.Ready for enterprise and communicate version. """, @@ -38,16 +41,12 @@ 'depends': [ 'web' ], - 'data': [ - 'views/template_view.xml', - ], - 'qweb': [ - 'static/src/xml/*.xml', - ], - "price": 18.00, - "currency": "EUR", - - 'images': ['static/description/banner.png'], + 'data': [], + 'assets': { + 'web.assets_backend': [ + ('after', 'web/static/src/views/**/*', 'app_web_fullwidth/static/src/scss/app_style_after.scss'), + ], + }, 'installable': True, 'auto_install': False, diff --git a/app_web_fullwidth/static/src/scss/app_style_after.scss b/app_web_fullwidth/static/src/scss/app_style_after.scss new file mode 100644 index 00000000..fa827520 --- /dev/null +++ b/app_web_fullwidth/static/src/scss/app_style_after.scss @@ -0,0 +1,60 @@ +//xs: 0, +//vsm: 475px, +//sm: 576px, +//md: 768px, +//lg: 992px, +//xl: 1200px, +//xxl: 1534px, + +//16 是在 xxl 才 flex row，故不需要再特殊处理了 + +/* +sheet全宽 +*/ +@media (min-width: 576px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + +@media (min-width: 768px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + +@media (min-width: 992px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + +@media (min-width: 1200px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + +@media (min-width: 1400px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + +//xs: 0, +//vsm: 475px, +//sm: 576px, +//md: 768px, +//lg: 992px, +//xl: 1200px, +//xxl: 1534px, + +//debug model 时处理 +.modal-lg { + .o_debug_manager { + .dropdown-menu-right { + right: auto; + left: 0; + } + } +} \ No newline at end of file diff --git a/app_web_fullwidth/static/src/scss/style.scss b/app_web_fullwidth/static/src/scss/style.scss deleted file mode 100644 index 17be9e54..00000000 --- a/app_web_fullwidth/static/src/scss/style.scss +++ /dev/null @@ -1,87 +0,0 @@ -//xs: 0, -//vsm: 475px, -//sm: 576px, -//md: 768px, -//lg: 992px, -//xl: 1200px, -//xxl: 1534px, - -/* -sheet全宽 -*/ -@media (min-width: 576px) { - .o_form_view .o_form_sheet_bg > .o_form_sheet { - max-width: 98% !important; - } -} -//将原来 768时的 flex 调整为1200才flex -.o_form_view { - @include media-breakpoint-up(md) { - display: block; - } - @include media-breakpoint-up(xl) { - display: flex; - } -} - -@media (min-width: 768px) { - .o_form_view .o_form_sheet_bg > .o_form_sheet { - max-width: 98% !important; - } -} -@media (min-width: 1200px) { - .o_form_view .o_form_sheet_bg > .o_form_sheet { - max-width: 960px !important; - } - .o_content .o_view_controller > div, .modal-content .o_view_controller > div { - flex-direction: row; - } -} -@media (min-width: 1534px) { - .o_form_view .o_form_sheet_bg > .o_form_sheet { - max-width: 98% !important; - } -} -//xs: 0, -//vsm: 475px, -//sm: 576px, -//md: 768px, -//lg: 992px, -//xl: 1200px, -//xxl: 1534px, - -/* -不将chatter显示在右边，form全宽 -*/ -//将原来 768时的 flex 调整为一直不flex -.o_form_view { - @include media-breakpoint-up(md) { - display: block; - } - @include media-breakpoint-up(xl) { - display: block; - .o_form_sheet_bg > .o_form_sheet { - max-width: 98% !important; - } - } - @include media-breakpoint-up(xxl) { - display: block; - .oe_chatter { - width: auto; - max-width: 1474px; - } - } - .o_form_sheet_bg { - width: auto; - } -} - -//debug model 时处理 -.modal-lg { - .o_debug_manager { - .dropdown-menu-right { - right: auto; - left: 0; - } - } -} \ No newline at end of file diff --git a/app_web_fullwidth/views/template_view.xml b/app_web_fullwidth/views/template_view.xml deleted file mode 100644 index 9dcdb9af..00000000 --- a/app_web_fullwidth/views/template_view.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file