jhnine
/
JCC-RIP
forked from JointCloud/JCC-RIP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rules change

This commit is contained in:
jhnine 2024-05-28 11:18:11 +08:00
parent 1c0680158b
commit 59c9aee84c
22 changed files with 294 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/locales/en.json
View File

@ -36,7 +36,9 @@
"isDeleteResource": "Are you sure you want to delete this resource?",
"allocationSucce": "Allocation successful",
"deleteConfirmText": "Are you sure you want to delete?",
"close": "Close"
"close": "Close",
"userNameMsg":"Please enter the correct user name",
"passwordMsg":"The password can not be less than 6 digits"
},
"menu": {
"taskManagement": "Task",

4
public/locales/zh.json
View File

@ -36,7 +36,9 @@
"isDeleteResource": "是否要删除该资源",
"allocationSucce": "分配成功",
"deleteConfirmText": "您确定要删除吗？",
"close": "关闭"
"close": "关闭",
"userNameMsg":"请输入正确的用户名",
"passwordMsg":"密码不能少于6位"
},
"menu": {
"taskManagement": "任务管理",

24
src/components/workloadsManagement/basicInfoForm.vue
View File

@ -82,17 +82,7 @@ export default {
namespace: '',
description: ''
},
namespaceOptions: [],
rules: {
name: [
{ required: true, message: '请输入名称' },
{
pattern: /^[a-z]([-a-z0-9]*[a-z0-9])?$/,
message: '名称格式不合法。'
},
{ validator: this.nameValidator }
]
}
namespaceOptions: []
}
},
computed: {
@ -106,6 +96,18 @@ export default {
},
clusterName() {
return localStorage.getItem('clusterName')
},
rules() {
return {
name: [
{ required: true, message: '请输入名称' },
{
pattern: /^[a-z]([-a-z0-9]*[a-z0-9])?$/,
message: '名称格式不合法。'
},
{ validator: this.nameValidator }
]
}
}
},
watch: {

30
src/views/adapterManagement/components/CreateAdapter.vue
View File

@ -80,20 +80,6 @@ export default {
nickname: '',
version: '',
server: ''
},
rules: {
name: [
{ required: true, message: this.$t('message.pleaseInput') }
],
nickname: [
{ required: true, message: this.$t('message.pleaseInput') }
],
version: [
{ required: true, message: this.$t('message.pleaseInput') }
],
server: [
{ required: true, message: this.$t('message.pleaseInput') }
]
}
}
},
@ -108,6 +94,22 @@ export default {
},
clusterName() {
return localStorage.getItem('clusterName')
},
rules() {
return {
name: [
{ required: true, message: this.$t('message.pleaseInput') }
],
nickname: [
{ required: true, message: this.$t('message.pleaseInput') }
],
version: [
{ required: true, message: this.$t('message.pleaseInput') }
],
server: [
{ required: true, message: this.$t('message.pleaseInput') }
]
}
}
},
watch: {

32
src/views/adapterManagement/components/CreateCluster.vue
View File

@ -228,8 +228,23 @@ export default {
},
adapterList: [],
regionList: [],
producerList: [],
rules: {
producerList: []
}
},
computed: {
createFormVisible: {
get() {
return this.value
},
set(value) {
this.$emit('input', value)
}
},
clusterName() {
return localStorage.getItem('clusterName')
},
rules() {
return {
adapterId: [
{ required: true, message: this.$t('message.pleaseChoose') }
],
@ -287,19 +302,6 @@ export default {
}
}
},
computed: {
createFormVisible: {
get() {
return this.value
},
set(value) {
this.$emit('input', value)
}
},
clusterName() {
return localStorage.getItem('clusterName')
}
},
watch: {
data(val) {
this.editInfoForm = {

22
src/views/container/projectManagement/components/CreateProject.vue
View File

@ -53,16 +53,6 @@ export default {
name: '',
aliasName: '',
description: ''
},
rules: {
name: [
{ required: true, message: '请输入名称' },
{
pattern: /^[a-z]([-a-z0-9]*[a-z0-9])?$/,
message: '名称格式不合法。'
},
{ validator: this.nameValidator }
]
}
}
},
@ -77,6 +67,18 @@ export default {
},
clusterName() {
return localStorage.getItem('clusterName')
},
rules() {
return {
name: [
{ required: true, message: '请输入名称' },
{
pattern: /^[a-z]([-a-z0-9]*[a-z0-9])?$/,
message: '名称格式不合法。'
},
{ validator: this.nameValidator }
]
}
}
},
methods: {

40
src/views/login/index.vue
View File

@ -57,29 +57,11 @@ import { isString } from '@/utils/validate'
export default {
name: 'Login',
data() {
const validateUsername = (rule, value, callback) => {
if (!isString(value)) {
callback(new Error('Please enter the correct user name'))
} else {
callback()
}
}
const validatePassword = (rule, value, callback) => {
if (value.length < 6) {
callback(new Error('The password can not be less than 6 digits'))
} else {
callback()
}
}
return {
loginForm: {
username: '',
password: ''
},
loginRules: {
username: [{ required: true, trigger: 'blur', validator: validateUsername }],
password: [{ required: true, trigger: 'blur', validator: validatePassword }]
},
passwordType: 'password',
capsTooltip: false,
loading: false,
@ -88,6 +70,14 @@ export default {
otherQuery: {}
}
},
computed: {
loginRules() {
return {
username: [{ required: true, trigger: 'blur', validator: this.validateUsername }],
password: [{ required: true, trigger: 'blur', validator: this.validatePassword }]
}
}
},
watch: {
$route: {
handler: function(route) {
@ -108,6 +98,20 @@ export default {
}
},
methods: {
validateUsername(rule, value, callback) {
if (!isString(value)) {
callback(new Error(this.$t('message.userNameMsg')))
} else {
callback()
}
},
validatePassword(rule, value, callback) {
if (value.length < 6) {
callback(new Error(this.$t('message.passwordMsg')))
} else {
callback()
}
},
checkCapslock(e) {
const { key } = e
this.capsTooltip = key && key.length === 1 && (key >= 'A' && key <= 'Z')

17
src/views/permissionManagement/menuList.vue
View File

@ -131,17 +131,10 @@ export default {
dialogVisible: false,
menu: Object.assign({}, defaultMenu),
isEdit: false,
selectMenuList: [],
rules: {
parentId: [{ required: true, message: this.$t('message.pleaseChoose'), trigger: 'change' }],
path: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }],
name: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }],
title: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }]
}
selectMenuList: []
}
},
computed: {
columns() {
return [
{ prop: 'id', label: 'ID' },
@ -167,6 +160,14 @@ export default {
}
}
]
},
rules() {
return {
parentId: [{ required: true, message: this.$t('message.pleaseChoose'), trigger: 'change' }],
path: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }],
name: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }],
title: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }]
}
}
},
watch: {

18
src/views/permissionManagement/resourceList.vue
View File

@ -90,14 +90,7 @@ export default {
resource: Object.assign({}, defaultResource),
isEdit: false,
categoryOptions: [],
defaultCategoryId: null,
rules: {
name: [{ required: true, message: this.$t('message.pleaseInput') }],
description: [{ required: true, message: this.$t('message.pleaseInput') }],
apiGroup: [{ required: true, message: this.$t('message.pleaseInput') }],
path: [{ required: true, message: this.$t('message.pleaseInput') }],
method: [{ required: true, message: this.$t('message.pleaseChoose') }]
}
defaultCategoryId: null
}
},
computed: {
@ -141,6 +134,15 @@ export default {
}
}
]
},
rules() {
return {
name: [{ required: true, message: this.$t('message.pleaseInput') }],
description: [{ required: true, message: this.$t('message.pleaseInput') }],
apiGroup: [{ required: true, message: this.$t('message.pleaseInput') }],
path: [{ required: true, message: this.$t('message.pleaseInput') }],
method: [{ required: true, message: this.$t('message.pleaseChoose') }]
}
}
},
mounted() {

12
src/views/permissionManagement/roleList.vue
View File

@ -118,11 +118,6 @@ export default {
resourceSelectDialog: false,
role: Object.assign({}, defaultRole),
isEdit: false,
rules: {
name: [{ required: true, message: this.$t('check.input') }],
description: [{ required: true, message: this.$t('check.input') }],
status: [{ required: true, message: this.$t('check.select') }]
},
labelWidth: Math.round(document.body.offsetHeight / 1048 * 100) + 'px',
apiTreeList: [],
apiIds: [],
@ -167,6 +162,13 @@ export default {
}
}
]
},
rules() {
return {
name: [{ required: true, message: this.$t('check.input') }],
description: [{ required: true, message: this.$t('check.input') }],
status: [{ required: true, message: this.$t('check.select') }]
}
}
},
methods: {

56
src/views/permissionManagement/userList.vue
View File

@ -109,13 +109,6 @@ const defaultAdmin = {
export default {
components: { List },
data() {
const equalToPassword = (rule, value, callback) => {
if (this.changePass.newPassword !== value) {
callback(new Error(this.$t('permission.differentPass')))
} else {
callback()
}
}
return {
getUserList,
admin: Object.assign({}, defaultAdmin),
@ -126,25 +119,7 @@ export default {
allocDialogVisible: false,
allocRoleIds: [],
allRoleList: [],
allocAdminId: null,
rules: {
username: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }],
nickname: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }],
phone: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }, { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }],
email: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }, { pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/, message: '邮箱格式不正确', trigger: 'blur' }],
password: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }],
roleId: [{ required: true, message: this.$t('message.pleaseChoose') }]
},
passRules: {
newPassword: [
{ required: true, trigger: 'blur', message: this.$t('permission.create') },
{ min: 6, max: 20, message: this.$t('permission.lengthRequire'), trigger: 'blur' }
],
rePassword: [
{ required: true, message: this.$t('permission.notEmputy') },
{ required: true, validator: equalToPassword, trigger: 'blur' }
]
}
allocAdminId: null
}
},
computed: {
@ -178,12 +153,41 @@ export default {
}
}
]
},
rules() {
return {
username: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }],
nickname: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }],
phone: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }, { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }],
email: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }, { pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/, message: '邮箱格式不正确', trigger: 'blur' }],
password: [{ required: true, message: this.$t('message.pleaseInput'), trigger: 'blur' }],
roleId: [{ required: true, message: this.$t('message.pleaseChoose') }]
}
},
passRules() {
return {
newPassword: [
{ required: true, trigger: 'blur', message: this.$t('permission.create') },
{ min: 6, max: 20, message: this.$t('permission.lengthRequire'), trigger: 'blur' }
],
rePassword: [
{ required: true, message: this.$t('permission.notEmputy') },
{ required: true, validator: this.equalToPassword, trigger: 'blur' }
]
}
}
},
mounted() {
this.getAllRoleList()
},
methods: {
equalToPassword(rule, value, callback) {
if (this.changePass.newPassword !== value) {
callback(new Error(this.$t('permission.differentPass')))
} else {
callback()
}
},
handleDialogConfirm() {
this.$refs.adminForm.validate((valid) => {
if (valid) {

48
src/views/strategyManagement/warnSet/index.vue
View File

@ -146,29 +146,6 @@ export default {
}
],
labelWidth: Math.round(document.body.offsetHeight / 1048 * 150) + 'px',
rules: {
name: [
{ required: true, message: this.$t('message.pleaseInput') }
],
alertType: [
{ required: true, message: this.$t('message.pleaseInput') }
],
clusterId: [
{ required: true, message: this.$t('message.pleaseChoose') }
],
alertLevel: [
{ required: true, message: this.$t('message.pleaseChoose') }
],
promQL: [
{ required: true, message: this.$t('message.pleaseInput') }
],
interval: [
{ required: true, message: this.$t('message.pleaseInput') }
],
duration: [
{ required: true, message: this.$t('message.pleaseInput') }
]
},
warningRule: {
'clusterId': '',
'alertType': '0',
@ -218,6 +195,31 @@ export default {
</div>
} }
]
},
rules() {
return {
name: [
{ required: true, message: this.$t('message.pleaseInput') }
],
alertType: [
{ required: true, message: this.$t('message.pleaseInput') }
],
clusterId: [
{ required: true, message: this.$t('message.pleaseChoose') }
],
alertLevel: [
{ required: true, message: this.$t('message.pleaseChoose') }
],
promQL: [
{ required: true, message: this.$t('message.pleaseInput') }
],
interval: [
{ required: true, message: this.$t('message.pleaseInput') }
],
duration: [
{ required: true, message: this.$t('message.pleaseInput') }
]
}
}
},
mounted() {

24
src/views/taskManagement/taskList/components/jobForm.vue
View File

@ -330,17 +330,6 @@ export default {
_schedule: '',
nextExecutionTime: ''
},
formDataRules: {
appName: [
{ required: true, message: this.$t('message.pleaseInput') },
{
pattern: /^[a-z]([-a-z0-9]*[a-z0-9])?$/,
message: this.$t('check.inputInvalid')
},
{ validator: this.nameValidator }
],
imageName: [{ required: true, message: this.$t('check.requireSelect'), trigger: 'change' }]
},
// confirmLoading: false,
minReplicasMarks: {
0: '0',
@ -375,6 +364,19 @@ export default {
gpuAmount: this.formData.gpu.amount
})
}
},
formDataRules() {
return {
appName: [
{ required: true, message: this.$t('message.pleaseInput') },
{
pattern: /^[a-z]([-a-z0-9]*[a-z0-9])?$/,
message: this.$t('check.inputInvalid')
},
{ validator: this.nameValidator }
],
imageName: [{ required: true, message: this.$t('check.requireSelect'), trigger: 'change' }]
}
}
},
methods: {

11
src/views/taskManagement/taskList/components/virtualmachineForm.vue
View File

@ -124,8 +124,13 @@ export default {
],
networkList: [],
flavorList: [],
imageList: [],
rules: {
imageList: []
}
},
computed: {
rules() {
return {
name: [
{
required: true,
@ -150,8 +155,6 @@ export default {
}
}
},
computed: {
},
mounted() {
getPublicImages().then(e => {
this.imageList = e.imageRDict

24
src/views/taskManagement/taskList/create.vue
View File

@ -286,7 +286,18 @@ export default {
'staticWeight': this.$t('page.staticClusterWeight'),
'dynamicResources': this.$t('page.dynamicClusterWeight')
},
rules: {
currentClusterList: []
}
},
computed: {
...mapGetters([
'dict'
]),
columns() {
return this.setColumn()
},
rules() {
return {
name: [
{
required: true,
@ -301,16 +312,7 @@ export default {
trigger: 'blur'
}
]
},
currentClusterList: []
}
},
computed: {
...mapGetters([
'dict'
]),
columns() {
return this.setColumn()
}
}
},
watch: {

17
src/views/virtualMachine/datavolume/edit.vue
View File

@ -144,9 +144,17 @@ export default {
],
namespaceList: [
'没有组'
],
]
// 校验规则
rules: {
}
},
computed: {
clusterName() {
return localStorage.getItem('clusterName')
},
rules() {
return {
name: [
{
required: true,
@ -164,11 +172,6 @@ export default {
}
}
},
computed: {
clusterName() {
return localStorage.getItem('clusterName')
}
},
mounted() {
getImageList({ 'platform': this.clusterName }).then(res => {
// const data = res.data

29
src/views/virtualMachine/image/edit.vue
View File

@ -92,8 +92,22 @@ export default {
labels: []
},
namespaceList: [],
orginFormData: {},
rules: {
orginFormData: {}
}
},
computed: {
addTagNumCheck() {
let flag = false
this.formData.labels.forEach(e => {
if (e.key === '') {
flag = true
}
})
return flag
},
rules() {
return {
name: [
{
required: true,
@ -111,17 +125,6 @@ export default {
}
}
},
computed: {
addTagNumCheck() {
let flag = false
this.formData.labels.forEach(e => {
if (e.key === '') {
flag = true
}
})
return flag
}
},
mounted() {
this.isEdit = !!this.$route.query.name
if (this.isEdit) {

35
src/views/virtualMachine/instance/edit.vue
View File

@ -273,8 +273,25 @@ export default {
{ prop: 'disk_format', label: this.$t('permission.diskFormat'), sortable: true, width: '150' }
],
namespaceList: [],
orginFormData: {},
rules: {
orginFormData: {}
}
},
computed: {
clusterName() {
return localStorage.getItem('clusterName')
},
addTagNumCheck() {
let flag = false
this.formData.labels.forEach(e => {
if (e.key === '') {
flag = true
}
})
return flag
},
rules() {
return {
name: [
{
required: true,
@ -292,20 +309,6 @@ export default {
}
}
},
computed: {
clusterName() {
return localStorage.getItem('clusterName')
},
addTagNumCheck() {
let flag = false
this.formData.labels.forEach(e => {
if (e.key === '') {
flag = true
}
})
return flag
}
},
mounted() {
this.isEdit = !!this.$route.query.name

29
src/views/virtualMachine/instance/form.vue
View File

@ -270,8 +270,22 @@ export default {
{ prop: 'disk_format', label: this.$t('permission.diskFormat'), sortable: true, width: '150' }
],
namespaceList: [],
orginFormData: {},
rules: {
orginFormData: {}
}
},
computed: {
addTagNumCheck() {
let flag = false
this.formData.labels.forEach(e => {
if (e.key === '') {
flag = true
}
})
return flag
},
rules() {
return {
name: [
{
required: true,
@ -289,17 +303,6 @@ export default {
}
}
},
computed: {
addTagNumCheck() {
let flag = false
this.formData.labels.forEach(e => {
if (e.key === '') {
flag = true
}
})
return flag
}
},
mounted() {
getVMoverview({ 'clusterName': this.clusterName }).then(res => {
this.limits = res.limits.absolute

47
src/views/virtualMachine/virtualMachineConfig.vue
View File

@ -258,24 +258,14 @@ export default {
sshKeyName: '',
sshKey: ''
},
rules1: {
sshKeyName: [
{
required: true,
message: '不能为空',
trigger: 'blur'
}
],
sshKey: [
{
required: true,
message: '不能为空',
trigger: 'blur'
}
]
},
// 校验规则
rules: {
sshkeyList: []
}
},
computed: {
// 校验规则
rules() {
return {
name: [
{
required: true,
@ -297,8 +287,25 @@ export default {
trigger: 'blur'
}
]
},
sshkeyList: []
}
},
rules1() {
return {
sshKeyName: [
{
required: true,
message: '不能为空',
trigger: 'blur'
}
],
sshKey: [
{
required: true,
message: '不能为空',
trigger: 'blur'
}
]
}
}
},
watch: {

9
src/views/virtualMachine/virtualMachineConfig/configImage.vue
View File

@ -89,9 +89,12 @@ export default {
isEdit: false,
imageList: [],
vmImageTypeList: ['disk', 'cd-rom'],
busList: ['virtio', 'sata', 'scsi'],
// 校验规则
rules: {
busList: ['virtio', 'sata', 'scsi']
}
},
computed: {
rules() { // 校验规则
return {
imageId: [
{
required: true,

1
src/views/warnManagement/warnList.vue
View File

@ -51,7 +51,6 @@ export default {
clusterList: [],
warningList: [],
isEdit: false,
rules: {},
detailData: {},
detailDataMap: {
ruleName: '规则标题',