Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/pages/Consumer/locales/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default {
'Maximum length is 100, only letters, numbers and _ are supported, and can only begin with letters',
'page.consumer.form.itemExtraMessage.username': 'Username should be unique',
'page.consumer.notification.warning.enableAuthenticationPlugin':
'Please enable at least one authentication plugin',
'Please enable one authentication plugin',
'page.consumer.username': 'Username',
'page.consumer.updateTime': 'Update Time',
};
2 changes: 1 addition & 1 deletion src/pages/Consumer/locales/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default {
'page.consumer.form.itemRuleMessage.username':
'最大长度100,仅支持字母、数字和 _ ,且只能以字母开头',
'page.consumer.form.itemExtraMessage.username': '用户名需唯一',
'page.consumer.notification.warning.enableAuthenticationPlugin': '请启用至少一种身份认证类插件',
'page.consumer.notification.warning.enableAuthenticationPlugin': '请启用一种身份认证类插件',
'page.consumer.username': '用户名',
'page.consumer.updateTime': '更新时间',
};
20 changes: 0 additions & 20 deletions src/pages/Route/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,26 +115,6 @@ const Page: React.FC = () => {
>
{formatMessage({ id: 'component.global.edit' })}
</Button>
<Popconfirm
title={formatMessage({ id: 'component.global.popconfirm.title.delete' })}
onConfirm={() => {
remove(record.id!).then(() => {
notification.success({
message: `${formatMessage({ id: 'component.global.delete' })} ${formatMessage({
id: 'menu.routes',
})} ${formatMessage({ id: 'component.status.success' })}`,
});
/* eslint-disable no-unused-expressions */
ref.current?.reload();
});
}}
okText={formatMessage({ id: 'component.global.confirm' })}
cancelText={formatMessage({ id: 'component.global.cancel' })}
>
<Button type="primary" danger>
{formatMessage({ id: 'component.global.delete' })}
</Button>
</Popconfirm>
<Button
type="primary"
onClick={() => history.push(`/routes/${record.id}/debug`)}
Expand Down
22 changes: 17 additions & 5 deletions src/pages/Route/components/Step1/RequestConfigView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,27 @@ const RequestConfigView: React.FC<RouteModule.Step1PassProps> = ({
if (form.getFieldValue('redirectOption') === 'customRedirect') {
return (
<Form.Item
label={formatMessage({ id: 'route.request.config.redirect.custom' })}
label={formatMessage({ id: 'page.route.form.itemLabel.redirectCustom' })}
required
>
<Row gutter={10}>
<Col>
<Form.Item name="redirectURI" rules={[{ required: true }]}>
<Form.Item
name="redirectURI"
rules={[
{
required: true,
message: `${formatMessage({
id: 'component.global.pleaseEnter',
})}${formatMessage({
id: 'page.route.form.itemLabel.redirectURI',
})}`,
},
]}
>
<Input
placeholder={formatMessage({
id: 'route.request.config.redirect.custom.example',
id: 'page.route.input.placeholder.redirectCustom',
})}
disabled={disabled}
/>
Expand All @@ -272,10 +284,10 @@ const RequestConfigView: React.FC<RouteModule.Step1PassProps> = ({
<Form.Item name="redirectCode" rules={[{ required: true }]}>
<Select disabled={disabled}>
<Select.Option value={301}>
{formatMessage({ id: 'route.request.config.redirect.301' })}
{formatMessage({ id: 'page.route.select.option.redirect301' })}
</Select.Option>
<Select.Option value={302}>
{formatMessage({ id: 'route.request.config.redirect.302' })}
{formatMessage({ id: 'page.route.select.option.redirect302' })}
</Select.Option>
</Select>
</Form.Item>
Expand Down
1 change: 1 addition & 0 deletions src/pages/Route/locales/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export default {
'page.route.radio.staySame': 'Stay The Same',
'page.route.form.itemLabel.newPath': 'New Path',
'page.route.form.itemLabel.rewriteType': 'Request Path',
'page.route.form.itemLabel.redirectURI': 'Redirect URI',
'page.route.input.placeholder.newPath': 'For example: /foo/bar/index.html',

'page.route.steps.stepTitle.defineApiRequest': 'Define API Request',
Expand Down
1 change: 1 addition & 0 deletions src/pages/Route/locales/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export default {
'page.route.form.itemLabel.redirect': '重定向',
'page.route.form.itemLabel.redirectCustom': '自定义重定向',
'page.route.form.itemLabel.rewriteType': '请求路径',
'page.route.form.itemLabel.redirectURI': '重定向路径',
'page.route.form.itemExtraMessage.domain': '域名或IP,支持泛域名,如:*.test.com',
'page.route.form.itemRulesPatternMessage.domain':
'仅支持字母、数字和 * ,且 * 只能是在开头,支持单个 * ',
Expand Down