diff --git a/app_web_enterprise/__manifest__.py b/app_web_enterprise/__manifest__.py index 233fdd79..ceba96a6 100644 --- a/app_web_enterprise/__manifest__.py +++ b/app_web_enterprise/__manifest__.py @@ -18,7 +18,7 @@ { 'name': "odoo Enterprise enhance Pack,企业版界面及操作增强", - 'version': '16.24.08.08', + 'version': '16.24.08.17', 'author': 'odooai.cn', 'category': 'Extra tools', 'website': 'https://www.odooai.cn', @@ -78,6 +78,8 @@ ('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/webclient/**/*.js', + 'app_web_enterprise/static/src/webclient/**/*.scss', 'app_web_enterprise/static/src/xml/**/*.xml', # 'app_web_enterprise/static/src/xml/base.xml', ], diff --git a/app_web_enterprise/static/src/webclient/navbar.js b/app_web_enterprise/static/src/webclient/navbar.js new file mode 100644 index 00000000..bd952dc2 --- /dev/null +++ b/app_web_enterprise/static/src/webclient/navbar.js @@ -0,0 +1,21 @@ +/** @odoo-module **/ +// 以下为参考 17 ,仅16需要 + +import { patch } from "@web/core/utils/patch"; +import { EnterpriseNavBar } from "@web_enterprise/webclient/navbar/navbar"; + +patch(EnterpriseNavBar.prototype, "appEnterpriseNavBar", { + setup() { + this._super(...arguments); + this._busToggledCallback = () => this._updateMenuAppsIcon(); + }, + + _updateMenuAppsIcon() { + this._super(...arguments); + const menuBrandIcon = this.navRef.el.querySelector(".o_menu_brand_icon"); + if (menuBrandIcon) { + menuBrandIcon.classList.toggle("o_hidden", !this.isInApp); + } + } +}); + diff --git a/app_web_enterprise/static/src/webclient/navbar.scss b/app_web_enterprise/static/src/webclient/navbar.scss new file mode 100644 index 00000000..1094a9c3 --- /dev/null +++ b/app_web_enterprise/static/src/webclient/navbar.scss @@ -0,0 +1,102 @@ +// = Main Navbar 以下为参考 17 ,仅16需要 +// ============================================================================ +$o-navbar-padding-v: 10px !default; +.o_main_navbar { + .o_menu_toggle { + // Define a local mixin to handle the toggle state + // -------------------------------------------------------------------- + @mixin o_main_navbar_toggler_toggled() { + rect { + width: 6px; + height: 3px; + + &:first-child { + transform: translate(12%, 0) #{"/* rtl:translate(-6%, 0) */"}; + rx: 1; + } + } + + #o_menu_toggle_row_0 { + transform: scale3d(.5, 1, 1) translate(0, 45%) skewY(-22deg) #{"/* rtl:scale3d(.5, 1, 1) translate(0, 41%) skewY(22deg) */"}; + + + g rect { + width: 0; + height: 0; + } + } + + #o_menu_toggle_row_2 { + transform: scale3d(.5, 1, 1) translate(0, -37%) skewY(22deg) #{"/* rtl:scale3d(.5, 1, 1) translate(0, -35%) skewY(-22deg) */"}; + } + } + + // Animate on large screen without 'reduced-motion' only. + // -------------------------------------------------------------------- + @include media-breakpoint-up(lg) { + &.hasImage:not(.o_menu_toggle_back) { + .o_menu_toggle_icon { + opacity: 0; + } + + &:hover { + .o_menu_toggle_icon { + opacity: 1; + } + + .o_menu_brand_icon { + opacity: 0; + } + } + } + + @media screen and (prefers-reduced-motion: no-preference) { + &:hover { + @include o_main_navbar_toggler_toggled(); + } + + &, g { + transition: all .3s; + } + + rect { + transition: all .1s; + } + + &.hasImage:not(.o_menu_toggle_back) { + transform: none; + transition: none; + + .o_menu_toggle_icon, .o_menu_brand_icon, .o_menu_brand { + will-change: transform; + transition: all 0.1s; + } + + .o_menu_toggle_icon { + transform: translateX(75%); + } + + &:hover { + .o_menu_toggle_icon { + transform: translateX(25%); + transition: all .4s; + } + + .o_menu_brand_icon { + transform: rotateY(-90deg); + transition: all .2s; + } + + .o_menu_brand { + transform: translateX(-#{map-get($spacers, 2)}); + transition: all .4s; + } + } + } + } + + .o_menu_brand_icon { + object-fit: cover; + } + } + } +} diff --git a/app_web_enterprise/static/src/webclient/navbar.xml b/app_web_enterprise/static/src/webclient/navbar.xml index e9b650bd..052f7b37 100644 --- a/app_web_enterprise/static/src/webclient/navbar.xml +++ b/app_web_enterprise/static/src/webclient/navbar.xml @@ -4,12 +4,15 @@ - - - - - - + + + + @@ -25,4 +28,12 @@ + + + + + + + +