[Bugfix]消费组不支持重置到最旧Offset的问题 (#1039) (#1059)

修复了消费组不支持重置到最旧Offset的问题
This commit is contained in:
lucasun
2023-06-29 11:03:44 +08:00
committed by GitHub
3 changed files with 15 additions and 12 deletions

View File

@@ -19,18 +19,19 @@ const CustomSelectResetTime = (props: { value?: string; onChange?: (val: Number
}}
onChange={(e) => {
setTimeSetMode(e.target.value);
if (e.target.value === 'newest') {
onChange('newest');
if (e.target.value === 'newest' || e.target.value === 'oldest') {
onChange(e.target.value);
}
}}
value={timeSetMode}
>
<Radio value={'newest'}>Offset</Radio>
<Radio value={'oldest'}>Offset</Radio>
<Radio value={'custom'}></Radio>
</Radio.Group>
{timeSetMode === 'custom' && (
<DatePicker
value={moment(value === 'newest' ? Date.now() : value)}
value={moment(value === 'newest' || value === 'oldest' ? Date.now() : value)}
style={{ width: '100%' }}
showTime={true}
onChange={(v) => {
@@ -88,7 +89,7 @@ export default (props: any) => {
topicName: record.topicName,
};
if (formData.resetType === 'assignedTime') {
resetParams.resetType = formData.timestamp === 'newest' ? 0 : 2;
resetParams.resetType = formData.timestamp === 'newest' ? 0 : formData.timestamp === 'oldest' ? 1 : 2;
if (resetParams.resetType === 2) {
resetParams.timestamp = formData.timestamp;
}

View File

@@ -22,18 +22,19 @@ const CustomSelectResetTime = (props: { value?: string; onChange?: (val: number
}}
onChange={(e) => {
setTimeSetMode(e.target.value);
if (e.target.value === 'newest') {
onChange('newest');
if (e.target.value === 'newest' || e.target.value === 'oldest') {
onChange(e.target.value);
}
}}
value={timeSetMode}
>
<Radio value={'newest'}>Offset</Radio>
<Radio value={'oldest'}>Offset</Radio>
<Radio value={'custom'}></Radio>
</Radio.Group>
{timeSetMode === 'custom' && (
<DatePicker
value={moment(value === 'newest' ? Date.now() : value)}
value={moment(value === 'newest' || value === 'oldest' ? Date.now() : value)}
style={{ width: '100%' }}
showTime={true}
onChange={(v) => {
@@ -91,7 +92,7 @@ export default (props: any) => {
topicName: record.topicName,
};
if (formData.resetType === 'assignedTime') {
resetParams.resetType = formData.timestamp === 'newest' ? 0 : 2;
resetParams.resetType = formData.timestamp === 'newest' ? 0 : formData.timestamp === 'oldest' ? 1 : 2;
if (resetParams.resetType === 2) {
resetParams.timestamp = formData.timestamp;
}

View File

@@ -19,18 +19,19 @@ const CustomSelectResetTime = (props: { value?: string; onChange?: (val: Number
}}
onChange={(e) => {
setTimeSetMode(e.target.value);
if (e.target.value === 'newest') {
onChange('newest');
if (e.target.value === 'newest' || e.target.value === 'oldest') {
onChange(e.target.value);
}
}}
value={timeSetMode}
>
<Radio value={'newest'}>Offset</Radio>
<Radio value={'oldest'}>Offset</Radio>
<Radio value={'custom'}></Radio>
</Radio.Group>
{timeSetMode === 'custom' && (
<DatePicker
value={moment(value === 'newest' ? Date.now() : value)}
value={moment(value === 'newest' || value === 'oldest' ? Date.now() : value)}
style={{ width: '100%' }}
showTime={true}
onChange={(v) => {
@@ -88,7 +89,7 @@ export default (props: any) => {
topicName: record.topicName,
};
if (formData.resetType === 'assignedTime') {
resetParams.resetType = formData.timestamp === 'newest' ? 0 : 2;
resetParams.resetType = formData.timestamp === 'newest' ? 0 : formData.timestamp === 'oldest' ? 1 : 2;
if (resetParams.resetType === 2) {
resetParams.timestamp = formData.timestamp;
}