mirror of https://gitee.com/answerdev/answer.git
fix: question list add operator info
This commit is contained in:
parent
29b1c00d6a
commit
b7152d5f0d
|
@ -126,7 +126,13 @@ const Header: FC = () => {
|
|||
<NavItems redDot={redDot} userInfo={user} logOut={handleLogout} />
|
||||
) : (
|
||||
<>
|
||||
<Button variant="link" className="me-2" href="/users/login">
|
||||
<Button
|
||||
variant="link"
|
||||
className={classnames('me-2', {
|
||||
'link-light': navbarStyle === 'theme-colored',
|
||||
'link-primary': navbarStyle !== 'theme-colored',
|
||||
})}
|
||||
href="/users/login">
|
||||
{t('btns.login')}
|
||||
</Button>
|
||||
{loginSetting.allow_new_registrations && (
|
||||
|
|
|
@ -28,60 +28,6 @@ interface Props {
|
|||
source: 'questions' | 'tag';
|
||||
}
|
||||
|
||||
const QuestionLastUpdate = ({ q, order }) => {
|
||||
const { t } = useTranslation('translation', { keyPrefix: 'question' });
|
||||
if (order !== 'newest' && q.update_time > q.edit_time) {
|
||||
// question answered
|
||||
return (
|
||||
<div className="d-flex">
|
||||
<BaseUserCard
|
||||
data={q.last_answered_user_info}
|
||||
showAvatar={false}
|
||||
className="me-1"
|
||||
/>
|
||||
•
|
||||
<FormatTime
|
||||
time={q.update_time}
|
||||
className="text-secondary ms-1"
|
||||
preFix={t('answered')}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (order !== 'newest' && q.edit_time > q.update_time) {
|
||||
// question modified
|
||||
return (
|
||||
<div className="d-flex">
|
||||
<BaseUserCard
|
||||
data={q.update_user_info}
|
||||
showAvatar={false}
|
||||
className="me-1"
|
||||
/>
|
||||
•
|
||||
<FormatTime
|
||||
time={q.edit_time}
|
||||
className="text-secondary ms-1"
|
||||
preFix={t('modified')}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// default: asked
|
||||
return (
|
||||
<div className="d-flex">
|
||||
<BaseUserCard data={q.user_info} showAvatar={false} className="me-1" />
|
||||
•
|
||||
<FormatTime
|
||||
time={q.create_time}
|
||||
preFix={t('asked')}
|
||||
className="text-secondary ms-1"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const QuestionList: FC<Props> = ({ source }) => {
|
||||
const { t } = useTranslation('translation', { keyPrefix: 'question' });
|
||||
const { tagName = '' } = useParams();
|
||||
|
@ -132,7 +78,19 @@ const QuestionList: FC<Props> = ({ source }) => {
|
|||
</NavLink>
|
||||
</h5>
|
||||
<div className="d-flex flex-column flex-md-row align-items-md-center fs-14 mb-2 text-secondary">
|
||||
<QuestionLastUpdate q={li} order={curOrder} />
|
||||
<div className="d-flex">
|
||||
<BaseUserCard
|
||||
data={li.operator}
|
||||
showAvatar={false}
|
||||
className="me-1"
|
||||
/>
|
||||
•
|
||||
<FormatTime
|
||||
time={li.operated_at}
|
||||
className="text-secondary ms-1"
|
||||
preFix={t(li.operation_type)}
|
||||
/>
|
||||
</div>
|
||||
<div className="ms-0 ms-md-3 mt-2 mt-md-0">
|
||||
<span>
|
||||
<Icon name="hand-thumbs-up-fill" />
|
||||
|
|
Loading…
Reference in New Issue