jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1335: (feature/前端样式修改 -> develop)

Browse Source 
Merge Request: 顶部菜单支持多级菜单

Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1335?initial=true
This commit is contained in:
黄焱
2024-09-23 10:56:37 +08:00
committed by Coding
parent d4ff7ffaa9 cab0e1ce0b
commit 269141dfb2
3 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vista_backend_theme/static/src/scss/theme.scss
View File

@@ -1077,6 +1077,13 @@ div.dropdown-menu.bootstrap-datetimepicker-widget {
}
}
}
.subtitle {
margin: 5px 0 0px;
padding: 5px 0;
text-indent: 5px;
background: rgba(0, 0, 0, 0.1);
font-size: 14px;
}
&:hover {
.title {
background-color: rgba(0, 0, 0, 0.08);

47
vista_backend_theme/static/src/xml/systray.xml
View File

@@ -1,16 +1,37 @@
<?xml version="1.0" encoding="UTF-8" ?>
<templates>
<t t-name="theme_systray">
<li class="new_icon">
<label class="theme_vista" style="margin-bottom:0px;" title="Change backend theme">
<t t-if="widget.is_admin">
<div class="icon_div">
<div class="toggle-icon" role="button">
<i id='theme_vista' class="fa fa-paint-brush" role="img" aria-label="Theme" width="22" height="22"/>
</div>
</div>
</t>
</label>
</li>
</t>
<t t-name="theme_systray">
<li class="new_icon">
<label class="theme_vista" style="margin-bottom:0px;" title="Change backend theme">
<t t-if="widget.is_admin">
<div class="icon_div">
<div class="toggle-icon" role="button">
<i id='theme_vista' class="fa fa-paint-brush" role="img" aria-label="Theme" width="22"
height="22"/>
</div>
</div>
</t>
</label>
</li>
</t>
<t t-name="customDropdownChild" owl="1">
<t t-foreach="children" t-as="child" t-key="child.id">
<t t-if="!child.childrenTree.length">
<a class="t2" t-attf-href="{{getMenuItemHref(child)}}">
<t t-esc="child.name"></t>
</a>
</t>
<div t-if="child.childrenTree.length">
<p class="subtitle">
<t t-esc="child.name"></t>
</p>
<t t-call="customDropdownChild">
<t t-set="children" t-value="child.childrenTree"/>
</t>
</div>
</t>
</t>
</templates>

47
vista_backend_theme/static/src/xml/top_bar.xml
View File

@@ -24,28 +24,35 @@
</div>
<!-- Current App Sections -->
<div class="d-none d-md-block o_menu_sections_fix ">
<!-- <t t-if="currentAppSections.length"-->
<!-- t-call="web.NavBar.SectionsMenu">-->
<!-- <t t-set="sections" t-value="currentAppSections"/>-->
<!-- </t>-->
<t t-if="currentAppSections.length" >
<t t-foreach="currentAppSections" t-as="menu" t-key="menu.id">
<div class="custom_dropdown" >
<t t-if="menu.childrenTree.length">
<p class="title"><t t-esc="menu.name"></t> </p>
<div class="custom_dropdown_fixed">
<t t-foreach="menu.childrenTree" t-as="child" t-key="child.id">
<a t-attf-href="{{getMenuItemHref(child)}}"> <t t-esc="child.name"></t></a>
</t>
</div>
</t>
<t t-if="!menu.childrenTree.length">
<a class="title" t-attf-href="{{getMenuItemHref(menu)}}"> <t t-esc="menu.name"></t></a>
</t>
</div>
<t t-if="currentAppSections.length"
t-call="web.NavBar.SectionsMenu">
<t t-set="sections" t-value="currentAppSections"/>
</t>
<t t-if="currentAppSections.length">
<t t-foreach="currentAppSections" t-as="menu" t-key="menu.id">
<div class="custom_dropdown" >
<t t-if="menu.childrenTree.length" >
<p class="title"><t t-esc="menu.name"></t> </p>
<div class="custom_dropdown_fixed">
<t t-call="customDropdownChild">
<t t-set="children" t-value="menu.childrenTree"/>
</t>
</div>
</t>
<!-- <t t-if="menu.childrenTree.length">-->
<!-- <p class="title"><t t-esc="menu.name"></t> </p>-->
<!-- <div class="custom_dropdown_fixed">-->
<!-- <t t-foreach="menu.childrenTree" t-as="child" t-key="child.id">-->
<!-- <a t-attf-href="{{getMenuItemHref(child, 123)}}"> <t t-esc="child.name"></t></a>-->
<!-- </t>-->
<!-- </div>-->
<!-- </t>-->
<t t-if="!menu.childrenTree.length">
<a class="title" t-attf-href="{{getMenuItemHref(menu)}}"> <t t-esc="menu.name"></t></a>
</t>
</div>
</t>
</t>
</div>
<div class="d-xs-block d-sm-block d-md-none">