From 2e2dac8712f94213b99ac540f71363b5d7fd16bd Mon Sep 17 00:00:00 2001
From: ivan deng <guohuadeng@hotmail.com>
Date: Fri, 17 Feb 2023 00:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8B=E6=8B=89=E7=AE=AD?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_web_enterprise/__manifest__.py              |  2 +-
 .../static/src/scss/views_style.scss            | 15 +++++++++++++++
 .../static/src/webclient/navbar.xml             | 17 ++++++++++++-----
 app_web_enterprise/static/src/xml/base.xml      | 10 ----------
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/app_web_enterprise/__manifest__.py b/app_web_enterprise/__manifest__.py
index 0509d5aa..87c88e72 100644
--- a/app_web_enterprise/__manifest__.py
+++ b/app_web_enterprise/__manifest__.py
@@ -18,7 +18,7 @@
 
 {
     'name': "App web enterprise enhance,企业版界面增强",
-    'version': '16.23.02.14',
+    'version': '16.23.02.16',
     'author': 'Sunpop.cn',
     'category': 'Base',
     'website': 'https://www.sunpop.cn',
diff --git a/app_web_enterprise/static/src/scss/views_style.scss b/app_web_enterprise/static/src/scss/views_style.scss
index 8dc39173..bde234af 100644
--- a/app_web_enterprise/static/src/scss/views_style.scss
+++ b/app_web_enterprise/static/src/scss/views_style.scss
@@ -9,4 +9,19 @@
       }
     }
   }
+}
+// 上方菜单下拉，group 也有箭头
+.o_main_navbar {
+  .o-dropdown {
+    .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;
+    }
+  }
 }
\ No newline at end of file
diff --git a/app_web_enterprise/static/src/webclient/navbar.xml b/app_web_enterprise/static/src/webclient/navbar.xml
index 1f328e95..e9b650bd 100644
--- a/app_web_enterprise/static/src/webclient/navbar.xml
+++ b/app_web_enterprise/static/src/webclient/navbar.xml
@@ -13,9 +13,16 @@
         </a>
     </xpath>
 </t>
-<!--    web.NavBar.SectionsMenu-->
-<!--    没有子菜单时，调用web.DropdownItem-->
-<!--    web.UserMenu-->
-
-
+    <!--    菜单有下拉箭头， owl的在 web.NavBar， 首行用 MenuDropdown， 下拉的用 DropdownItem -->
+    <!--    owl NavBar-->
+    <t t-name="app_web_enterprise.NavBar.SectionsMenu" t-inherit="web.NavBar.SectionsMenu" t-inherit-mode="extension">
+        <xpath expr="//MenuDropdown" position="attributes">
+            <attribute name="showCaret">true</attribute>
+        </xpath>
+    </t>
+<!--    <t t-name="app_web_enterprise.NavBar.SectionsMenu.Dropdown.MenuSlot" t-inherit="web.NavBar.SectionsMenu.Dropdown.MenuSlot" t-inherit-mode="extension">-->
+<!--        <xpath expr="//DropdownItem[1]" position="attributes">-->
+<!--            <attribute name="showCaret">true</attribute>-->
+<!--        </xpath>-->
+<!--    </t>-->
 </templates>
diff --git a/app_web_enterprise/static/src/xml/base.xml b/app_web_enterprise/static/src/xml/base.xml
index d79a6f83..22126e40 100644
--- a/app_web_enterprise/static/src/xml/base.xml
+++ b/app_web_enterprise/static/src/xml/base.xml
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
-
 <!--    <t t-extend="HomeMenu.Content">-->
 <!--        <t t-jquery=".o_home_menu_footer" t-operation="inner">-->
 <!--            <img src='/web/binary/company_logo' alt="Logo"/>-->
 <!--        </t>-->
 <!--    </t>-->
-    <!--    菜单有下拉箭头， owl的在 web.NavBar.SectionsMenu， 有group的用 MenuDropdown， 直接操作的用 DropdownItem -->
-    <t t-name="app_web_enterprise.Dropdown" t-inherit="web.Dropdown">
-        <xpath expr="//div[hasclass('o-dropdown')]" position="attributes">
-            <attribute name="t-att-class">
-        {{ directionCaretClass || ''}}
-        {{ state.open ? 'show' : ''}}</attribute>
-        </xpath>
-    </t>
-
 </templates>