From cab0e1ce0b4c1da7377e641b8cd09e5f439f4fb7 Mon Sep 17 00:00:00 2001
From: hy <1298386937@qq.com>
Date: Mon, 23 Sep 2024 10:54:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=9A=E7=BA=A7=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/scss/theme.scss                |  7 +++
 .../static/src/xml/systray.xml                | 47 ++++++++++++++-----
 .../static/src/xml/top_bar.xml                | 47 +++++++++++--------
 3 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/vista_backend_theme/static/src/scss/theme.scss b/vista_backend_theme/static/src/scss/theme.scss
index a7555c7f..669de341 100644
--- a/vista_backend_theme/static/src/scss/theme.scss
+++ b/vista_backend_theme/static/src/scss/theme.scss
@@ -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);
diff --git a/vista_backend_theme/static/src/xml/systray.xml b/vista_backend_theme/static/src/xml/systray.xml
index 7f3865b2..a3005a15 100644
--- a/vista_backend_theme/static/src/xml/systray.xml
+++ b/vista_backend_theme/static/src/xml/systray.xml
@@ -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>
\ No newline at end of file
diff --git a/vista_backend_theme/static/src/xml/top_bar.xml b/vista_backend_theme/static/src/xml/top_bar.xml
index 05b399b6..12a2a20b 100644
--- a/vista_backend_theme/static/src/xml/top_bar.xml
+++ b/vista_backend_theme/static/src/xml/top_bar.xml
@@ -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">