Подготовка к обновлению AntD и мелкие исправления

This commit is contained in:
goodmice 2022-10-21 10:35:13 +05:00
parent 91556aaf81
commit a1f1ce1915
No known key found for this signature in database
GPG Key ID: 63EA771203189CF1
3 changed files with 4 additions and 4 deletions

View File

@ -23,7 +23,7 @@ import '@styles/layout.less'
const { Content, Sider } = Layout const { Content, Sider } = Layout
export type LayoutPortalProps = LayoutProps & { export type LayoutPortalProps = Omit<LayoutProps, 'children'> & {
title?: ReactNode title?: ReactNode
sheet?: boolean sheet?: boolean
showSelector?: boolean showSelector?: boolean
@ -68,7 +68,7 @@ const _LayoutPortal = memo(() => {
return ( return (
<Layout className={`page-layout ${isAdmin ? 'page-layout-admin' : ''}`}> <Layout className={`page-layout ${isAdmin ? 'page-layout-admin' : ''}`}>
{(sider || siderProps) && ( {(sider || siderProps) && (
<Sider {...siderProps} collapsed={menuCollapsed} trigger={null} collapsible className={`menu-sider ${siderProps?.className || ''}`}> <Sider {...siderProps} collapsedWidth={50} collapsed={menuCollapsed} trigger={null} collapsible className={`menu-sider ${siderProps?.className || ''}`}>
<div className={'sider-content'}> <div className={'sider-content'}>
<button className={'sider-toogle'} onClick={() => setMenuCollapsed((prev) => !prev)}> <button className={'sider-toogle'} onClick={() => setMenuCollapsed((prev) => !prev)}>
{menuCollapsed ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />} {menuCollapsed ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />}

View File

@ -1,7 +1,7 @@
import { createContext, useContext, useEffect } from 'react' import { createContext, useContext, useEffect } from 'react'
import { LayoutPortalProps } from '@components/LayoutPortal'
import { UserTokenDto, WellDto } from '@api' import { UserTokenDto, WellDto } from '@api'
import { LayoutPortalProps } from './components/LayoutPortal'
/** Контекст текущей скважины */ /** Контекст текущей скважины */
export const WellContext = createContext<[WellDto, (well: WellDto) => void]>([{}, () => {}]) export const WellContext = createContext<[WellDto, (well: WellDto) => void]>([{}, () => {}])

View File

@ -88,7 +88,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 100%; width: 100%;
height: @header-height !important; height: calc(@header-height - 4px) !important;
color: @link-color; color: @link-color;
border: none; border: none;
outline: none; outline: none;