diff --git a/src/components/Menu/index.ts b/src/components/Menu/index.ts index 088c3793e4105e5e709173d70c2146703bcec755..5f457bc374f8f6c031add052f361b3c1da1524c7 100644 --- a/src/components/Menu/index.ts +++ b/src/components/Menu/index.ts @@ -1,9 +1,9 @@ -import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent'; +// import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent'; import BasicMenu from './src/BasicMenu.vue'; // export const BasicMenu = createAsyncComponent(() => import('./src/BasicMenu.vue')); -export const MenuTag = createAsyncComponent(() => import('./src/components/MenuItemTag.vue')); +// export const MenuTag = createAsyncComponent(() => import('./src/components/MenuItemTag.vue')); export { BasicMenu }; diff --git a/src/components/Menu/src/components/ExpandIcon.vue b/src/components/Menu/src/components/ExpandIcon.vue deleted file mode 100644 index eafd5ed63d3540e284679764295c8a03cabe06b7..0000000000000000000000000000000000000000 --- a/src/components/Menu/src/components/ExpandIcon.vue +++ /dev/null @@ -1,43 +0,0 @@ - - diff --git a/src/components/Menu/src/components/MenuItemTag.vue b/src/components/Menu/src/components/MenuItemTag.vue deleted file mode 100644 index 81567d8b3bbad2bb88afd22baa550879dfe73ce8..0000000000000000000000000000000000000000 --- a/src/components/Menu/src/components/MenuItemTag.vue +++ /dev/null @@ -1,57 +0,0 @@ - - diff --git a/src/components/SimpleMenu/index.ts b/src/components/SimpleMenu/index.ts index 8e4960685f72e93796b75910781b5c06d4661643..0dfd248551eeefeb6a816609bcfdb1329a23e759 100644 --- a/src/components/SimpleMenu/index.ts +++ b/src/components/SimpleMenu/index.ts @@ -1 +1,2 @@ export { default as SimpleMenu } from './src/SimpleMenu.vue'; +export { default as SimpleMenuTag } from './src/SimpleMenuTag.vue'; diff --git a/src/components/SimpleMenu/src/SimpleMenuTag.vue b/src/components/SimpleMenu/src/SimpleMenuTag.vue index 45c4ad1fea43ff6d4522e53addd6afe61e6a3098..94992e6b665f99598ac5074c38bf43eafc65f9f6 100644 --- a/src/components/SimpleMenu/src/SimpleMenuTag.vue +++ b/src/components/SimpleMenu/src/SimpleMenuTag.vue @@ -8,6 +8,7 @@ import { defineComponent, computed } from 'vue'; import { useDesign } from '/@/hooks/web/useDesign'; + import { propTypes } from '/@/utils/propTypes'; export default defineComponent({ name: 'SimpleMenuTag', @@ -16,10 +17,8 @@ type: Object as PropType, default: {}, }, - collapseParent: { - type: Boolean as PropType, - default: false, - }, + dot: propTypes.bool, + collapseParent: propTypes.bool, }, setup(props) { const { prefixCls } = useDesign('simple-menu'); @@ -56,7 +55,7 @@ [`${tagCls}--${type}`], { [`${tagCls}--collapse`]: collapseParent, - [`${tagCls}--dot`]: dot, + [`${tagCls}--dot`]: dot || props.dot, }, ]; }); diff --git a/src/layouts/default/sider/MixSider.vue b/src/layouts/default/sider/MixSider.vue index 20c059abe82dd2e96f2aa007e17d942e1f890ff0..352abeafddd936d2a9f6a21c5fd9980f1b8d35b1 100644 --- a/src/layouts/default/sider/MixSider.vue +++ b/src/layouts/default/sider/MixSider.vue @@ -1,6 +1,5 @@