8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2025-12-24 03:42:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Richard
2023-06-20 10:56:22 +08:00
parent e1e02f7c2a
commit 7f7801a5f7
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/ResetOffsetDrawer.tsx
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;
}

9
km-console/packages/layout-clusters-fe/src/pages/Consumers/ResetOffsetDrawer.tsx
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;
}

9
km-console/packages/layout-clusters-fe/src/pages/TopicDetail/ResetOffsetDrawer.tsx
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;
}