Skip to content

Commit 815d146

Browse files
committed
修复数据治理多余路由及名称校验问题
1 parent f4749cf commit 815d146

File tree

3 files changed

+22
-12
lines changed

3 files changed

+22
-12
lines changed

web/src/apps/dataGovernance/module/dataGovernance/index.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default {
4343
{ id: 12, name: "数据资产目录", pathName: "dataGovernance/assets" }
4444
]
4545
},
46-
{
46+
/*{
4747
id: 2,
4848
name: "元数据管理",
4949
children: [{ id: 21, name: "元数据采集" }]
@@ -52,7 +52,7 @@ export default {
5252
id: 3,
5353
name: "数据权限",
5454
children: [{ id: 31, name: "数据权限管理" }]
55-
},
55+
},*/
5656
{
5757
id: 4,
5858
name: "数仓规划",
@@ -65,8 +65,8 @@ export default {
6565
{ id: 42, name: "分层配置", pathName: "dataGovernance/layered" }
6666
]
6767
},
68-
{ id: 5, name: "数据质量", children: [] },
69-
{ id: 6, name: "数据安全", children: [] }
68+
/*{ id: 5, name: "数据质量", children: [] },
69+
{ id: 6, name: "数据安全", children: [] }*/
7070
],
7171
currentTreeId: 1,
7272
title: this.$t("message.dataGovernance.dataOverview")

web/src/apps/dataGovernance/view/layered/editModal.vue

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,16 @@ export default {
104104
data() {
105105
const validateName = (rule, value, callback) => {
106106
if (value) {
107-
const valid = /\ /.test(value);
108-
if (!valid) {
107+
const invalid = /\ /.test(value) || !(/^[a-z|A-Z]/.test(value))
108+
if (value.length > 30) {
109+
this.formState.name = value.substring(0, 30)
110+
callback(new Error('最多30字'))
111+
return
112+
}
113+
if (!invalid) {
109114
callback();
110115
} else {
111-
callback(new Error('不能包含空格'));
116+
callback(new Error('不能包含空格,且必须以字母开头'))
112117
}
113118
} else {
114119
callback(new Error('不能为空'));

web/src/apps/dataGovernance/view/subjectDomain/editModal.vue

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
label-position="top"
88
>
99
<FormItem label="名称" prop="name">
10-
<Input v-model="formState.name" placeholder="名称" :disabled="mode === 'edit'" :maxlength="30" /><span>最多30字</span>
10+
<Input v-model="formState.name" placeholder="名称" :disabled="mode === 'edit'"/>
1111
</FormItem>
1212
<!--<FormItem label="英文名" prop="enName">
1313
<Input v-model="formState.enName" placeholder="英文名"></Input>
@@ -91,14 +91,19 @@ export default {
9191
data() {
9292
const validateName = (rule, value, callback) => {
9393
if (value) {
94-
const valid = /\ /.test(value);
95-
if (!valid) {
94+
const invalid = /\ /.test(value) || !(/^[a-z|A-Z]/.test(value))
95+
if (value.length > 30) {
96+
this.formState.name = value.substring(0, 30)
97+
callback(new Error('最多30字'))
98+
return
99+
}
100+
if (!invalid) {
96101
callback();
97102
} else {
98-
callback(new Error('不能包含空格'));
103+
callback(new Error('不能包含空格,且必须以字母开头'))
99104
}
100105
} else {
101-
callback(new Error('不能为空'));
106+
callback(new Error('不能为空'))
102107
}
103108
};
104109
return {

0 commit comments

Comments
 (0)