qdt-admin-layout 1.0.4 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdt-admin-layout",
-  "version": "1.0.4",
+  "version": "1.0.8",
   "description": "基于element-ui的后台管理layout的管家婆改版",
   "main": "src/index.js",
   "module": "dist/esm/index.js",

package/src/component/ElMenu/item.vue

@@ -1,15 +1,6 @@
 <template>
   <li :class="className" :style="paddingStyle" @click="handleClick">
-    <el-tooltip v-if="showTooltip" effect="dark" placement="right">
-      <div :style="iconContainerStyle">
-        <slot />
-      </div>
-      <template v-slot:content>
-        <slot name="title" />
-      </template>
-    </el-tooltip>
-
-    <template v-else>
+    <template>
       <slot />
       <slot name="title" />
     </template>

package/src/component/Header/index.vue

@@ -4,7 +4,7 @@
  */
 
 //TODO header会在head-menu渲染后再次渲染，初步排查是head-menu中的activeMenu改变所致
-import { appGetters, headerGetters } from "../../store";
+import { appGetters, headerGetters, headerMutations } from "../../store";
 import Logo from "../../component/Logo";
 import Hamburger from "../../component/Hamburger";
 import HorizontalResizableMenu from "../../component/HorizontalResizableMenu";
@@ -25,7 +25,7 @@ export default {
         !appGetters.isMobile &&
         appGetters.showLogo &&
         (appGetters.navMode === "head" || appGetters.struct === "top-bottom");
-      return renderLogo && <Logo show-title />;
+      return renderLogo && <Logo />;
     },
     // 左侧汉堡包
     defaultHamburger() {
@@ -64,7 +64,7 @@ export default {
         logout = {},
         message = {},
         userinfo = {},
-      } = headerGetters;
+      } = headerMutations;
 
       return (
         <div class="user-dropdown-reference">

package/src/component/NavMenu/index.vue

@@ -102,16 +102,28 @@ export default {
       return slot ? slot(h, { menu, depth }) : <span>{menu.meta.title}</span>;
     },
     // 渲染无子级的菜单
-    renderSingleMenu(h, menu, depth) {
+    renderSingleMenu(h, menu, depth, needlogo) {
       const { fullPath } = menu;
       return (
         <MenuItem
           key={fullPath}
           index={fullPath}
+          style={
+            needlogo &&
+            "height:88px;text-align:center;padding:0;line-height:normal"
+          }
           inline-indent={this.inlineIndent}
         >
           <template slot="title">
-            {this.renderMenuContent(h, menu, depth)}
+            {needlogo && (
+              <div style="padding:5% 0 ">
+                <div style="padding: 10% 0;">
+                  {this.renderMenuIcon(h, menu, depth)}
+                  <div>{menu.meta.title}</div>
+                </div>
+              </div>
+            )}
+            {!needlogo && this.renderMenuContent(h, menu, depth)}
           </template>
         </MenuItem>
       );
@@ -171,6 +183,9 @@ export default {
     renderMenus(h, menus, depth = 1) {
       return menus.map((menu) => {
         let children = [];
+        if (!menu.children) {
+          return this.renderSingleMenu(h, menu, depth, true);
+        }
         //弹出菜单显示父级信息;
         // 这里认为父级的深度应该+1
         children = this.renderChildrenWithParentMenu(

package/src/component/NavMenu/style.scss

@@ -1,8 +1,6 @@
 .menu-display {
   margin-left: 5px;
-  ul {
-    border-left: 1px solid rgb(228, 231, 237);
-  }
+
   ul:first-child {
     border: none;
   }
@@ -22,7 +20,8 @@
   // 菜单图标
   .menu-icon {
     color: inherit;
-    font-size: 38px;
+    font-size: 34px;
+    margin-bottom: 10px;
   }
 
   // 子级菜单激活时，父级同样高亮