Merge branch 'dev-4.2.2' of code.alipay.com:oceanbase/oceanbase-devel…

…oper-center into dev-4.2.2

src/component/Task/DataClearTask/DetailContent/index.tsx

@@ -25,13 +25,14 @@ import type { CycleTaskDetail, IDataArchiveJobParameters, TaskOperationType } fr
 import { formatMessage } from '@/util/intl';
 import { getFormatDateTime, kbToMb, mbToKb } from '@/util/utils';
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
-import { Collapse, Descriptions, Divider, Space, message } from 'antd';
+import { Collapse, Descriptions, Divider, Space, message, Typography } from 'antd';
 import React from 'react';
 import styles from '../../index.less';
 import ArchiveRange from './ArchiveRange';
 import ThrottleEditableCell from '../../component/ThrottleEditableCell';
 
 const { Panel } = Collapse;
+const { Text } = Typography;
 
 interface IProps {
   task: CycleTaskDetail<IDataArchiveJobParameters>;
@@ -83,7 +84,10 @@ const DataClearTaskContent: React.FC<IProps> = (props) => {
           span={2}
           label={formatMessage({ id: 'odc.DataClearTask.DetailContent.Database' })} /*数据库*/
         >
-          {task?.databaseName || '-'}
+          <Space size={2}>
+            <span>{task?.databaseName || '-'}</span>
+            <Text type="secondary">{task?.datasource?.name}</Text>
+          </Space>
         </Descriptions.Item>
         {hasFlow && (
           <Descriptions.Item

src/component/Task/component/RollbackModal/index.tsx

@@ -18,7 +18,7 @@ import { RollbackType } from '@/d.ts';
 import { formatMessage } from '@/util/intl';
 import type { RadioChangeEvent } from 'antd';
 import { Modal, Radio, Space, Typography } from 'antd';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 const { Text } = Typography;
 
 interface IProps {
@@ -29,9 +29,9 @@ interface IProps {
 }
 
 const RollBackModal: React.FC<IProps> = (props) => {
-  const { open, generateRollbackPlan, onOk, onCancel } = props;
-  const [value, setValue] = useState<RollbackType>(RollbackType.REF);
-  const [disabledRef, setDisabledRef] = useState(false);
+  const { open, onOk, onCancel } = props;
+  const [value, setValue] = useState<RollbackType>(RollbackType.CUSTOM);
+  const disabledRef = true;
 
   const handleChange = (e: RadioChangeEvent) => {
     setValue(e.target.value);
@@ -41,11 +41,6 @@ const RollBackModal: React.FC<IProps> = (props) => {
     onOk(value);
   };
 
-  useEffect(() => {
-    setDisabledRef(!generateRollbackPlan);
-    setValue(generateRollbackPlan ? RollbackType.REF : RollbackType.CUSTOM);
-  }, [generateRollbackPlan]);
-
   return (
     <Modal
       title={formatMessage({ id: 'odc.component.RollbackModal.Rollback' })}

src/d.ts/index.ts

@@ -2250,6 +2250,11 @@ export interface ICycleTaskRecord<T> {
     name: string;
     dbMode: ConnectionMode;
   };
+  datasource?: {
+    id: number;
+    name: string;
+    dbMode: ConnectionMode;
+  };
   riskLevel?: IRiskLevel;
   description?: string;
 }

src/page/Workspace/components/ViewPage/index.tsx

@@ -356,12 +356,13 @@ class ViewPage extends Component<IProps & { session: SessionStore }, IViewPageSt
   };
 
   showExportResuleSetModal = () => {
-    const { modalStore, session } = this.props;
+    const { modalStore, session, params } = this.props;
     const { resultSet } = this.state;
     const sql = resultSet?.originSql;
     modalStore.changeCreateResultSetExportTaskModal(true, {
       sql,
       databaseId: session?.database.databaseId,
+      tableName: params?.viewName,
     });
   };