fix: fixedHeader not work state

qqf1223 · Mar 11, 2021 · cdfcebd · cdfcebd
1 parent 727b17f
commit cdfcebd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/examples/index.tsx b/examples/index.tsx
@@ -29,7 +29,7 @@ const BasicLayout = defineComponent({
     const [RouteContextProvider] = createRouteContext();
 
     const menuData = getMenuData(getRoutes());
-    globalState.menuData = menuData;
+    state.menuData = menuData;
 
     const updateSelectedMenu = () => {
       const matched = route.matched.concat().map(item => item.path);
@@ -65,12 +65,9 @@ const BasicLayout = defineComponent({
     return () => (
       <RouteContextProvider value={state}>
         <ProLayout
+          i18n={(key: string) => key}
           layout={state.layout}
           navTheme={state.navTheme}
-          i18n={(key: string) => key}
-          isMobile={state.isMobile}
-          fixSiderbar={state.fixSiderbar}
-          fixedHeader={state.fixedHeader}
           contentWidth={'Fixed'}
           primaryColor={'#1890ff'}
           contentStyle={{ minHeight: '300px' }}

diff --git a/src/Header.tsx b/src/Header.tsx
@@ -71,7 +71,9 @@ export const HeaderView = defineComponent({
       onCollapse,
     } = toRefs(props);
     const context = useRouteContext();
-    const needFixedHeader = computed(() => fixedHeader.value || layout.value === 'mix');
+    const needFixedHeader = computed(
+      () => fixedHeader.value || context.fixedHeader || layout.value === 'mix',
+    );
     const isTop = computed(() => layout.value === 'top');
     const needSettingWidth = computed(
       () => needFixedHeader.value && hasSiderMenu.value && !isTop.value && !isMobile.value,