Skip to content

Commit

Permalink
Merge branch 'dev-4.2.4' of https://code.alipay.com/oceanbase/oceanba…
Browse files Browse the repository at this point in the history
…se-developer-center into dev-4.2.4
  • Loading branch information
HSunboy committed Apr 24, 2024
2 parents e27a05f + fa81b47 commit f2f317f
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/component/Task/DataArchiveTask/DetailContent/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import VariableConfigTable from '@/component/Task/component/VariableConfigTable'
import { isCycleTriggerStrategy } from '@/component/Task/helper';
import setting from '@/store/setting';
import type { CycleTaskDetail, IDataArchiveJobParameters, TaskOperationType } from '@/d.ts';
import { TaskExecStrategy } from '@/d.ts';
import { formatMessage } from '@/util/intl';
import { getFormatDateTime, kbToMb, mbToKb } from '@/util/utils';
import { DownOutlined, UpOutlined } from '@ant-design/icons';
Expand All @@ -31,6 +32,8 @@ import styles from '../../index.less';
import { InsertActionOptions } from '../CreateModal';
import ArchiveRange from './ArchiveRange';
import ThrottleEditableCell from '../../component/ThrottleEditableCell';
import { getLocalFormatDateTime } from '@/util/utils';

const { Text } = Typography;
const { Panel } = Collapse;
interface IProps {
Expand Down Expand Up @@ -189,6 +192,11 @@ const DataArchiveTaskContent: React.FC<IProps> = (props) => {
>
{taskExecStrategyMap[triggerConfig.triggerStrategy]}
</Descriptions.Item>
{triggerConfig.triggerStrategy === TaskExecStrategy.START_AT && (
<Descriptions.Item label="执行时间">
{getLocalFormatDateTime(triggerConfig?.startAt)}
</Descriptions.Item>
)}
{isCycleStrategy && (
<Descriptions.Item>
<Collapse
Expand Down

0 comments on commit f2f317f

Please sign in to comment.