Исправлены стили страницы Сообщений

This commit is contained in:
goodmice 2022-10-06 11:47:48 +05:00
parent 799fff7c0e
commit eb9d85c1a4
No known key found for this signature in database
GPG Key ID: 63EA771203189CF1
5 changed files with 40 additions and 29 deletions

View File

@ -11,7 +11,7 @@ import { makeColumn, makeDateColumn, makeNumericColumn, makeNumericSorter, makeT
import { wrapPrivateComponent } from '@utils' import { wrapPrivateComponent } from '@utils'
import { MessageService } from '@api' import { MessageService } from '@api'
import '@styles/message.css' import '@styles/message.less'
const pageSize = 26 const pageSize = 26
const { Search } = Input const { Search } = Input
@ -103,14 +103,16 @@ const Messages = memo(() => {
return ( return (
<> <>
<div className={'filter-group'}> <div className={'filter-group'}>
<h3 className={'filter-group-heading'}>Фильтр сообщений</h3> <h3 className={'head'}>Фильтр сообщений</h3>
<div className={'body'}>
<Select <Select
mode={'multiple'}
allowClear allowClear
mode={'multiple'}
className={'type-filter'}
placeholder={'Фильтр сообщений'} placeholder={'Фильтр сообщений'}
className={'filter-selector'} onChange={setCategories}
value={categories} value={categories}
onChange={setCategories}> >
{children} {children}
</Select> </Select>
<RangePicker showTime onChange={(range) => setRange(range)} /> <RangePicker showTime onChange={(range) => setRange(range)} />
@ -120,6 +122,7 @@ const Messages = memo(() => {
onSearch={onChangeSearchString} onSearch={onChangeSearchString}
/> />
</div> </div>
</div>
<LoaderPortal show={showLoader}> <LoaderPortal show={showLoader}>
<Table <Table
columns={columns} columns={columns}

View File

@ -9,7 +9,7 @@ import { MessageService } from '@api'
import { makeMessageColumns } from '../Messages' import { makeMessageColumns } from '../Messages'
import '@styles/message.css' import '@styles/message.less'
export const ActiveMessagesOnline = memo(({ well: givenWell }) => { export const ActiveMessagesOnline = memo(({ well: givenWell }) => {
const [messages, setMessages] = useState([]) const [messages, setMessages] = useState([])

View File

@ -32,7 +32,7 @@ import SpinPicEnabled from '@images/SpinEnabled.png'
import SpinPicDisabled from '@images/SpinDisabled.png' import SpinPicDisabled from '@images/SpinDisabled.png'
import '@styles/monitoring.less' import '@styles/monitoring.less'
import '@styles/message.css' import '@styles/message.less'
const { Option } = Select const { Option } = Select

View File

@ -140,9 +140,3 @@ html {
tr.table_row_size { tr.table_row_size {
height: 10px; height: 10px;
} }
.filter-selector {
width: 25%;
margin-right: 5px;
margin-left: 5px;
}

18
src/styles/message.css → src/styles/message.less Executable file → Normal file
View File

@ -41,11 +41,25 @@
.filter-group { .filter-group {
margin: 0 0 5px 0; margin: 0 0 5px 0;
}
.filter-group-heading { & .head {
margin: 5px auto; margin: 5px auto;
align-items: center; align-items: center;
}
& .body {
width: 100%;
display: flex;
gap: 5px;
& .type-filter {
width: 25%;
}
& .filter-selector {
flex: 1;
}
}
} }
td.ant-table-column-sort { td.ant-table-column-sort {