update odoo customize

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',

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%;
+  }
+}
+
+

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')};
+    }
+  }
+}

app_web_enterprise/static/src/scss/views_style.scss

@@ -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;
-    }
-  }
-}

app_web_enterprise/static/src/xml/form_label.xml

@@ -5,6 +5,6 @@
         <label class="o_form_label" t-att-for="props.id" t-att-class="className" >
             <t t-esc="props.string"/><sup class="btn-link p-1" t-if="hasTooltip" t-att="{'data-tooltip-template': 'web.FieldTooltip', 'data-tooltip-info': tooltipInfo, 'data-tooltip-touch-tap-to-show': 'true'}">*</sup>
         </label>
+    </xpath>
 </t>
-
 </templates>

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': [
+    'data': [],
-        'views/template_view.xml',
+    'assets': {
+        'web.assets_backend': [
+            ('after', 'web/static/src/views/**/*', 'app_web_fullwidth/static/src/scss/app_style_after.scss'),
         ],
-    'qweb': [
+    },
-        'static/src/xml/*.xml',
-    ],
-    "price": 18.00,
-    "currency": "EUR",
-
-    'images': ['static/description/banner.png'],
 
     'installable': True,
     'auto_install': False,

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;
+        }
+    }
+}

app_web_fullwidth/static/src/scss/style.scss

@@ -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;
-        }
-    }
-}

app_web_fullwidth/views/template_view.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <template id="assets_backend" name="app_web_fullwidth asset" inherit_id="web.assets_backend">
-            <xpath expr="//link[last()]" position="after">
-                <link rel="stylesheet" type="text/scss" href="/app_web_fullwidth/static/src/scss/style.scss"/>
-            </xpath>
-        </template>
-    </data>
-</odoo>