Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ParametersModal): update initialValues type and set form fields o… #736

Merged
merged 1 commit into from
Jan 22, 2025
Merged

fix(ParametersModal): update initialValues type and set form fields o… #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions ui/src/pages/Cluster/Detail/Overview/ParametersModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@ import { obcluster } from '@/api';
import { intl } from '@/utils/intl';
import { useRequest } from 'ahooks';
import { Button, Col, Form, Input, message, Modal, Row, Space } from 'antd';
import React from 'react';
import React, { useEffect } from 'react';

interface kvPair {
key: string;
value: string;
}

export interface ParametersModalProps {
visible: boolean;
onCancel: () => void;
onSuccess: () => void;
initialValues: any[];
initialValues: kvPair;
name: string;
namespace: string;
}
Expand All @@ -21,9 +26,15 @@ const ParametersModal: React.FC<ParametersModalProps> = ({
name,
namespace,
}) => {
const [form] = Form.useForm<API.CreateClusterData>();
const [form] = Form.useForm<kvPair>();
const { validateFields, resetFields } = form;

useEffect(() => {
if (visible) {
form.setFieldsValue(initialValues);
}
}, [visible]);

const { runAsync: updateParameters, loading } = useRequest(
obcluster.patchOBCluster,
{
Expand All @@ -48,11 +59,10 @@ const ParametersModal: React.FC<ParametersModalProps> = ({
id: 'src.pages.Cluster.Detail.Overview.849E8956',
defaultMessage: '参数编辑',
})}
maskClosable={false}
open={visible}
destroyOnClose
onCancel={() => {
onCancel();
resetFields();
}}
width={520}
footer={
Expand Down Expand Up @@ -104,7 +114,6 @@ const ParametersModal: React.FC<ParametersModalProps> = ({
id: 'src.pages.Cluster.Detail.Overview.0F9AD89D',
defaultMessage: '参数名',
})}
initialValue={initialValues?.name}
name={'key'}
>
<Input disabled={true} />
Expand All @@ -117,7 +126,6 @@ const ParametersModal: React.FC<ParametersModalProps> = ({
defaultMessage: '参数值',
})}
name={'value'}
initialValue={initialValues?.value}
rules={[
{
required: true,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/pages/Cluster/Detail/Overview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ const ClusterOverview: React.FC = () => {
onClick={() => {
setIsDrawerOpen(true);
setParametersRecord({
...record,
key: record.name,
value: valueContent,
});
}}
Expand Down
Loading