Skip to content

Commit 122ac50

Browse files
authored
added URL support for upstream (#80)
* added URL support for upstream * added URL support for upstream
1 parent 4e1cde0 commit 122ac50

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/views/schema/upstream/edit.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@
8282
class="node-item"
8383
>
8484
<el-form-item
85-
:rules="[{required: true, pattern: /((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/g, type: 'string'}]"
85+
:rules="[{required: true, pattern: IPAndURLRegexp, type: 'string'}]"
8686
:prop="'nodes.' + index + '.ip'"
8787
>
8888
<el-input
8989
v-model="item.ip"
90-
placeholder="IP"
90+
placeholder="IP/HOST"
9191
/>
9292
</el-form-item>
9393
<el-form-item
@@ -151,6 +151,7 @@ import { TagsViewModule } from '@/store/modules/tags-view'
151151
name: 'RouterEdit'
152152
})
153153
export default class extends Vue {
154+
private IPAndURLRegexp = /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3})$|^((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]))$/
154155
private form = {
155156
type: null,
156157
key: null,

src/views/schema/upstream/list.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
>
5555
<template v-if="item.key === 'nodes'">
5656
<el-table-column
57-
label="IP"
57+
label="IP/HOST"
5858
width="150"
5959
prop="ip"
6060
class-name="status-col"

0 commit comments

Comments
 (0)