fix: #152 Menu provide,inject undefined

vueComponent · Sep 10, 2021 · b215b43 · b215b43
1 parent 45f4c85
commit b215b43
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 3,167 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ant-design-vue/pro-layout",
-  "version": "3.1.0-beta.5",
+  "version": "3.1.0-beta.6",
   "license": "MIT",
   "files": [
     "dist"
@@ -63,10 +63,10 @@
     "tsc": "^2.0.3",
     "tsup": "^4.12.5",
     "typescript": "^4.3.2",
-    "vite": "^2.4.0",
+    "vite": "^2.5.6",
     "vite-dts": "^1.0.3",
     "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."
 }
diff --git a/src/BasicLayout.tsx b/src/BasicLayout.tsx
@@ -2,7 +2,7 @@ import { computed, reactive, unref, defineComponent, toRefs } from 'vue';
 import type { CSSProperties, PropType, ExtractPropTypes } from 'vue';
 
 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 useMediaQuery from './hooks/useMediaQuery';
 

diff --git a/src/Header.tsx b/src/Header.tsx
@@ -2,7 +2,7 @@ import { defineComponent, computed, toRefs } from 'vue';
 import type { PropType, ExtractPropTypes } from 'vue';
 import type { RouteRecordRaw } from 'vue-router';
 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 type { GlobalHeaderProps } from './GlobalHeader';

diff --git a/src/PageContainer/index.tsx b/src/PageContainer/index.tsx
@@ -9,12 +9,10 @@ import {
   ExtractPropTypes,
 } from 'vue';
 /* replace antd ts define */
+import omit from 'omit.js';
 import { withInstall } from 'ant-design-vue/es/_util/type';
 import PageHeader, { pageHeaderProps } from 'ant-design-vue/es/page-header';
-import Tabs from 'ant-design-vue/es/tabs';
-import Affix from 'ant-design-vue/es/affix';
-import Spin from 'ant-design-vue/es/spin';
-import omit from 'omit.js';
+import { Tabs, Affix, Spin, } from 'ant-design-vue';
 import { TabPaneProps } from './interfaces/TabPane';
 import { TabBarExtraContent, TabsProps } from './interfaces/Tabs';
 import { AffixProps } from './interfaces/Affix';

diff --git a/src/SiderMenu/BaseMenu.tsx b/src/SiderMenu/BaseMenu.tsx
@@ -17,7 +17,7 @@ import {
 } from 'vue';
 import { createFromIconfontCN } from '@ant-design/icons-vue';
 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 { isImg, isUrl } from '../utils';
 import { MenuMode } from './typings';

diff --git a/src/SiderMenu/SiderMenu.tsx b/src/SiderMenu/SiderMenu.tsx
@@ -7,9 +7,8 @@ import {
   unref,
 } from 'vue';
 import 'ant-design-vue/es/layout/style';
-import Layout from 'ant-design-vue/es/layout';
 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 BaseMenu, { baseMenuProps } from './BaseMenu';
 import { WithFalse, CustomRender } from '../typings';

diff --git a/src/SiderMenu/index.tsx b/src/SiderMenu/index.tsx
@@ -1,7 +1,7 @@
 import { FunctionalComponent as FC } from 'vue';
 
 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';
 

diff --git a/src/SiderMenu/typings.ts b/src/SiderMenu/typings.ts
@@ -1,5 +1,6 @@
-import { VNodeChild, CSSProperties, HTMLAttributes } from 'vue';
-export { MenuMode, MenuTheme } from 'ant-design-vue/es/menu/src/interface';
+import type { VNodeChild, CSSProperties, HTMLAttributes } from 'vue';
+
+export type { MenuMode, MenuTheme } from 'ant-design-vue/es/menu/src/interface';
 
 export interface MenuInfo {
   key: string | number;

diff --git a/src/TopNavHeader/index.less b/src/TopNavHeader/index.less
@@ -1,4 +1,3 @@
-@import 'ant-design-vue/es/style/themes/default.less';
 @import '../BasicLayout.less';
 
 @top-nav-header-prefix-cls: ~'@{ant-prefix}-pro-top-nav-header';

diff --git a/vite.config.ts b/vite.config.ts
@@ -19,6 +19,7 @@ export default defineConfig({
     alias: {
       '@ant-design-vue/pro-layout': resolve(__dirname, 'src'),
       '@': resolve(__dirname, 'src'),
+      'vue': 'vue/dist/vue.esm-bundler.js',
     },
   },
   build: {
@@ -27,23 +28,32 @@ export default defineConfig({
       name: 'ProLayout',
     },
     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: {
         exports: 'named',
         // Provide global variables to use in the UMD build
         // for externalized deps
         globals: {
           vue: 'Vue',
           'vue-router': 'VueRouter',
-          moment: 'moment',
-          'ant-design-vue': 'antd',
+          'ant-design-vue': 'antDesignVue',
           '@ant-design/icons-vue': 'iconsVue',
+          'antd': 'antd',
+          moment: 'moment',
         },
       },
     },
   },
   optimizeDeps: {
-    include: ['ant-design-vue/es', '@ant-design/icons-vue', 'lodash-es'],
+    include: ['ant-design-vue', '@ant-design/icons-vue', 'lodash-es'],
   },
   css: {
     postcss: {},