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 app_web_ent

Browse Source
This commit is contained in:
Ivan Office
2024-08-17 05:05:53 +08:00
parent 912eb14967
commit 315e12686a
8 changed files with 144 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app_web_enterprise/static/src/components/tracking_value/tracking_value.xml
View File

@@ -1,11 +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>
<!-- <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>

45
app_web_enterprise/static/src/scss/app_style_after.scss
View File

@@ -32,6 +32,10 @@
}
}
//列表标头下显示边框，标尾头显示边框
> :not(:first-child) {
border-top-width: 2px;
}
//列表标头左右下显示边框
--ListRenderer-thead-border-end-color: #{map-get($grays, '300')};
@@ -55,13 +59,54 @@
min-width: 4rem;
}
}
@media (max-width: 768px) {
.o_form_view .o_form_view_container {
// create 按键
button.o_form_button_create {
padding: 7px 10px;
}
.o_form_sheet_bg .o_form_sheet {
margin: 6px auto;
max-width: 98%;
}
}
}
@media (min-width: 768px) {
.o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet {
max-width: 98%;
}
.o_form_view .o_form_view_container .o_notebook .o_notebook_headers {
overflow-x: inherit;
}
}
@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%;
}
}
// report
.o_account_reports_page .o_account_reports_table {
.o_account_report_column_value tr > td.number {
border-left: 1px solid var(--AccountFinancial-border-color, #bbb);
}
}
//izi
.izi_view {
.izi_dashboard_filter_title span {

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

@@ -6,3 +6,20 @@
}
}
}
.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) {
--o-input-border-color: #{map-get($grays, '200')};
}
}
}
.o_dialog_container {
.o_form_view: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')};
}
}
}

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

@@ -1,13 +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">-->
<!--&lt;!&ndash; todo: 以下主要是测试，改这个主图标为 O &ndash;&gt;-->
<!-- <xpath expr="//a[hasclass('o_menu_toggle')]" position="replace">-->
<!-- <a href="#" class="o_menu_toggle fa fa-2x fa-opera" style="font-size: 2em;" accesskey="h" t-ref="menuApps" t-on-click.prevent="() => this.hm.toggle()">-->
<!-- </a>-->
<!-- </xpath>-->
<!--</t>-->
<t t-name="app_web_enterprise.EnterpriseNavBar" t-inherit="web_enterprise.EnterpriseNavBar" t-inherit-mode="extension">
<!-- todo: 以下主要是测试，改这个主图标为 O -->
<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>
<!-- 菜单有下拉箭头， owl的在 web.NavBar， 首行用 MenuDropdown， 下拉的用 DropdownItem -->
<!-- owl NavBar-->
<t t-name="app_web_enterprise.NavBar.SectionsMenu" t-inherit="web.NavBar.SectionsMenu" t-inherit-mode="extension">

22
app_web_enterprise/static/src/xml/form.xml
View File

@@ -9,18 +9,20 @@
</label>
</xpath>
</t>
<!-- 保存增加字样-->
<t t-name="app_web_enterprise.FormStatusIndicator" t-inherit="web.FormStatusIndicator" t-inherit-mode="extension">
<xpath expr="//i[hasclass('fa-cloud-upload')]" position="after">
Save
</xpath>
<xpath expr="//i[hasclass('fa-undo')]" position="after">
Discard
</xpath>
</t>
<!-- 创建移到左边-->
<!-- 更紧凑，先不处理 保存增加字样-->
<!-- <t t-name="app_web_enterprise.FormStatusIndicator" t-inherit="web.FormStatusIndicator" t-inherit-mode="extension">-->
<!-- <xpath expr="//i[hasclass('fa-cloud-upload')]" position="after">-->
<!-- Save-->
<!-- </xpath>-->
<!-- <xpath expr="//i[hasclass('fa-undo')]" position="after">-->
<!-- Discard-->
<!-- </xpath>-->
<!-- </t>-->
<!-- 17不需要，默认就是创建移到左边-->
<!-- <t t-name="app_web_enterprise.FormControlPanel" t-inherit="web.FormControlPanel" t-inherit-mode="extension">-->
<!-- <xpath expr="//div[hasclass('o_cp_bottom_right')]//t[3]" position="replace"/>-->
<!--&lt;!&ndash; <xpath expr="//t[t-slot='control-panel-create-button']" position="replace"/>&ndash;&gt;-->
<!--&lt;!&ndash; <xpath expr="//div[hasclass('o_cp_top_left')]" position="replace"/>&ndash;&gt;-->
<!-- <xpath expr="//div[hasclass('o_cp_top_left')]" position="inside">-->
<!-- <t t-slot="control-panel-create-button" />-->
<!-- </xpath>-->