ソースを参照

chore: update README.md

vben 4 年 前
コミット
0c2e72d22a

+ 1 - 0
CHANGELOG.zh_CN.md

@@ -14,6 +14,7 @@
 ### 🎫 Chores
 
 - 首屏 loading 修改
+- 升级`vue`到`3.0.4`
 
 ### 🐛 Bug Fixes
 

+ 29 - 22
src/layouts/default/header/LayoutHeader.tsx

@@ -3,7 +3,13 @@ import './index.less';
 import type { FunctionalComponent } from 'vue';
 import type { Component } from '/@/components/types';
 
-import { defineComponent, unref, computed, ref, nextTick } from 'vue';
+import {
+  defineComponent,
+  unref,
+  computed,
+  ref,
+  // nextTick
+} from 'vue';
 
 import { Layout, Tooltip, Badge } from 'ant-design-vue';
 import { AppLogo } from '/@/components/Application';
@@ -24,7 +30,7 @@ import { useModal } from '/@/components/Modal';
 
 import { useFullscreen } from '/@/hooks/web/useFullScreen';
 import { useTabs } from '/@/hooks/web/useTabs';
-import { useWindowSizeFn } from '/@/hooks/event/useWindowSizeFn';
+// import { useWindowSizeFn } from '/@/hooks/event/useWindowSizeFn';
 import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
 import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
 import { useRootSetting } from '/@/hooks/setting/useRootSetting';
@@ -61,9 +67,9 @@ export default defineComponent({
     fixed: propTypes.bool,
   },
   setup(props) {
-    let logoEl: Element | null | undefined;
+    // let logoEl: Element | null | undefined;
 
-    const logoWidthRef = ref(200);
+    // const logoWidthRef = ref(200);
     const logoRef = ref<ComponentRef>(null);
     const { refreshPage } = useTabs();
     const { t } = useI18n();
@@ -88,22 +94,22 @@ export default defineComponent({
     const [register, { openModal }] = useModal();
     const { toggleFullscreen, isFullscreenRef } = useFullscreen();
 
-    useWindowSizeFn(
-      () => {
-        nextTick(() => {
-          if (!unref(getShowTopMenu)) return;
-          let width = 0;
-          if (!logoEl) {
-            logoEl = unref(logoRef)?.$el;
-          } else {
-            width += logoEl.clientWidth;
-          }
-          logoWidthRef.value = width + 80;
-        });
-      },
-      200,
-      { immediate: true }
-    );
+    // useWindowSizeFn(
+    //   () => {
+    //     nextTick(() => {
+    //       if (!unref(getShowTopMenu)) return;
+    //       let width = 0;
+    //       if (!logoEl) {
+    //         logoEl = unref(logoRef)?.$el;
+    //       } else {
+    //         width += logoEl.clientWidth;
+    //       }
+    //       logoWidthRef.value = width + 80;
+    //     });
+    //   },
+    //   200,
+    //   { immediate: true }
+    // );
 
     const headerClass = computed(() => {
       const theme = unref(getHeaderTheme);
@@ -129,7 +135,7 @@ export default defineComponent({
     }
 
     function renderHeaderContent() {
-      const width = unref(logoWidthRef);
+      // const width = unref(logoWidthRef);
       return (
         <div class="layout-header__content ">
           {unref(getShowHeaderLogo) && (
@@ -146,7 +152,8 @@ export default defineComponent({
           )}
 
           {unref(getShowTopMenu) && (
-            <div class={[`layout-header__menu `]} style={{ width: `calc(100% - ${width}px)` }}>
+            // <div class={[`layout-header__menu `]} style={{ width: `calc(100% - ${width}px)` }}>
+            <div class={[`layout-header__menu `]}>
               <LayoutMenu
                 isHorizontal={true}
                 class={`justify-${unref(getTopMenuAlign)}`}

+ 1 - 1
src/router/scrollBehaviour.ts

@@ -40,7 +40,7 @@ class ScrollQueue {
 
   add() {
     this.promise = new Promise((resolve) => {
-      this.resolve = resolve;
+      this.resolve = resolve as () => void;
     });
   }