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/02 03:37:53 UTC
[incubator-apisix-dashboard] branch next updated: Fix typos (#232)
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 3e39c65 Fix typos (#232)
3e39c65 is described below
commit 3e39c65a291cfa8de488ea6043848f03cfcddfe8
Author: 琚致远 <ju...@apache.org>
AuthorDate: Tue Jun 2 11:37:45 2020 +0800
Fix typos (#232)
* feat: update keywords
* feat: update some keywords
* codes clean
---
src/locales/zh-CN/component.ts | 8 +--
.../Routes/components/Step1/MatchingRulesView.tsx | 52 ++++++++++--------
src/pages/Routes/components/Step1/MetaView.tsx | 1 -
.../Routes/components/Step1/RequestConfigView.tsx | 12 ++---
.../components/Step2/HttpHeaderRewriteView.tsx | 14 ++---
.../Routes/components/Step2/RequestRewriteView.tsx | 62 +++++++++++-----------
src/pages/Routes/typing.d.ts | 2 +-
7 files changed, 78 insertions(+), 73 deletions(-)
diff --git a/src/locales/zh-CN/component.ts b/src/locales/zh-CN/component.ts
index 8292d91..88f167b 100644
--- a/src/locales/zh-CN/component.ts
+++ b/src/locales/zh-CN/component.ts
@@ -2,7 +2,7 @@ export default {
'component.tagSelect.expand': '展开',
'component.tagSelect.collapse': '收起',
'component.tagSelect.all': '全部',
- 'component.global.remove': '移除',
+ 'component.global.remove': '删除',
'component.global.cancel': '取消',
'component.global.submit': '提交',
'component.global.create': '创建',
@@ -26,10 +26,10 @@ export default {
'component.user.inputPassword': '请输入密码！',
'component.user.wrongUsernameOrPassword': '账号或密码错误！',
// SSL Module
- 'component.ssl.removeSSLItemModalContent': '确定要移除该项吗？',
- 'component.ssl.removeSSLItemModalTitle': '移除 SSL',
+ 'component.ssl.removeSSLItemModalContent': '确定要删除该项吗？',
+ 'component.ssl.removeSSLItemModalTitle': '删除 SSL',
'component.ssl.fetchSSLListSuccess': '获取 SSL 列表成功',
- 'component.ssl.removeSSLSuccess': '移除 SSL 成功',
+ 'component.ssl.removeSSLSuccess': '删除 SSL 成功',
'component.ssl.fieldSNIInvalid': '请检查 SNI 值',
'component.ssl.fieldKeyInvalid': '请检查 Key 值',
'component.ssl.fieldCertInvalid': '请检查 Cert 值',
diff --git a/src/pages/Routes/components/Step1/MatchingRulesView.tsx b/src/pages/Routes/components/Step1/MatchingRulesView.tsx
index e956d3a..40eb4b0 100644
--- a/src/pages/Routes/components/Step1/MatchingRulesView.tsx
+++ b/src/pages/Routes/components/Step1/MatchingRulesView.tsx
@@ -10,19 +10,24 @@ const MatchingRulesView: React.FC<Props> = ({ data, disabled, onChange }) => {
const [visible, setVisible] = useState(false);
- const [mode, setMode] = useState<RouteModule.ModalType>('create');
+ const [mode, setMode] = useState<RouteModule.ModalType>('CREATE');
const [modalForm] = Form.useForm();
const { Option } = Select;
const onOk = () => {
modalForm.validateFields().then((value) => {
- if (mode === 'edit') {
+ if (mode === 'EDIT') {
const key = modalForm.getFieldValue('key');
- const newAdvancedMatchingRules = advancedMatchingRules.concat();
- const findIndex = newAdvancedMatchingRules.findIndex((item) => item.key === key);
- newAdvancedMatchingRules[findIndex] = { ...(value as RouteModule.MatchingRule), key };
- onChange({ ...data.step1Data, advancedMatchingRules: newAdvancedMatchingRules });
+ onChange({
+ ...data.step1Data,
+ advancedMatchingRules: advancedMatchingRules.map((rule) => {
+ if (rule.key === key) {
+ return { ...(value as RouteModule.MatchingRule), key };
+ }
+ return rule;
+ }),
+ });
} else {
const rule = {
...(value as RouteModule.MatchingRule),
@@ -36,7 +41,7 @@ const MatchingRulesView: React.FC<Props> = ({ data, disabled, onChange }) => {
};
const handleEdit = (record: RouteModule.MatchingRule) => {
- setMode('edit');
+ setMode('EDIT');
setVisible(true);
modalForm.setFieldsValue(record);
};
@@ -69,22 +74,24 @@ const MatchingRulesView: React.FC<Props> = ({ data, disabled, onChange }) => {
dataIndex: 'paramsValue',
key: 'paramsValue',
},
- {
- title: '操作',
- key: 'action',
- render: (_: any, record: RouteModule.MatchingRule) => (
- <Space size="middle">
- <a onClick={() => handleEdit(record)}>编辑</a>
- <a onClick={() => handleRemove(record.key)}>移除</a>
- </Space>
- ),
- },
+ disabled
+ ? {}
+ : {
+ title: '操作',
+ key: 'action',
+ render: (_: any, record: RouteModule.MatchingRule) => (
+ <Space size="middle">
+ <a onClick={() => handleEdit(record)}>编辑</a>
+ <a onClick={() => handleRemove(record.key)}>删除</a>
+ </Space>
+ ),
+ },
];
const renderModal = () => {
return (
<Modal
- title={mode === 'edit' ? '编辑' : '新增'}
+ title={mode === 'EDIT' ? '编辑' : '增加'}
centered
visible={visible}
onOk={onOk}
@@ -101,10 +108,9 @@ const MatchingRulesView: React.FC<Props> = ({ data, disabled, onChange }) => {
rules={[{ required: true, message: '请选择参数位置' }]}
>
<Select>
- <Option value="header">header</Option>
- <Option value="query">query</Option>
- <Option value="params">params</Option>
- <Option value="cookie">cookie</Option>
+ <Option value="header">HTTP 请求头</Option>
+ <Option value="arguments">请求参数</Option>
+ <Option value="cookie">Cookie</Option>
</Select>
</Form.Item>
<Form.Item
@@ -144,7 +150,7 @@ const MatchingRulesView: React.FC<Props> = ({ data, disabled, onChange }) => {
{!disabled && (
<Button
onClick={() => {
- setMode('create');
+ setMode('CREATE');
setVisible(true);
}}
type="primary"
diff --git a/src/pages/Routes/components/Step1/MetaView.tsx b/src/pages/Routes/components/Step1/MetaView.tsx
index 3c1679d..69e64c7 100644
--- a/src/pages/Routes/components/Step1/MetaView.tsx
+++ b/src/pages/Routes/components/Step1/MetaView.tsx
@@ -2,7 +2,6 @@ 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 4ef72fa..be46a99 100644
--- a/src/pages/Routes/components/Step1/RequestConfigView.tsx
+++ b/src/pages/Routes/components/Step1/RequestConfigView.tsx
@@ -41,7 +41,7 @@ const RequestConfigView: React.FC<Props> = ({ data, disabled, onChange }) => {
hosts.map((item, index) => (
<Row key={`${item + index}`} style={{ marginBottom: '10px' }} gutter={[16, 16]}>
<Col span={16}>
- <Input placeholder="HOST" disabled={disabled} />
+ <Input placeholder="域名" disabled={disabled} />
</Col>
<Col span={4}>
<Space>
@@ -68,7 +68,7 @@ const RequestConfigView: React.FC<Props> = ({ data, disabled, onChange }) => {
paths.map((item, index) => (
<Row key={`${item + index}`} style={{ marginBottom: '10px' }} gutter={[16, 16]}>
<Col span={16}>
- <Input placeholder="请输入 Path" disabled={disabled} />
+ <Input placeholder="请输入请求路径" disabled={disabled} />
</Col>
{!disabled && (
<Col span={4}>
@@ -105,7 +105,7 @@ const RequestConfigView: React.FC<Props> = ({ data, disabled, onChange }) => {
</Row>
</Form.Item>
{/* TODO: name */}
- <Form.Item label="HOST" rules={[{ required: true, message: '请输入 HOST' }]}>
+ <Form.Item label="域名" rules={[{ required: true, message: '请输入域名' }]}>
{renderHosts()}
{!disabled && (
<Button
@@ -117,7 +117,7 @@ const RequestConfigView: React.FC<Props> = ({ data, disabled, onChange }) => {
)}
</Form.Item>
{/* TODO: name */}
- <Form.Item label="PATH">
+ <Form.Item label="路径">
{renderPaths()}
{!disabled && (
<Button
@@ -129,9 +129,9 @@ const RequestConfigView: React.FC<Props> = ({ data, disabled, onChange }) => {
)}
</Form.Item>
<Form.Item
- label="HTTP Methods"
+ label="HTTP 方法"
name="httpMethods"
- rules={[{ required: true, message: '请勾选 HTTP Methods' }]}
+ rules={[{ required: true, message: '请选择 HTTP 方法' }]}
>
<Checkbox
indeterminate={httpMethodList.indeterminate}
diff --git a/src/pages/Routes/components/Step2/HttpHeaderRewriteView.tsx b/src/pages/Routes/components/Step2/HttpHeaderRewriteView.tsx
index 2f83eec..b028d55 100644
--- a/src/pages/Routes/components/Step2/HttpHeaderRewriteView.tsx
+++ b/src/pages/Routes/components/Step2/HttpHeaderRewriteView.tsx
@@ -11,10 +11,10 @@ const HttpHeaderRewriteView: React.FC<Props> = ({ data, disabled, onChange }) =>
const { upstream_header } = data.step2Data;
const [visible, setVisible] = useState(false);
const [modalForm] = Form.useForm();
- const [mode, setMode] = useState<RouteModule.ModalType>('create');
+ const [mode, setMode] = useState<RouteModule.ModalType>('CREATE');
const handleEdit = (record: RouteModule.UpstreamHeader) => {
- setMode('edit');
+ setMode('EDIT');
setVisible(true);
modalForm.setFieldsValue(record);
};
@@ -57,7 +57,7 @@ const HttpHeaderRewriteView: React.FC<Props> = ({ data, disabled, onChange }) =>
handleRemove(record.key);
}}
>
- 移除
+ 删除
</a>
</Space>
),
@@ -67,7 +67,7 @@ const HttpHeaderRewriteView: React.FC<Props> = ({ data, disabled, onChange }) =>
const renderModal = () => {
const handleOk = () => {
modalForm.validateFields().then((value) => {
- if (mode === 'edit') {
+ if (mode === 'EDIT') {
const key = modalForm.getFieldValue('key');
const newUpstreamHeader = upstream_header.concat();
const findIndex = newUpstreamHeader.findIndex((item) => item.key === key);
@@ -88,7 +88,7 @@ const HttpHeaderRewriteView: React.FC<Props> = ({ data, disabled, onChange }) =>
return (
<Modal
- title={mode === 'edit' ? '编辑' : '新增'}
+ title={mode === 'EDIT' ? '编辑' : '增加'}
centered
visible={visible}
onOk={handleOk}
@@ -126,7 +126,7 @@ const HttpHeaderRewriteView: React.FC<Props> = ({ data, disabled, onChange }) =>
{!disabled && (
<Button
onClick={() => {
- setMode('create');
+ setMode('CREATE');
setVisible(true);
}}
type="primary"
@@ -134,7 +134,7 @@ const HttpHeaderRewriteView: React.FC<Props> = ({ data, disabled, onChange }) =>
marginBottom: 16,
}}
>
- 新增
+ 增加
</Button>
)}
<Table key="table" bordered dataSource={upstream_header} columns={columns} />
diff --git a/src/pages/Routes/components/Step2/RequestRewriteView.tsx b/src/pages/Routes/components/Step2/RequestRewriteView.tsx
index fa7d2e1..a6a3f46 100644
--- a/src/pages/Routes/components/Step2/RequestRewriteView.tsx
+++ b/src/pages/Routes/components/Step2/RequestRewriteView.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import Form, { FormInstance } from 'antd/es/form';
import Radio, { RadioChangeEvent } from 'antd/lib/radio';
-import { Input, Row, Col, InputNumber, Button, Space } from 'antd';
+import { Input, Row, Col, InputNumber, Button } from 'antd';
import { FORM_ITEM_LAYOUT } from '@/pages/Routes/constants';
import PanelSection from '../PanelSection';
@@ -18,39 +18,32 @@ const RequestRewriteView: React.FC<Props> = ({ data, form, disabled, onChange })
onChange({ backendProtocol: e.target.value });
};
- const addBackendAddress = () => {
- onChange({
- backendAddressList: backendAddressList.concat({ host: '', port: 0, weight: 0 }),
- });
- };
const renderBackendAddress = () =>
backendAddressList.map((item, index) => (
<Row key={`${item.host + index}`} style={{ marginBottom: '10px' }} gutter={16}>
<Col span={9}>
- <Input placeholder="HOST" disabled={disabled} />
+ <Input placeholder="域名" disabled={disabled} />
</Col>
<Col span={4}>
- <InputNumber placeholder="Port" disabled={disabled} />
+ <InputNumber placeholder="端口号" disabled={disabled} min={1} max={65535} />
</Col>
<Col span={4} offset={1}>
- <InputNumber placeholder="Weight" disabled={disabled} />
+ <InputNumber placeholder="权重" disabled={disabled} min={0} max={100} />
</Col>
<Col span={4} offset={1}>
- <Space>
- {backendAddressList.length > 1 && !disabled && (
- <Button
- type="primary"
- danger
- onClick={() => {
- onChange({
- backendAddressList: backendAddressList.filter((_, _index) => _index !== index),
- });
- }}
- >
- 删除
- </Button>
- )}
- </Space>
+ {backendAddressList.length > 1 && !disabled && (
+ <Button
+ type="primary"
+ danger
+ onClick={() => {
+ onChange({
+ backendAddressList: backendAddressList.filter((_, _index) => _index !== index),
+ });
+ }}
+ >
+ 删除
+ </Button>
+ )}
</Col>
</Row>
));
@@ -72,33 +65,40 @@ const RequestRewriteView: React.FC<Props> = ({ data, form, disabled, onChange })
value={backendProtocol}
disabled={disabled}
>
+ <Radio value="originalRequest">原始请求</Radio>
<Radio value="HTTP">HTTP</Radio>
<Radio value="HTTPS">HTTPS</Radio>
- <Radio value="originalRequest">原始请求</Radio>
</Radio.Group>
</Row>
</Form.Item>
- <Form.Item label="后端地址" rules={[{ required: true, message: '请输入后端地址' }]}>
+ <Form.Item label="请求地址" rules={[{ required: true, message: '请输入后端地址' }]}>
{renderBackendAddress()}
{!disabled && (
- <Button type="primary" onClick={addBackendAddress}>
+ <Button
+ type="primary"
+ onClick={() => {
+ onChange({
+ backendAddressList: backendAddressList.concat({ host: '', port: 0, weight: 0 }),
+ });
+ }}
+ >
增加
</Button>
)}
</Form.Item>
- <Form.Item label="后端请求 Path">
+ <Form.Item label="请求路径">
<Row>
<Input disabled={disabled} />
</Row>
</Form.Item>
<Form.Item label="连接超时">
- <InputNumber disabled={disabled} /> ms
+ <InputNumber disabled={disabled} defaultValue={30000} /> ms
</Form.Item>
<Form.Item label="发送超时">
- <InputNumber disabled={disabled} /> ms
+ <InputNumber disabled={disabled} defaultValue={30000} /> ms
</Form.Item>
<Form.Item label="接收超时">
- <InputNumber disabled={disabled} /> ms
+ <InputNumber disabled={disabled} defaultValue={30000} /> ms
</Form.Item>
</Form>
</PanelSection>
diff --git a/src/pages/Routes/typing.d.ts b/src/pages/Routes/typing.d.ts
index 9552d0e..6a340d7 100644
--- a/src/pages/Routes/typing.d.ts
+++ b/src/pages/Routes/typing.d.ts
@@ -59,5 +59,5 @@ declare namespace RouteModule {
};
};
- type ModalType = 'create' | 'edit';
+ type ModalType = 'CREATE' | 'EDIT';
}