From c9d118631b96348185bffe7d5819dfa353d01224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=95=85=E6=99=9A?= <ninalong.lnn@digital-engine.com>
Date: Wed, 13 Nov 2024 17:24:38 +0800
Subject: [PATCH 1/2] PullRequest: 573 fix: update task status enum
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge branch 'fix/task_status_enum of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.3.2

https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/573


Signed-off-by: 晓康 <xxk268858@oceanbase.com>


* fix: update task status enum
* fix: update task operate enum
---
 src/component/Task/component/ActionBar/index.tsx             | 5 +++--
 .../Task/component/CommonDetailModal/TaskOperationRecord.tsx | 2 +-
 src/component/Task/component/Status/index.tsx                | 2 +-
 src/d.ts/index.ts                                            | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/component/Task/component/ActionBar/index.tsx b/src/component/Task/component/ActionBar/index.tsx
index 8172f0684..5ecdc01db 100644
--- a/src/component/Task/component/ActionBar/index.tsx
+++ b/src/component/Task/component/ActionBar/index.tsx
@@ -43,6 +43,7 @@ import {
   SubTaskStatus,
   TaskDetail,
   TaskExecStrategy,
+  TaskOperationType,
   TaskRecord,
   TaskRecordParameters,
   TaskStatus,
@@ -477,7 +478,7 @@ const ActionBar: React.FC<IProps> = inject(
         taskType: TaskType.ALTER_SCHEDULE,
         parameters: {
           taskId: task?.id,
-          operationType: 'TERMINATION',
+          operationType: TaskOperationType.TERMINATED,
         },
       });
       props?.onReload?.();
@@ -1046,7 +1047,7 @@ const ActionBar: React.FC<IProps> = inject(
           break;
         }
         case TaskStatus.APPROVAL_EXPIRED:
-        case TaskStatus.TERMINATION: {
+        case TaskStatus.TERMINATED: {
           if (isOperator) {
             tools = [viewBtn];
           } else {
diff --git a/src/component/Task/component/CommonDetailModal/TaskOperationRecord.tsx b/src/component/Task/component/CommonDetailModal/TaskOperationRecord.tsx
index b7b9e5904..7ae78bd5c 100644
--- a/src/component/Task/component/CommonDetailModal/TaskOperationRecord.tsx
+++ b/src/component/Task/component/CommonDetailModal/TaskOperationRecord.tsx
@@ -46,7 +46,7 @@ export const operationTypeMap = {
     id: 'odc.component.CommonTaskDetailModal.TaskOperationRecord.DisableATask',
     defaultMessage: '停用任务',
   }), //停用任务
-  [TaskOperationType.TERMINATION]: formatMessage({
+  [TaskOperationType.TERMINATED]: formatMessage({
     id: 'odc.component.CommonTaskDetailModal.TaskOperationRecord.TerminateATask',
     defaultMessage: '终止任务',
   }), //终止任务
diff --git a/src/component/Task/component/Status/index.tsx b/src/component/Task/component/Status/index.tsx
index 95770e564..d6cb25c0a 100644
--- a/src/component/Task/component/Status/index.tsx
+++ b/src/component/Task/component/Status/index.tsx
@@ -491,7 +491,7 @@ export const cycleStatus = {
     }), //已禁用
   },
 
-  [TaskStatus.TERMINATION]: {
+  [TaskStatus.TERMINATED]: {
     icon: (
       <StopFilled
         style={{
diff --git a/src/d.ts/index.ts b/src/d.ts/index.ts
index a99094492..a6583abc2 100644
--- a/src/d.ts/index.ts
+++ b/src/d.ts/index.ts
@@ -2959,7 +2959,7 @@ export enum TaskOperationType {
   CREATE = 'CREATE',
   UPDATE = 'UPDATE',
   PAUSE = 'PAUSE',
-  TERMINATION = 'TERMINATION',
+  TERMINATED = 'TERMINATED',
   RESUME = 'RESUME',
 }
 
@@ -3039,7 +3039,7 @@ export enum TaskStatus {
   // 周期任务独有的状态
   PAUSE = 'PAUSE',
   ENABLED = 'ENABLED',
-  TERMINATION = 'TERMINATION',
+  TERMINATED = 'TERMINATED',
   TIMEOUT = 'TIMEOUT',
   PRE_CHECK_FAILED = 'PRE_CHECK_FAILED',
   CREATING = 'CREATING',

From 065967d8bcebe1080983ce4a4305015ed0320ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=AE=BD?= <ck01032299@antgroup.com>
Date: Wed, 13 Nov 2024 17:42:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?PullRequest:=20574=20fix:=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3=E6=81=A2=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E6=B5=81=E9=99=90=E5=88=B6=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge branch 'fix/dataArchiveCreateRecoveryDataSizeFlowRestriction of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.3.2

https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/574


Signed-off-by: 晓康 <xxk268858@oceanbase.com>


* fix:数据归档恢复数据大小流限制输入框
* fix:cr评论修改 通过开关控制展示
* fix:修改字段名
---
 .../DataArchiveTask/CreateModal/index.tsx     |  2 +-
 .../Task/component/ThrottleFormItem/index.tsx | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/component/Task/DataArchiveTask/CreateModal/index.tsx b/src/component/Task/DataArchiveTask/CreateModal/index.tsx
index cf53129b5..8a3683f47 100644
--- a/src/component/Task/DataArchiveTask/CreateModal/index.tsx
+++ b/src/component/Task/DataArchiveTask/CreateModal/index.tsx
@@ -710,7 +710,7 @@ const CreateModal: React.FC<IProps> = (props) => {
               <Radio.Group options={InsertActionOptions} />
             </Form.Item>
             <ShardingStrategyItem />
-            <ThrottleFormItem />
+            <ThrottleFormItem isShowDataSizeLimit={true} />
           </FormItemPanel>
           <DescriptionInput />
         </Form>
diff --git a/src/component/Task/component/ThrottleFormItem/index.tsx b/src/component/Task/component/ThrottleFormItem/index.tsx
index 825f9b6a1..988b6bc00 100644
--- a/src/component/Task/component/ThrottleFormItem/index.tsx
+++ b/src/component/Task/component/ThrottleFormItem/index.tsx
@@ -19,6 +19,7 @@ import HelpDoc from '@/component/helpDoc';
 import setting from '@/store/setting';
 import { Form, InputNumber, Space } from 'antd';
 import React from 'react';
+import { TaskType } from '@/d.ts';
 interface IProps {
   initialValue?: {
     rowLimit?: number;
@@ -26,12 +27,14 @@ interface IProps {
   };
   maxRowLimit?: number;
   maxDataSizeLimit?: number;
+  isShowDataSizeLimit?: boolean;
 }
 const ThrottleFormItem: React.FC<IProps> = (props) => {
   const {
     initialValue,
     maxRowLimit = setting.maxSingleTaskRowLimit,
     maxDataSizeLimit = setting.maxSingleTaskDataSizeLimit,
+    isShowDataSizeLimit,
   } = props;
   return (
     <Form.Item
@@ -82,6 +85,46 @@ const ThrottleFormItem: React.FC<IProps> = (props) => {
             <span>Rows/s</span>
           </Space>
         </Form.Item>
+        {isShowDataSizeLimit ? (
+          <Form.Item
+            label={
+              <Space size={2}>
+                <span>
+                  {
+                    formatMessage({
+                      id: 'odc.src.component.Task.component.ThrottleFormItem.DataSizeLimit',
+                      defaultMessage: '数据大小限流',
+                    }) /* 数据大小限流 */
+                  }
+                </span>
+                <HelpDoc leftText isTip doc="TaskLmitData" />
+              </Space>
+            }
+            required
+          >
+            <Space size={4} align="center">
+              <Form.Item
+                name="dataSizeLimit"
+                style={{
+                  marginBottom: 0,
+                }}
+                rules={[
+                  {
+                    required: true,
+                    message: formatMessage({
+                      id: 'odc.src.component.Task.component.ThrottleFormItem.PleaseLoseTheDataSize',
+                      defaultMessage: '请输数据大小限流',
+                    }), //'请输数据大小限流'
+                  },
+                ]}
+                initialValue={initialValue?.dataSizeLimit}
+              >
+                <InputNumber min={1} max={maxDataSizeLimit} precision={1} />
+              </Form.Item>
+              <span>MB/s</span>
+            </Space>
+          </Form.Item>
+        ) : null}
       </Space>
     </Form.Item>
   );