feat(clone): allow same-source cloning and disable cross-sourceType targets

- Remove the restriction that prevents cloning to the same data source
- Disable (instead of hide) target options with different sourceType
- Add sourceType label (MT4/MT5) to data source select options
- Preserve groupFilter/param1/param2 when cloning to same source
- Auto-reset target when source changes to incompatible sourceType
- Remove parent-level check requiring at least 2 data sources

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
2026-06-14 21:39:01 +08:00
parent dfcba94cf5
commit 16999ca583
4 changed files with 174 additions and 97 deletions

View File

@@ -232,22 +232,22 @@ const MultiCopyPopup = ({
onValuesChange={({ sourceDataSourceId }) => { onValuesChange={({ sourceDataSourceId }) => {
if (sourceDataSourceId) { if (sourceDataSourceId) {
const curFormRef = formMapRef?.current?.[0]?.current; const curFormRef = formMapRef?.current?.[0]?.current;
const curTargetDataSourceId = const curTargetId = curFormRef?.getFieldValue('targetDataSourceId');
curFormRef?.getFieldValue('targetDataSourceId'); const sourceItem = dataSourceList.find(
if (curTargetDataSourceId === sourceDataSourceId) { (item) => item.id === sourceDataSourceId,
let targetDataSourceId: string | number | null = null; );
for (const item of dataSourceList) { const targetItem = dataSourceList.find(
if (item.id !== sourceDataSourceId) { (item) => item.id === curTargetId,
targetDataSourceId = item.id; );
break; if (targetItem && sourceItem && targetItem.sourceType !== sourceItem.sourceType) {
} const fallback =
} dataSourceList.find(
if (targetDataSourceId) { (item) =>
curFormRef?.setFieldsValue({ item.id !== sourceDataSourceId &&
targetDataSourceId, item.sourceType === sourceItem.sourceType,
}); )?.id || sourceDataSourceId;
setTargetDataSourceId(targetDataSourceId); curFormRef?.setFieldsValue({ targetDataSourceId: fallback });
} setTargetDataSourceId(fallback);
} }
} }
}} }}

View File

@@ -17,7 +17,7 @@ import {
Row, Row,
Typography, Typography,
} from 'antd'; } from 'antd';
import { useEffect, useRef, useState } from 'react'; import { useEffect, useMemo, useRef, useState } from 'react';
import useRichFormat from '@/hooks/useRichI18n'; import useRichFormat from '@/hooks/useRichI18n';
import { $t } from '@/utils/i18n'; import { $t } from '@/utils/i18n';
import { type SchemaType, schemaMap } from '../../ruleFormSchema'; import { type SchemaType, schemaMap } from '../../ruleFormSchema';
@@ -68,49 +68,83 @@ const SingleCopyPopup = ({
} = } =
schemaMap[currentRuleType as unknown as SchemaType]?.({ richFormat }) || {}; schemaMap[currentRuleType as unknown as SchemaType]?.({ richFormat }) || {};
const rightDataSourceList = dataSourceList.filter( const sourceSourceType = useMemo(() => {
(item) => item.id !== formValues?.dataSourceId, return dataSourceList.find((item) => item.id === formValues?.dataSourceId)
); ?.sourceType;
}, [dataSourceList, formValues?.dataSourceId]);
const dataSourceOptions = useMemo(() => {
return dataSourceList.map((item) => ({
...item,
disabled: item.sourceType !== sourceSourceType,
label: (
<Flex justify="space-between" align="center">
<span>{item.sourceName}</span>
<Typography.Text
type="secondary"
style={{ fontSize: 12, marginLeft: 8 }}
>
MT{item.sourceType}
</Typography.Text>
</Flex>
),
}));
}, [dataSourceList, sourceSourceType]);
const initialValues = transformInitialValue?.(formValues) || formValues; const initialValues = transformInitialValue?.(formValues) || formValues;
const rightFirstDataSource = rightDataSourceList[0]; const rightFirstDataSource =
dataSourceOptions.find(
(item) => item.id !== formValues?.dataSourceId && !item.disabled,
) || dataSourceOptions[0];
const isSameSource = rightFirstDataSource?.id === formValues?.dataSourceId;
const copyFormValues = { const copyFormValues = {
...initialValues, ...initialValues,
name: initialValues?.name name: initialValues?.name
? `${initialValues.name} - ${rightFirstDataSource?.sourceName}` ? `${initialValues.name} - ${rightFirstDataSource?.sourceName}`
: `${Date.now()} - ${rightFirstDataSource?.sourceName}`, : `${Date.now()} - ${rightFirstDataSource?.sourceName}`,
groupFilter: '',
id: void 0, id: void 0,
dataSourceId: rightFirstDataSource?.id || '', dataSourceId: rightFirstDataSource?.id || '',
...(isSameSource
? {}
: {
groupFilter: '',
...(symbolFormShow ? { param2: '' } : {}),
...(assetFormShow ? { param1: '' } : {}),
}),
}; };
if (symbolFormShow) {
copyFormValues.param2 = '';
}
if (assetFormShow) {
copyFormValues.param1 = '';
}
const formContent = ({ const formContent = ({
dataSourceList, dataSourceList: options,
formAttr, formAttr,
onDataSourceChange,
}: { }: {
dataSourceList: API.DataSourceListItem[]; dataSourceList: any[];
formAttr: Record<string, any>; formAttr: Record<string, any>;
onDataSourceChange?: (dataSourceId: string | number) => void;
}) => { }) => {
return ( return (
<ProForm {...formAttr} submitter={false}> <ProForm
{...formAttr}
submitter={false}
onValuesChange={(changedValues) => {
if (changedValues.dataSourceId && onDataSourceChange) {
onDataSourceChange(changedValues.dataSourceId);
}
}}
>
<ProFormSelect <ProFormSelect
name="dataSourceId" name="dataSourceId"
label={$t('table.dataSource')} label={$t('table.dataSource')}
options={dataSourceList} options={options}
rules={[{ required: true, message: $t('form.required') }]} rules={[{ required: true, message: $t('form.required') }]}
fieldProps={{ fieldProps={{
allowClear: false, allowClear: false,
fieldNames: { fieldNames: {
label: 'sourceName', label: 'label',
value: 'id', value: 'id',
}, },
optionLabelProp: 'label',
}} }}
/> />
<BetaSchemaForm layoutType="Embed" columns={leftForm} /> <BetaSchemaForm layoutType="Embed" columns={leftForm} />
@@ -194,13 +228,14 @@ const SingleCopyPopup = ({
}, },
}} }}
> >
{visible && (
<Row> <Row>
<Col xs={24} sm={11}> <Col xs={24} sm={11}>
<div style={{ marginBottom: 12 }}> <div style={{ marginBottom: 12 }}>
<Text strong>📋 {$t('pages.rules.originalRule')}</Text> <Text strong>📋 {$t('pages.rules.originalRule')}</Text>
</div> </div>
{formContent({ {formContent({
dataSourceList, dataSourceList: dataSourceOptions,
formAttr: { initialValues, disabled: true }, formAttr: { initialValues, disabled: true },
})} })}
</Col> </Col>
@@ -224,12 +259,21 @@ const SingleCopyPopup = ({
</div> </div>
{formContent({ {formContent({
dataSourceList: rightDataSourceList, dataSourceList: dataSourceOptions,
formAttr: { formAttr: {
initialValues: copyFormValues, initialValues: copyFormValues,
formRef: formRef, formRef: formRef,
disabled: confirmLoading, disabled: confirmLoading,
}, },
onDataSourceChange: (dataSourceId) => {
const isSame = dataSourceId === formValues?.dataSourceId;
if (!isSame) {
const fields: Record<string, any> = { groupFilter: '' };
if (symbolFormShow) fields.param2 = '';
if (assetFormShow) fields.param1 = '';
formRef.current?.setFieldsValue(fields);
}
},
})} })}
{errMsg && ( {errMsg && (
<Alert <Alert
@@ -241,6 +285,7 @@ const SingleCopyPopup = ({
)} )}
</Col> </Col>
</Row> </Row>
)}
</Modal> </Modal>
); );
}; };

View File

@@ -1,7 +1,7 @@
import { ArrowDownOutlined } from '@ant-design/icons'; import { ArrowDownOutlined } from '@ant-design/icons';
import { ProFormDependency, ProFormSelect } from '@ant-design/pro-components'; import { ProFormDependency, ProFormSelect } from '@ant-design/pro-components';
import { Divider, Tag } from 'antd'; import { Divider, Flex, Tag, Typography } from 'antd';
import { useContext, useEffect } from 'react'; import { useContext, useEffect, useMemo } from 'react';
import { $t } from '@/utils/i18n'; import { $t } from '@/utils/i18n';
import { MultiCopyPopupContext } from '../MultiCopyPopup'; import { MultiCopyPopupContext } from '../MultiCopyPopup';
import RuleCheckCard from './RuleCheckCard'; import RuleCheckCard from './RuleCheckCard';
@@ -13,11 +13,52 @@ type Step1Props = {
const Step1 = ({ formMapRef, setTargetDataSourceId }: Step1Props) => { const Step1 = ({ formMapRef, setTargetDataSourceId }: Step1Props) => {
const { dataSourceList } = useContext(MultiCopyPopupContext); const { dataSourceList } = useContext(MultiCopyPopupContext);
const buildOptions = (sourceId?: string | number) => {
const sourceType = dataSourceList.find((item) => item.id === sourceId)
?.sourceType;
return dataSourceList.map((item) => ({
...item,
disabled: item.sourceType !== sourceType,
label: (
<Flex justify="space-between" align="center">
<span>{item.sourceName}</span>
<Typography.Text
type="secondary"
style={{ fontSize: 12, marginLeft: 8 }}
>
MT{item.sourceType}
</Typography.Text>
</Flex>
),
}));
};
const sourceOptions = useMemo(
() => dataSourceList.map((item) => ({
...item,
label: (
<Flex justify="space-between" align="center">
<span>{item.sourceName}</span>
<Typography.Text
type="secondary"
style={{ fontSize: 12, marginLeft: 8 }}
>
MT{item.sourceType}
</Typography.Text>
</Flex>
),
})),
[dataSourceList],
);
useEffect(() => { useEffect(() => {
if (dataSourceList?.length) { if (dataSourceList?.length) {
// waitTime(1000).then(() => { const sourceItem = dataSourceList[0];
const sourceDataSourceId = dataSourceList[0]?.id || ''; const sourceDataSourceId = sourceItem?.id || '';
const targetDataSourceId = dataSourceList[1]?.id || ''; const sameTypeItem = dataSourceList.find(
(item) => item.id !== sourceDataSourceId && item.sourceType === sourceItem?.sourceType,
);
const targetDataSourceId = sameTypeItem?.id || sourceDataSourceId;
const curFormRef = formMapRef?.current?.[0]?.current; const curFormRef = formMapRef?.current?.[0]?.current;
if (curFormRef) { if (curFormRef) {
curFormRef?.setFieldsValue({ curFormRef?.setFieldsValue({
@@ -26,7 +67,6 @@ const Step1 = ({ formMapRef, setTargetDataSourceId }: Step1Props) => {
}); });
setTargetDataSourceId(targetDataSourceId); setTargetDataSourceId(targetDataSourceId);
} }
// });
} }
}, [dataSourceList]); }, [dataSourceList]);
@@ -35,14 +75,15 @@ const Step1 = ({ formMapRef, setTargetDataSourceId }: Step1Props) => {
<ProFormSelect <ProFormSelect
name="sourceDataSourceId" name="sourceDataSourceId"
label={$t('pages.clones.step1.source')} label={$t('pages.clones.step1.source')}
options={dataSourceList} options={sourceOptions}
rules={[{ required: true, message: $t('form.required') }]} rules={[{ required: true, message: $t('form.required') }]}
fieldProps={{ fieldProps={{
allowClear: false, allowClear: false,
fieldNames: { fieldNames: {
label: 'sourceName', label: 'label',
value: 'id', value: 'id',
}, },
optionLabelProp: 'label',
}} }}
/> />
<ProFormDependency name={['sourceDataSourceId']}> <ProFormDependency name={['sourceDataSourceId']}>
@@ -61,21 +102,20 @@ const Step1 = ({ formMapRef, setTargetDataSourceId }: Step1Props) => {
<ProFormDependency name={['sourceDataSourceId']}> <ProFormDependency name={['sourceDataSourceId']}>
{({ sourceDataSourceId }) => { {({ sourceDataSourceId }) => {
if (!sourceDataSourceId) return null; if (!sourceDataSourceId) return null;
const dataSourceOptions = dataSourceList.filter( const targetOptions = buildOptions(sourceDataSourceId);
(item) => item.id !== sourceDataSourceId,
);
return ( return (
<ProFormSelect <ProFormSelect
name="targetDataSourceId" name="targetDataSourceId"
label={$t('pages.clones.step1.target')} label={$t('pages.clones.step1.target')}
options={dataSourceOptions} options={targetOptions}
rules={[{ required: true, message: $t('form.required') }]} rules={[{ required: true, message: $t('form.required') }]}
fieldProps={{ fieldProps={{
allowClear: false, allowClear: false,
fieldNames: { fieldNames: {
label: 'sourceName', label: 'label',
value: 'id', value: 'id',
}, },
optionLabelProp: 'label',
}} }}
onChange={(value: string | number | null) => { onChange={(value: string | number | null) => {
setTargetDataSourceId(value || null); setTargetDataSourceId(value || null);

View File

@@ -295,10 +295,6 @@ const RuleCommon: React.FC = () => {
<Button <Button
icon={<CopyOutlined />} icon={<CopyOutlined />}
onClick={() => { onClick={() => {
if (dataSourceList.length < 2) {
message.warning($t('pages.rules.cloneRuleWarning'));
return;
}
setFormValues(rule); setFormValues(rule);
setCopyVisible(true); setCopyVisible(true);
}} }}
@@ -455,10 +451,6 @@ const RuleCommon: React.FC = () => {
<Button <Button
icon={<CopyOutlined />} icon={<CopyOutlined />}
onClick={() => { onClick={() => {
if (dataSourceList.length < 2) {
message.warning($t('pages.rules.cloneRuleWarning'));
return;
}
setMultiCopyVisible(true); setMultiCopyVisible(true);
}} }}
> >