audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Ivan Office
2024-08-20 03:10:29 +08:00
parent 7361a6d3fc
commit fdaaef7e7b
12 changed files with 123 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app_web_enterprise/static/src/components/tracking_value/tracking_value.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<templates xml:space="preserve">
<!-- <t t-name="mail.TrackingValue" t-inherit="mail.TrackingValue" t-inherit_mode="extension" owl="1">-->
<!-- <xpath expr="//span[hasclass('o_TrackingValue_fieldName')]" position="replace">-->
<!-- <span class="o_TrackingValue_fieldName ms-1 fw-bold text-muted" t-esc="trackingValue.formattedChangedField + ':'"/>-->
<!-- </xpath>-->
<!-- <xpath expr="//span[@t-esc='trackingValue.oldValue.formattedValueOrNone']" position="before">-->
<!-- <xpath expr="//span[hasclass('o_TrackingValue_fieldName')]" position="move"/>-->
<!-- </xpath>-->
<!-- </t>-->
</templates>

81
app_web_enterprise/static/src/scss/app_style_before.scss
View File

@@ -1,17 +1,23 @@
// 编辑模式默认 input下方border 有颜色
// 编辑模式默认 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')};
}
&:not(.o_field_highlight) .o_required_modifier.o_field_widget:not(.o_field_invalid):not(.o_field_highlight) .o_input:not(:hover):not(:focus) {
--o-input-border-color: #{map-get($grays, '600')};
}
}
}
.o_form_view:not(.o_field_highlight) {
.o_form_view_container {
.o_field_widget:not(.o_field_invalid):not(.o_field_highlight) .o_input:not(:hover):not(:focus) {
&: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')};
}
&:not(.o_field_highlight) .o_required_modifier.o_field_widget:not(.o_field_invalid):not(.o_field_highlight) .o_input:not(:hover):not(:focus) {
--o-input-border-color: #{map-get($grays, '600')};
}
}
}
@@ -23,3 +29,74 @@
}
}
//navbar
$o-navbar-background: rgba($o-brand-odoo, .06);
.o_main_navbar {
--NavBar-entry-backgroundColor: $o-navbar-background;
background: $o-navbar-background;
}
//navbar 的下拉箭头
//在顶部
.o_main_navbar {
.o_menu_sections {
.dropdown.dropdown-toggle {
span::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;
}
}
}
}
//在底部时
.o_web_client.navbar_pos_bottom {
.o_main_navbar {
.o_menu_sections {
.dropdown.dropdown-toggle {
span::after {
border-top: 0;
border-bottom: 4px solid;
display: inline-block;
margin-left: 3.4px;
vertical-align: 3.4px;
content: "";
border-right: 4px solid transparent;
border-left: 4px solid transparent;
}
}
.dropup.dropdown-toggle {
span::after {
border-top: 0;
border-bottom: 4px solid;
display: inline-block;
margin-left: 3.4px;
vertical-align: 3.4px;
content: "";
border-right: 4px solid transparent;
border-left: 4px solid transparent;
}
}
}
}
}
//在顶部和底部时
.o-overlay-container {
.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;
}
}

12
app_web_enterprise/static/src/scss/navbar_before.scss
View File

@@ -1,12 +0,0 @@
$o-navbar-background: rgba($o-brand-odoo, .05);
.o_main_navbar {
--NavBar-entry-backgroundColor: $o-navbar-background;
background: $o-navbar-background;
.o_menu_sections {
.o_nav_entry, .dropdown-toggle {
background: var(--NavBar-entry-backgroundColor, transparent);
}
}
}

35
app_web_enterprise/static/src/webclient/navbar.xml
View File

@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">
<t t-name="app_web_enterprise.EnterpriseNavBar" t-inherit="web_enterprise.EnterpriseNavBar" t-inherit-mode="extension">
<xpath expr="//a[hasclass('o_menu_toggle')]" position="replace">
<a href="#" class="o_menu_toggle" t-att-class="{'hasImage': currentApp &amp;&amp; currentApp.webIconData}" accesskey="h" t-ref="menuApps" t-on-click.prevent="() => this.hm.toggle()">
<i class="o_menu_toggle_icon text-primary fa fa-2x fa-opera" style="padding-right:8px;" role="img"/>
<img
t-if="currentApp &amp;&amp; currentApp.webIconData"
t-att-src="currentApp.webIconData"
class="o_menu_brand_icon d-none d-lg-inline position-absolute start-0 h-100 ps-1 ms-2"
t-att-alt="currentApp.name"
t-ref="appIcon"/>
<!--<t t-name="app_web_enterprise.EnterpriseNavBar" t-inherit="web_enterprise.EnterpriseNavBar" t-inherit-mode="extension">-->
<!--&lt;!&ndash; todo: 以下主要是测试，改这个主图标为 O &ndash;&gt;-->
<!-- <xpath expr="//a[hasclass('o_menu_toggle')]" position="replace">-->
<!-- <a href="#" class="o_menu_toggle" t-att-class="{'hasImage': currentApp &amp;&amp; currentApp.webIconData}" accesskey="h" t-ref="menuApps" t-on-click.prevent="() => this.hm.toggle()">-->
<!-- <i class="o_menu_toggle_icon text-primary fa fa-2x fa-opera" style="padding-right:8px;" role="img"/>-->
<!-- <img-->
<!-- t-if="currentApp &amp;&amp; currentApp.webIconData"-->
<!-- t-att-src="currentApp.webIconData"-->
<!-- class="o_menu_brand_icon d-none d-lg-inline position-absolute start-0 h-100 ps-1 ms-2"-->
<!-- t-att-alt="currentApp.name"-->
<!-- t-ref="appIcon"/>-->
<span
t-if="currentApp"
t-esc="currentApp.name"
class="o_menu_brand d-none d-md-flex ms-3 pe-0"/>
</a>
</xpath>
</t>
<!-- <span-->
<!-- t-if="currentApp"-->
<!-- t-esc="currentApp.name"-->
<!-- class="o_menu_brand d-none d-md-flex ms-3 pe-0"/>-->
<!-- </a>-->
<!-- </xpath>-->
<!--</t>-->
<!-- 菜单有下拉箭头， owl的在 web.NavBar， 首行用 MenuDropdown， 下拉的用 DropdownItem -->
<!-- owl NavBar-->
<!-- <t t-name="app_web_enterprise.NavBar.SectionsMenu" t-inherit="web.NavBar.SectionsMenu" t-inherit-mode="extension">-->

4
app_web_enterprise/static/src/xml/res_config_edition.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve">
<t t-inherit="web.res_config_edition" t-inherit-mode="extension">
<xpath expr="//h3" position="replace">
<t t-inherit="res_config_edition" t-inherit-mode="extension" owl="1">
<xpath expr="//div[hasclass('user-heading')]//h3" position="replace">
<h3 class="px-0">
Odoo <t t-esc="serverVersion"/> (<a target="_blank" href="https://www.odooai.cn" style="text-decoration: underline;">odooai.cn</a> Edition)
</h3>