Skip to content

Commit d1fa701

Browse files
之瑛蚂蚁代码服务
authored andcommitted
PullRequest: 871 空间配置数据刷新及结构对比任务使用DescriptionInput组件
Merge branch 'fix/description of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.3.4 https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/871 Reviewed-by: 晓康 <xxk268858@oceanbase.com> * feat: 结构对比使用 DescriptionInput * feat: 空间配置数据刷新 * fix: 统一用描述
1 parent aab9ae7 commit d1fa701

3 files changed

Lines changed: 13 additions & 53 deletions

File tree

src/component/Task/PartitionTask/CreateModal/index.tsx

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ import {
6666
} from '../../component/PartitionPolicyFormTable/const';
6767
import styles from './index.less';
6868
import { useRequest } from 'ahooks';
69+
import DescriptionInput from '../../component/DescriptionInput';
6970

7071
const { Paragraph, Text } = Typography;
7172

@@ -872,24 +873,7 @@ const CreateModal: React.FC<IProps> = inject('modalStore')(
872873
}
873874
</span>
874875
</Form.Item>
875-
<Form.Item
876-
name="description"
877-
label={formatMessage({
878-
id: 'odc.components.PartitionDrawer.Remarks',
879-
defaultMessage: '备注',
880-
})} /*备注*/
881-
>
882-
<Input.TextArea
883-
rows={5}
884-
placeholder={
885-
formatMessage({
886-
id: 'src.component.Task.PartitionTask.CreateModal.026392ED',
887-
defaultMessage:
888-
'请输入描述,不超过200个字符;未输入时,系统会根据对象和工单类型自动生成描述信息',
889-
}) /*"请输入描述,200字以内;未输入时,系统会根据对象和工单类型自动生成描述信息"*/
890-
}
891-
/>
892-
</Form.Item>
876+
<DescriptionInput />
893877
</Form>
894878
</Spin>
895879
</Drawer>

src/component/Task/StructureComparisonTask/CreateModal/index.tsx

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import { getTaskExecStrategyMap } from '../..';
3939
import DatabaseSelect from '../../component/DatabaseSelect';
4040
import { comparisonScopeMap } from './interface';
4141
import TableSelector from './TableSelector';
42+
import DescriptionInput from '../../component/DescriptionInput';
4243
interface IProps {
4344
projectId?: number;
4445
modalStore?: ModalStore;
@@ -314,36 +315,7 @@ const StructureComparisonTask: React.FC<IProps> = ({ projectId, modalStore }) =>
314315
</Radio.Group>
315316
</Form.Item>
316317
</FormItemPanel>
317-
<Form.Item
318-
label={
319-
formatMessage({
320-
id: 'src.component.Task.StructureComparisonTask.CreateModal.52828286',
321-
defaultMessage: '描述',
322-
}) /*"描述"*/
323-
}
324-
name="description"
325-
required={false}
326-
rules={[
327-
{
328-
max: 200,
329-
message: formatMessage({
330-
id: 'src.component.Task.StructureComparisonTask.CreateModal.FBBFFC4C',
331-
defaultMessage: '描述不超过 200 个字符',
332-
}), //'描述不超过 200 个字符'
333-
},
334-
]}
335-
>
336-
<Input.TextArea
337-
placeholder={
338-
formatMessage({
339-
id: 'src.component.Task.StructureComparisonTask.CreateModal.67E284BD',
340-
defaultMessage: '描述不超过 200 个字符',
341-
}) /*"请输入描述,200字以内;"*/
342-
}
343-
maxLength={200}
344-
rows={6}
345-
/>
346-
</Form.Item>
318+
<DescriptionInput />
347319
</Form>
348320
</Drawer>
349321
);

src/store/modal.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,10 @@ export class ModalStore {
596596

597597
@action
598598
public changePartitionModal(isShow: boolean = true, data?: IPartitionTaskData) {
599-
this.partitionVisible = isShow;
600-
this.partitionData = isShow ? data : null;
599+
getSpaceConfigForFormInitialValue(isShow, () => {
600+
this.partitionVisible = isShow;
601+
this.partitionData = isShow ? data : null;
602+
});
601603
}
602604

603605
@action
@@ -613,9 +615,11 @@ export class ModalStore {
613615
isShow: boolean = true,
614616
data?: IStructureComparisonTaskData,
615617
) {
616-
this.structureComparisonVisible = isShow;
617-
isShow && !data?.taskId && this.structureComparisonDataMap.clear();
618-
this.structureComparisonTaskData = isShow ? data : null;
618+
getSpaceConfigForFormInitialValue(isShow, () => {
619+
this.structureComparisonVisible = isShow;
620+
isShow && !data?.taskId && this.structureComparisonDataMap.clear();
621+
this.structureComparisonTaskData = isShow ? data : null;
622+
});
619623
}
620624

621625
@action

0 commit comments

Comments
 (0)