Commit b215b43c authored by Sendya's avatar Sendya

fix: #152 Menu provide,inject undefined

parent 45f4c856
{ {
"name": "@ant-design-vue/pro-layout", "name": "@ant-design-vue/pro-layout",
"version": "3.1.0-beta.5", "version": "3.1.0-beta.6",
"license": "MIT", "license": "MIT",
"files": [ "files": [
"dist" "dist"
...@@ -63,10 +63,10 @@ ...@@ -63,10 +63,10 @@
"tsc": "^2.0.3", "tsc": "^2.0.3",
"tsup": "^4.12.5", "tsup": "^4.12.5",
"typescript": "^4.3.2", "typescript": "^4.3.2",
"vite": "^2.4.0", "vite": "^2.5.6",
"vite-dts": "^1.0.3", "vite-dts": "^1.0.3",
"vite-plugin-dts": "^0.5.2", "vite-plugin-dts": "^0.5.2",
"vue-tsc": "^0.0.24" "vue-tsc": "^0.3.0"
}, },
"description": "Ant Design Pro Layout of Vue, easy to use pro scaffolding." "description": "Ant Design Pro Layout of Vue, easy to use pro scaffolding."
} }
...@@ -2,7 +2,7 @@ import { computed, reactive, unref, defineComponent, toRefs } from 'vue'; ...@@ -2,7 +2,7 @@ import { computed, reactive, unref, defineComponent, toRefs } from 'vue';
import type { CSSProperties, PropType, ExtractPropTypes } from 'vue'; import type { CSSProperties, PropType, ExtractPropTypes } from 'vue';
import 'ant-design-vue/es/layout/style'; import 'ant-design-vue/es/layout/style';
import Layout from 'ant-design-vue/es/layout'; import { Layout } from 'ant-design-vue';
import { withInstall } from 'ant-design-vue/es/_util/type'; import { withInstall } from 'ant-design-vue/es/_util/type';
import useMediaQuery from './hooks/useMediaQuery'; import useMediaQuery from './hooks/useMediaQuery';
......
...@@ -2,7 +2,7 @@ import { defineComponent, computed, toRefs } from 'vue'; ...@@ -2,7 +2,7 @@ import { defineComponent, computed, toRefs } from 'vue';
import type { PropType, ExtractPropTypes } from 'vue'; import type { PropType, ExtractPropTypes } from 'vue';
import type { RouteRecordRaw } from 'vue-router'; import type { RouteRecordRaw } from 'vue-router';
import 'ant-design-vue/es/layout/style'; import 'ant-design-vue/es/layout/style';
import Layout from 'ant-design-vue/es/layout'; import { Layout } from 'ant-design-vue';
import { GlobalHeader } from './GlobalHeader'; import { GlobalHeader } from './GlobalHeader';
import type { GlobalHeaderProps } from './GlobalHeader'; import type { GlobalHeaderProps } from './GlobalHeader';
......
...@@ -9,12 +9,10 @@ import { ...@@ -9,12 +9,10 @@ import {
ExtractPropTypes, ExtractPropTypes,
} from 'vue'; } from 'vue';
/* replace antd ts define */ /* replace antd ts define */
import omit from 'omit.js';
import { withInstall } from 'ant-design-vue/es/_util/type'; import { withInstall } from 'ant-design-vue/es/_util/type';
import PageHeader, { pageHeaderProps } from 'ant-design-vue/es/page-header'; import PageHeader, { pageHeaderProps } from 'ant-design-vue/es/page-header';
import Tabs from 'ant-design-vue/es/tabs'; import { Tabs, Affix, Spin, } from 'ant-design-vue';
import Affix from 'ant-design-vue/es/affix';
import Spin from 'ant-design-vue/es/spin';
import omit from 'omit.js';
import { TabPaneProps } from './interfaces/TabPane'; import { TabPaneProps } from './interfaces/TabPane';
import { TabBarExtraContent, TabsProps } from './interfaces/Tabs'; import { TabBarExtraContent, TabsProps } from './interfaces/Tabs';
import { AffixProps } from './interfaces/Affix'; import { AffixProps } from './interfaces/Affix';
......
...@@ -17,7 +17,7 @@ import { ...@@ -17,7 +17,7 @@ import {
} from 'vue'; } from 'vue';
import { createFromIconfontCN } from '@ant-design/icons-vue'; import { createFromIconfontCN } from '@ant-design/icons-vue';
import 'ant-design-vue/es/menu/style'; import 'ant-design-vue/es/menu/style';
import Menu from 'ant-design-vue/es/menu'; import { Menu } from 'ant-design-vue';
import { defaultSettingProps, defaultSettings } from '../defaultSettings'; import { defaultSettingProps, defaultSettings } from '../defaultSettings';
import { isImg, isUrl } from '../utils'; import { isImg, isUrl } from '../utils';
import { MenuMode } from './typings'; import { MenuMode } from './typings';
......
...@@ -7,9 +7,8 @@ import { ...@@ -7,9 +7,8 @@ import {
unref, unref,
} from 'vue'; } from 'vue';
import 'ant-design-vue/es/layout/style'; import 'ant-design-vue/es/layout/style';
import Layout from 'ant-design-vue/es/layout';
import 'ant-design-vue/es/menu/style'; import 'ant-design-vue/es/menu/style';
import Menu from 'ant-design-vue/es/menu'; import { Layout, Menu } from 'ant-design-vue';
import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons-vue'; import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons-vue';
import BaseMenu, { baseMenuProps } from './BaseMenu'; import BaseMenu, { baseMenuProps } from './BaseMenu';
import { WithFalse, CustomRender } from '../typings'; import { WithFalse, CustomRender } from '../typings';
......
import { FunctionalComponent as FC } from 'vue'; import { FunctionalComponent as FC } from 'vue';
import 'ant-design-vue/es/drawer/style'; import 'ant-design-vue/es/drawer/style';
import Drawer from 'ant-design-vue/es/drawer'; import { Drawer } from 'ant-design-vue';
import SiderMenu, { siderMenuProps, SiderMenuProps, PrivateSiderMenuProps } from './SiderMenu'; import SiderMenu, { siderMenuProps, SiderMenuProps, PrivateSiderMenuProps } from './SiderMenu';
......
import { VNodeChild, CSSProperties, HTMLAttributes } from 'vue'; import type { VNodeChild, CSSProperties, HTMLAttributes } from 'vue';
export { MenuMode, MenuTheme } from 'ant-design-vue/es/menu/src/interface';
export type { MenuMode, MenuTheme } from 'ant-design-vue/es/menu/src/interface';
export interface MenuInfo { export interface MenuInfo {
key: string | number; key: string | number;
......
@import 'ant-design-vue/es/style/themes/default.less';
@import '../BasicLayout.less'; @import '../BasicLayout.less';
@top-nav-header-prefix-cls: ~'@{ant-prefix}-pro-top-nav-header'; @top-nav-header-prefix-cls: ~'@{ant-prefix}-pro-top-nav-header';
......
...@@ -19,6 +19,7 @@ export default defineConfig({ ...@@ -19,6 +19,7 @@ export default defineConfig({
alias: { alias: {
'@ant-design-vue/pro-layout': resolve(__dirname, 'src'), '@ant-design-vue/pro-layout': resolve(__dirname, 'src'),
'@': resolve(__dirname, 'src'), '@': resolve(__dirname, 'src'),
'vue': 'vue/dist/vue.esm-bundler.js',
}, },
}, },
build: { build: {
...@@ -27,7 +28,15 @@ export default defineConfig({ ...@@ -27,7 +28,15 @@ export default defineConfig({
name: 'ProLayout', name: 'ProLayout',
}, },
rollupOptions: { rollupOptions: {
external: ['vue', 'vue-router', '@ant-design/icons-vue', 'ant-design-vue', 'antd', 'moment'],
external: [
'vue',
'vue-router',
'@ant-design/icons-vue',
'ant-design-vue',
'antd',
'moment',
],
output: { output: {
exports: 'named', exports: 'named',
// Provide global variables to use in the UMD build // Provide global variables to use in the UMD build
...@@ -35,15 +44,16 @@ export default defineConfig({ ...@@ -35,15 +44,16 @@ export default defineConfig({
globals: { globals: {
vue: 'Vue', vue: 'Vue',
'vue-router': 'VueRouter', 'vue-router': 'VueRouter',
moment: 'moment', 'ant-design-vue': 'antDesignVue',
'ant-design-vue': 'antd',
'@ant-design/icons-vue': 'iconsVue', '@ant-design/icons-vue': 'iconsVue',
'antd': 'antd',
moment: 'moment',
}, },
}, },
}, },
}, },
optimizeDeps: { optimizeDeps: {
include: ['ant-design-vue/es', '@ant-design/icons-vue', 'lodash-es'], include: ['ant-design-vue', '@ant-design/icons-vue', 'lodash-es'],
}, },
css: { css: {
postcss: {}, postcss: {},
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment