fix(pro-layout): sider z-index

package.json

@@ -31,23 +31,23 @@
     "tangjinzhou <[email protected]>"
   ],
   "devDependencies": {
-    "@rushstack/eslint-patch": "^1.1.0",
+    "@rushstack/eslint-patch": "^1.1.3",
     "@types/jsdom": "^16.2.14",
-    "@types/node": "^16.11.24",
-    "@vitejs/plugin-vue": "^2.2.0",
-    "@vitejs/plugin-vue-jsx": "^1.3.7",
+    "@types/node": "^16.11.27",
+    "@vitejs/plugin-vue": "^2.3.1",
+    "@vitejs/plugin-vue-jsx": "^1.3.10",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^10.0.0",
-    "@vue/test-utils": "^2.0.0-rc.18",
+    "@vue/test-utils": "^2.0.0-rc.20",
     "@vue/tsconfig": "^0.1.3",
-    "eslint": "^8.9.0",
-    "eslint-plugin-vue": "^8.4.1",
+    "eslint": "^8.13.0",
+    "eslint-plugin-vue": "^8.6.0",
     "jsdom": "^19.0.0",
-    "prettier": "^2.5.1",
+    "prettier": "^2.6.2",
     "typescript": "~4.5.5",
-    "vite": "^2.8.6",
-    "vitest": "^0.5.8",
-    "vue-tsc": "^0.31.4"
+    "vite": "^2.9.5",
+    "vitest": "^0.5.9",
+    "vue-tsc": "^0.34.7"
   },
   "lint-staged": {
     "*.{js,ts,vue,json}": [

packages/pro-layout/examples/App.vue

@@ -1,20 +1,19 @@
 <script setup lang="ts">
 import { RouterView } from 'vue-router';
-import { ConfigProvider as AConfigProvider } from 'ant-design-vue';
+import { ConfigProvider } from 'ant-design-vue';
 
-const getPopupContainer = (triggerNode: HTMLElement): HTMLElement => {
+const getPopupContainer = (triggerNode?: HTMLElement): HTMLElement => {
   // if (dialogContext) {
   //   return dialogContext.getDialogWrap()
   // }
-  console.log('getPopupContainer', triggerNode);
   return document.body;
 };
 </script>
 
 <template>
-  <a-config-provider :get-popup-container="getPopupContainer">
+  <ConfigProvider :get-popup-container="getPopupContainer">
     <RouterView />
-  </a-config-provider>
+  </ConfigProvider>
 </template>
 
 <style>

packages/pro-layout/examples/layouts/BasicLayout.vue

@@ -6,8 +6,7 @@
     v-bind="state"
     :loading="loading"
     :breadcrumb="{ routes: breadcrumb }"
-    disable-content-margin
-    style="height: 100vh"
+    style="min-height: 100vh"
     iconfont-url="//at.alicdn.com/t/font_2804900_nzigh7z84gc.js"
   >
     <template #menuHeaderRender>
@@ -110,12 +109,12 @@ export default defineComponent({
 
     const state = reactive({
       menuData,
-      splitMenus: true,
+      splitMenus: false,
       // title: 'ProLayout',
       // logo: 'https://alicdn.antdv.com/v2/assets/logo.1ef800a8.svg',
-      navTheme: 'dark',
-      layout: 'side',
-      fixSiderbar: true,
+      navTheme: 'light',
+      layout: 'top',
+      fixSiderbar: false,
       fixedHeader: true,
     });
     const breadcrumb = computed(() =>

packages/pro-layout/examples/main.ts

@@ -6,6 +6,11 @@ import App from './App.vue';
 import router from './router';
 import icons from './icons';
 
+// functional
+import 'ant-design-vue/es/result/style';
+import 'ant-design-vue/es/button/style';
+import 'ant-design-vue/es/message/style';
+
 const app = createApp(App);
 
 app.use(router);

packages/pro-layout/examples/views/Hello.vue

@@ -16,9 +16,6 @@
 
 <script lang="ts" setup>
 import { Result as AResult, Button as AButton, message } from 'ant-design-vue';
-import 'ant-design-vue/es/result/style';
-import 'ant-design-vue/es/button/style';
-import 'ant-design-vue/es/message/style';
 
 const handleClick = () => {
   console.log('info');

packages/pro-layout/package.json

@@ -27,34 +27,34 @@
     "./dist/style.less": "./dist/style.less"
   },
   "dependencies": {
-    "@ant-design/icons-vue": "^6.0.1",
-    "ant-design-vue": "^3.1.0",
+    "@ant-design/icons-vue": "^6.1.0",
+    "ant-design-vue": "^3.1.1",
     "omit.js": "^2.0.2",
-    "vue": "^3.2.31",
-    "vue-router": "^4.0.12"
+    "vue": "^3.2.33",
+    "vue-router": "^4.0.14"
   },
   "devDependencies": {
-    "@rollup/plugin-typescript": "^8.3.0",
-    "@rushstack/eslint-patch": "^1.1.0",
+    "@rollup/plugin-typescript": "^8.3.2",
+    "@rushstack/eslint-patch": "^1.1.3",
     "@shared/vite-plugin-less-copy": "workspace:^0.0.0",
     "@types/jsdom": "^16.2.14",
-    "@types/node": "^16.11.26",
-    "@vitejs/plugin-vue": "^2.2.2",
-    "@vitejs/plugin-vue-jsx": "^1.3.8",
+    "@types/node": "^16.11.27",
+    "@vitejs/plugin-vue": "^2.3.1",
+    "@vitejs/plugin-vue-jsx": "^1.3.10",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^10.0.0",
-    "@vue/test-utils": "^2.0.0-rc.18",
+    "@vue/test-utils": "^2.0.0-rc.20",
     "@vue/tsconfig": "^0.1.3",
-    "eslint": "^8.5.0",
+    "eslint": "^8.13.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^8.2.0",
+    "eslint-plugin-vue": "^8.6.0",
     "jsdom": "^19.0.0",
     "less": "^4.1.2",
-    "prettier": "^2.5.1",
+    "prettier": "^2.6.2",
     "typescript": "~4.5.5",
-    "vite": "^2.8.6",
-    "vitest": "^0.5.0",
-    "vue-tsc": "^0.31.4"
+    "vite": "^2.9.5",
+    "vitest": "^0.5.9",
+    "vue-tsc": "^0.34.7"
   },
   "contributors": [
     "tangjinzhou <[email protected]>",

packages/pro-layout/src/components/SiderMenu/index.less

@@ -8,6 +8,8 @@
   position: relative;
   background-color: @layout-sider-background;
   border-right: 0;
+  // FIXME: 临时修正(可能不会做兼容)
+  z-index: 20;
 
   // 这里关掉了动画，不然使用无法兼容
   .@{ant-prefix}-menu {