From 7f7801a5f731eaf745a1c21145d5aabc1fc4284e Mon Sep 17 00:00:00 2001
From: Richard <18310231437@163.com>
Date: Tue, 20 Jun 2023 10:56:22 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=E6=B6=88=E8=B4=B9=E7=BB=84=E4=B8=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=87=8D=E7=BD=AE=E5=88=B0=E6=9C=80=E6=97=A7?=
 =?UTF-8?q?Offset=E7=9A=84=E9=97=AE=E9=A2=98=20(#1039)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/ConsumerGroup/ResetOffsetDrawer.tsx        | 9 +++++----
 .../src/pages/Consumers/ResetOffsetDrawer.tsx            | 9 +++++----
 .../src/pages/TopicDetail/ResetOffsetDrawer.tsx          | 9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/ResetOffsetDrawer.tsx b/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/ResetOffsetDrawer.tsx
index b03f6832..75cc390a 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/ResetOffsetDrawer.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/ResetOffsetDrawer.tsx
@@ -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;
       }
diff --git a/km-console/packages/layout-clusters-fe/src/pages/Consumers/ResetOffsetDrawer.tsx b/km-console/packages/layout-clusters-fe/src/pages/Consumers/ResetOffsetDrawer.tsx
index bba5059e..7a2b02e7 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/Consumers/ResetOffsetDrawer.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/Consumers/ResetOffsetDrawer.tsx
@@ -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;
       }
diff --git a/km-console/packages/layout-clusters-fe/src/pages/TopicDetail/ResetOffsetDrawer.tsx b/km-console/packages/layout-clusters-fe/src/pages/TopicDetail/ResetOffsetDrawer.tsx
index c079393b..ed948e8c 100644
--- a/km-console/packages/layout-clusters-fe/src/pages/TopicDetail/ResetOffsetDrawer.tsx
+++ b/km-console/packages/layout-clusters-fe/src/pages/TopicDetail/ResetOffsetDrawer.tsx
@@ -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;
       }