You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/06/03 03:27:20 UTC
[incubator-apisix-dashboard] branch next updated: fix: step4 edit
(#235)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git
The following commit(s) were added to refs/heads/next by this push:
new 4dad8fb fix: step4 edit (#235)
4dad8fb is described below
commit 4dad8fbcbb401c9edcaab663e5d6b5751e1c6663
Author: litesun <31...@users.noreply.github.com>
AuthorDate: Wed Jun 3 11:27:10 2020 +0800
fix: step4 edit (#235)
* feat: limit upload file
* feat: intercept default upload api request
* feat: limit upload file type
* fix: show file when parse SSL file fail
* feat: add search feature
* feat: format code
* fix: remove list item not work
* feat: remove relatedRouting
* feat: add routes step1 page
* feat: update route
* feat: format code
* feat: update
* feat: update
* feat: add checkbox rule
* feat: handle Modal close event
* feat: format code
* feat: add page skip
* feat: format code
* merge
* feat: clean code
* fix: step4 error
* feat: add edit modal
* feat: add form validation
* fix: step4 lose data
* fix: step4 edit
---
src/pages/Routes/Create.tsx | 2 +-
.../Routes/components/CreateStep4/CreateStep4.tsx | 11 ++++++-----
src/pages/Routes/components/Step1/MetaView.tsx | 1 +
.../Routes/components/Step1/RequestConfigView.tsx | 22 ++++++++++++----------
.../Routes/components/Step2/RequestRewriteView.tsx | 17 +++++++++--------
5 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/pages/Routes/Create.tsx b/src/pages/Routes/Create.tsx
index 08dab80..b9e8cca 100644
--- a/src/pages/Routes/Create.tsx
+++ b/src/pages/Routes/Create.tsx
@@ -57,7 +57,7 @@ const Create: React.FC = () => {
}
if (step === 3) {
- return <CreateStep4 data={data} onChange={() => {}} />;
+ return <CreateStep4 data={data} form1={form1} form2={form2} onChange={() => {}} />;
}
return null;
diff --git a/src/pages/Routes/components/CreateStep4/CreateStep4.tsx b/src/pages/Routes/components/CreateStep4/CreateStep4.tsx
index 2304959..f20d173 100644
--- a/src/pages/Routes/components/CreateStep4/CreateStep4.tsx
+++ b/src/pages/Routes/components/CreateStep4/CreateStep4.tsx
@@ -6,15 +6,16 @@ import Step2 from '../Step2';
import CreateStep3 from '../CreateStep3';
interface Props extends RouteModule.Data {
- form: FormInstance;
+ form1: FormInstance;
+ form2: FormInstance;
}
-const CreateStep4: React.FC<Props> = (props) => {
+const CreateStep4: React.FC<Props> = ({ form1, form2, ...rest }) => {
return (
<>
- <Step1 {...props} disabled />
- <Step2 {...props} disabled />
- <CreateStep3 {...props} disabled />
+ <Step1 {...rest} form={form1} disabled />
+ <Step2 {...rest} form={form2} disabled />
+ <CreateStep3 {...rest} disabled />
</>
);
};
diff --git a/src/pages/Routes/components/Step1/MetaView.tsx b/src/pages/Routes/components/Step1/MetaView.tsx
index 69e64c7..3c1679d 100644
--- a/src/pages/Routes/components/Step1/MetaView.tsx
+++ b/src/pages/Routes/components/Step1/MetaView.tsx
@@ -2,6 +2,7 @@ import React from 'react';
import Form from 'antd/es/form';
import { Input } from 'antd';
+// import { FORM_ITEM_LAYOUT } from '@/pages/Routes/constants';
import PanelSection from '../PanelSection';
interface Props extends RouteModule.Data {}
diff --git a/src/pages/Routes/components/Step1/RequestConfigView.tsx b/src/pages/Routes/components/Step1/RequestConfigView.tsx
index 274b0c4..a758103 100644
--- a/src/pages/Routes/components/Step1/RequestConfigView.tsx
+++ b/src/pages/Routes/components/Step1/RequestConfigView.tsx
@@ -64,9 +64,9 @@ const RequestConfigView: React.FC<Props> = ({ data, disabled, onChange }) => {
]}
noStyle
>
- <Input placeholder="请输入域名" style={{ width: '60%' }} />
+ <Input placeholder="请输入域名" style={{ width: '60%' }} disabled={disabled} />
</Form.Item>
- {fields.length > 1 ? (
+ {!disabled && fields.length > 1 ? (
<MinusCircleOutlined
className="dynamic-delete-button"
style={{ margin: '0 8px' }}
@@ -103,15 +103,17 @@ const RequestConfigView: React.FC<Props> = ({ data, disabled, onChange }) => {
{fields.map((field) => (
<Form.Item required key={field.key}>
<Form.Item {...field} validateTrigger={['onChange', 'onBlur']} noStyle>
- <Input placeholder="请输入路径" style={{ width: '60%' }} />
+ <Input placeholder="请输入路径" style={{ width: '60%' }} disabled={disabled} />
</Form.Item>
- <MinusCircleOutlined
- className="dynamic-delete-button"
- style={{ margin: '0 8px' }}
- onClick={() => {
- remove(field.name);
- }}
- />
+ {!disabled && (
+ <MinusCircleOutlined
+ className="dynamic-delete-button"
+ style={{ margin: '0 8px' }}
+ onClick={() => {
+ remove(field.name);
+ }}
+ />
+ )}
</Form.Item>
))}
<Form.Item>
diff --git a/src/pages/Routes/components/Step2/RequestRewriteView.tsx b/src/pages/Routes/components/Step2/RequestRewriteView.tsx
index 781b2c8..857f435 100644
--- a/src/pages/Routes/components/Step2/RequestRewriteView.tsx
+++ b/src/pages/Routes/components/Step2/RequestRewriteView.tsx
@@ -58,14 +58,15 @@ const RequestRewriteView: React.FC<Props> = ({ data, form, disabled, onChange })
</Form.Item>
</Col>
<Col>
- {fields.length > 1 ? (
- <MinusCircleOutlined
- style={{ margin: '0 8px' }}
- onClick={() => {
- remove(field.name);
- }}
- />
- ) : null}
+ {!disabled &&
+ (fields.length > 1 ? (
+ <MinusCircleOutlined
+ style={{ margin: '0 8px' }}
+ onClick={() => {
+ remove(field.name);
+ }}
+ />
+ ) : null)}
</Col>
</Row>
</Form.Item>