Skip to content

Commit

Permalink
add: routes rules (apache#266)
Browse files Browse the repository at this point in the history
* add: routes rules

* update

* update: routes rules
  • Loading branch information
LiteSun authored Jun 17, 2020
1 parent bc95143 commit 0594bf1
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 4 deletions.
8 changes: 7 additions & 1 deletion src/pages/Routes/components/Step1/MatchingRulesView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,13 @@ const MatchingRulesView: React.FC<Props> = ({ data, disabled, onChange }) => {
<Form.Item
label="参数名称"
name="name"
rules={[{ required: true, message: '请输入参数名称' }]}
rules={[
{ required: true, message: '请输入参数名称' },
{
pattern: new RegExp(/^([a-zA-Z][a-zA-Z0-9_-]*$)/, 'g'),
message: '参数只支持字母、数字、-、_,并且以字母开头',
},
]}
extra="只支持字母和数字,并且以字母开头"
>
<Input placeholder={namePlaceholder} />
Expand Down
8 changes: 7 additions & 1 deletion src/pages/Routes/components/Step1/MetaView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ const MetaView: React.FC<Props> = ({ disabled }) => {
<Form.Item
label="API 名称"
name="name"
rules={[{ required: true, message: '请输入 API 名称' }]}
rules={[
{ required: true, message: '请输入 API 名称' },
{
pattern: new RegExp(/^[a-zA-Z][a-zA-Z0-9_-]{0,100}$/, 'g'),
message: '最大长度100,仅支持英文,数字,下划线和减号,且只能以英文开头',
},
]}
extra="支持英文,数字,下划线和减号,且只能以英文开头"
>
<Input placeholder="请输入 API 名称" disabled={disabled} />
Expand Down
8 changes: 8 additions & 0 deletions src/pages/Routes/components/Step1/RequestConfigView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ const RequestConfigView: React.FC<Props> = ({ data, disabled, onChange }) => {
whitespace: true,
message: '请输入域名',
},
{
pattern: new RegExp(/(^\*?[a-zA-Z0-9._-]+$|^\*$)/, 'g'),
message: '仅支持英文、数字、* (*只能是在开头位置),支持单个 *',
},
]}
noStyle
>
Expand Down Expand Up @@ -108,6 +112,10 @@ const RequestConfigView: React.FC<Props> = ({ data, disabled, onChange }) => {
whitespace: true,
message: '请输入请求路径',
},
{
pattern: new RegExp(/^\/[a-zA-Z0-9\-._~%!$&'()+,;=:@/]*\*?$/, 'g'),
message: '以/开头,*只能在最后',
},
]}
noStyle
>
Expand Down
13 changes: 11 additions & 2 deletions src/pages/Routes/components/Step2/RequestRewriteView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,16 @@ const RequestRewriteView: React.FC<Props> = ({ data, form, disabled, onChange })
<Form.Item
style={{ marginBottom: 0 }}
name={[field.name, 'host']}
rules={[{ required: true, message: '请输入域名/IP' }]}
rules={[
{ required: true, message: '请输入域名/IP' },
{
pattern: new RegExp(
/(^([1-9]?\d|1\d{2}|2[0-4]\d|25[0-5])(\.(25[0-5]|1\d{2}|2[0-4]\d|[1-9]?\d)){3}$|^(?![0-9.]+$)([a-zA-Z0-9_-]+)(\.[a-zA-Z0-9_-]+){0,}$)/,
'g',
),
message: '仅支持数字或者字符 或者 . (.不是必须)',
},
]}
>
<Input placeholder="域名/IP" disabled={disabled} />
</Form.Item>
Expand All @@ -52,7 +61,7 @@ const RequestRewriteView: React.FC<Props> = ({ data, form, disabled, onChange })
name={[field.name, 'weight']}
rules={[{ required: true, message: '请输入权重' }]}
>
<InputNumber placeholder="权重" disabled={disabled} min={0} max={100} />
<InputNumber placeholder="权重" disabled={disabled} min={0} max={1000} />
</Form.Item>
</Col>
<Col>
Expand Down

0 comments on commit 0594bf1

Please sign in to comment.