fix(sider): mix mode adaptation in the left menu

vbenjs · Dec 30, 2020 · ed213d8 · ed213d8
1 parent e09e0a1
commit ed213d8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
@@ -25,6 +25,7 @@
 
 - 优化`modal`与`drawer`滚动条组件
 - table: 移除 `isTreeTable`属性
+- 全局引入`less`文件。无需手动在组件再次引入
 
 ### 🎫 Chores
 
@@ -40,6 +41,7 @@
 - 修复菜单分割时权限失效问题
 - 关闭多标签页时 iframe 提前加载
 - 修复`modal`与`drawer`已知问题
+- 修复左侧菜单混合模式适配问题
 
 ## 2.0.0-rc.14 (2020-12-15)
 

diff --git a/src/components/Menu/src/BasicMenu.vue b/src/components/Menu/src/BasicMenu.vue
@@ -110,7 +110,7 @@
 
         const inlineCollapseOptions: { inlineCollapsed?: boolean } = {};
         if (isInline) {
-          inlineCollapseOptions.inlineCollapsed = unref(getCollapsed);
+          inlineCollapseOptions.inlineCollapsed = props.mixSider ? false : unref(getCollapsed);
         }
         return inlineCollapseOptions;
       });

diff --git a/src/components/Menu/src/props.ts b/src/components/Menu/src/props.ts
@@ -17,12 +17,14 @@ export const basicProps = {
     type: String as PropType<MenuModeEnum>,
     default: MenuModeEnum.INLINE,
   },
+
   type: {
     type: String as PropType<MenuTypeEnum>,
     default: MenuTypeEnum.MIX,
   },
   theme: propTypes.string.def(ThemeEnum.DARK),
   inlineCollapsed: propTypes.bool,
+  mixSider: propTypes.bool,
 
   isHorizontal: propTypes.bool,
   accordion: propTypes.bool.def(true),

diff --git a/src/components/Upload/src/data.tsx b/src/components/Upload/src/data.tsx
@@ -4,7 +4,7 @@ import { FileItem, PreviewFileItem, UploadResultStatus } from './types';
 import { checkImgType, isImgTypeByName } from './helper';
 import { Progress, Tag } from 'ant-design-vue';
 
-import TableAction from '/@/components/Table/src/components/TableAction';
+import TableAction from '/@/components/Table/src/components/TableAction.vue';
 import ThumbUrl from './ThumbUrl.vue';
 import { useI18n } from '/@/hooks/web/useI18n';
 const { t } = useI18n();

diff --git a/src/layouts/default/sider/MixSider.vue b/src/layouts/default/sider/MixSider.vue
@@ -54,6 +54,7 @@
           mode="inline"
           :items="chilrenMenus"
           :theme="getMenuTheme"
+          mixSider
           @menuClick="handleMenuClick"
         />
       </ScrollContainer>