Merge branch 'ui-v0.3' into 'test'

fix: table add width

See merge request opensource/answer!211
This commit is contained in:
Li Shuailing 2022-11-09 10:07:25 +00:00
commit 1398e4bd27
3 changed files with 30 additions and 18 deletions

View File

@ -110,10 +110,12 @@ const Answers: FC = () => {
<thead>
<tr>
<th>{t('post')}</th>
<th>{t('votes')}</th>
<th>{t('created')}</th>
<th>{t('status')}</th>
{curFilter !== 'deleted' && <th>{t('action')}</th>}
<th style={{ width: '11%' }}>{t('votes')}</th>
<th style={{ width: '14%' }}>{t('created')}</th>
<th style={{ width: '11%' }}>{t('status')}</th>
{curFilter !== 'deleted' && (
<th style={{ width: '11%' }}>{t('action')}</th>
)}
</tr>
</thead>
<tbody className="align-middle">
@ -164,7 +166,10 @@ const Answers: FC = () => {
</td>
{curFilter !== 'deleted' && (
<td>
<Button variant="link" onClick={() => handleChange(li.id)}>
<Button
variant="link"
className="p-0 btn-no-border"
onClick={() => handleChange(li.id)}>
{t('change')}
</Button>
</td>

View File

@ -126,12 +126,14 @@ const Questions: FC = () => {
<Table>
<thead>
<tr>
<th style={{ width: '40%' }}>{t('post')}</th>
<th>{t('votes')}</th>
<th>{t('answers')}</th>
<th>{t('post')}</th>
<th style={{ width: '8%' }}>{t('votes')}</th>
<th style={{ width: '8%' }}>{t('answers')}</th>
<th style={{ width: '20%' }}>{t('created')}</th>
<th>{t('status')}</th>
{curFilter !== 'deleted' && <th>{t('action')}</th>}
<th style={{ width: '9%' }}>{t('status')}</th>
{curFilter !== 'deleted' && (
<th style={{ width: '10%' }}>{t('action')}</th>
)}
</tr>
</thead>
<tbody className="align-middle">
@ -177,7 +179,10 @@ const Questions: FC = () => {
</td>
{curFilter !== 'deleted' && (
<td>
<Button variant="link" onClick={() => handleChange(li.id)}>
<Button
variant="link"
className="p-0 btn-no-border"
onClick={() => handleChange(li.id)}>
{t('change')}
</Button>
</td>

View File

@ -86,20 +86,22 @@ const Users: FC = () => {
<Table>
<thead>
<tr>
<th style={{ width: '30%' }}>{t('name')}</th>
<th>{t('reputation')}</th>
<th>{t('name')}</th>
<th style={{ width: '12%' }}>{t('reputation')}</th>
<th style={{ width: '20%' }}>{t('email')}</th>
<th className="text-nowrap" style={{ width: '20%' }}>
<th className="text-nowrap" style={{ width: '15%' }}>
{t('created_at')}
</th>
{(curFilter === 'deleted' || curFilter === 'suspended') && (
<th className="text-nowrap" style={{ width: '15%' }}>
<th className="text-nowrap" style={{ width: '10%' }}>
{curFilter === 'deleted' ? t('delete_at') : t('suspend_at')}
</th>
)}
<th>{t('status')}</th>
{curFilter !== 'deleted' ? <th>{t('action')}</th> : null}
<th style={{ width: '10%' }}>{t('status')}</th>
{curFilter !== 'deleted' ? (
<th style={{ width: '10%' }}>{t('action')}</th>
) : null}
</tr>
</thead>
<tbody className="align-middle">
@ -136,7 +138,7 @@ const Users: FC = () => {
<td>
{user.status !== 'deleted' && (
<Button
className="px-2"
className="p-0 btn-no-border"
variant="link"
onClick={() => handleClick(user)}>
{t('change')}