前端升级到2.4.3版本
This commit is contained in:
zer0Black
@@ -78,6 +78,37 @@ export function validateFormAndTables(form, cases) {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 一次性验证主表单和所有的次表单(新版本)
|
||||
* @param form 主表单 form 对象
|
||||
* @param cases 接收一个数组，每项都是一个JEditableTable实例
|
||||
* @returns {Promise<any>}
|
||||
* @author sunjianlei
|
||||
*/
|
||||
export function validateFormModelAndTables(form,values, cases) {
|
||||
|
||||
if (!(form && typeof form.validate === 'function')) {
|
||||
throw `form 参数需要的是一个form对象，而传入的却是${typeof form}`
|
||||
}
|
||||
let options = {}
|
||||
return new Promise((resolve, reject) => {
|
||||
// 验证主表表单
|
||||
form.validate((valid,obj) => {
|
||||
valid ?resolve(values):reject({ error: VALIDATE_NO_PASSED })
|
||||
})
|
||||
}).then(values => {
|
||||
Object.assign(options, { formValue: values })
|
||||
// 验证所有子表的表单
|
||||
return validateTables(cases)
|
||||
}).then(all => {
|
||||
Object.assign(options, { tablesValue: all })
|
||||
return Promise.resolve(options)
|
||||
}).catch(error => {
|
||||
return Promise.reject(error)
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证并获取一个或多个表格的所有值
|
||||
* @param cases 接收一个数组，每项都是一个JEditableTable实例
|
||||
|
||||
@@ -9,10 +9,8 @@ export function disabledAuthFilter(code,formData) {
|
||||
}
|
||||
|
||||
function nodeDisabledAuth(code,formData){
|
||||
console.log("页面权限禁用--NODE--开始");
|
||||
let permissionList = [];
|
||||
try {
|
||||
console.log("页面权限禁用--NODE--开始",formData);
|
||||
if (formData) {
|
||||
let bpmList = formData.permissionList;
|
||||
permissionList = bpmList.filter(item=>item.type=='2')
|
||||
@@ -53,7 +51,6 @@ function nodeDisabledAuth(code,formData){
|
||||
}
|
||||
|
||||
function globalDisabledAuth(code){
|
||||
console.log("全局页面禁用权限--Global--开始");
|
||||
|
||||
let permissionList = [];
|
||||
let allPermissionList = [];
|
||||
@@ -106,7 +103,6 @@ function globalDisabledAuth(code){
|
||||
}else{
|
||||
for (let item2 of permissionList) {
|
||||
if(code === item2.action){
|
||||
console.log("全局页面权限解除禁用--Global--生效");
|
||||
gFlag = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ const hasPermission = {
|
||||
install (Vue, options) {
|
||||
Vue.directive('has', {
|
||||
inserted: (el, binding, vnode)=>{
|
||||
console.log("页面权限控制----");
|
||||
//console.time()
|
||||
//节点权限处理，如果命中则不进行全局权限处理
|
||||
if(!filterNodePermission(el, binding, vnode)){
|
||||
@@ -66,7 +65,6 @@ export function filterNodePermission(el, binding, vnode) {
|
||||
* 全局权限控制
|
||||
*/
|
||||
export function filterGlobalPermission(el, binding, vnode) {
|
||||
console.log("全局页面权限--Global--");
|
||||
|
||||
let permissionList = [];
|
||||
let allPermissionList = [];
|
||||
|
||||
@@ -104,7 +104,7 @@ service.interceptors.request.use(config => {
|
||||
if (!tenantid) {
|
||||
tenantid = 0;
|
||||
}
|
||||
config.headers[ 'tenant_id' ] = tenantid
|
||||
config.headers[ 'tenant-id' ] = tenantid
|
||||
//update-end-author:taoyan date:2020707 for:多租户
|
||||
if(config.method=='get'){
|
||||
if(config.url.indexOf("sys/dict/getDictItems")<0){
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
const validateMobile = (rule, value, callback) => {
|
||||
let reg = /^1(3|4|5|7|8)\d{9}$/
|
||||
if (!reg.test(value)) {
|
||||
callback('请输入正确手机号')
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
const validateEn = (rule, value, callback) => {
|
||||
let reg = /^[_a-zA-Z0-9]+$/
|
||||
let reg2 = /^.{4,18}$/
|
||||
// 长度为6到18个字符
|
||||
if (value !== '' && !reg.test(value)) {
|
||||
callback('只允许字母、数字、下划线')
|
||||
} else if (value !== '' && !reg2.test(value)) {
|
||||
callback('长度6到18个字符')
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
export const rules = {
|
||||
mobile: [{
|
||||
required: true,
|
||||
message: '请输入手机号',
|
||||
trigger: 'blur'
|
||||
}, { validator: validateMobile, trigger: 'blur' }],
|
||||
userName: [{
|
||||
required: true, message: '请输入用户名', trigger: 'blur'
|
||||
}, { validator: validateEn }],
|
||||
email: [
|
||||
{ required: false, type: 'email', message: '邮箱格式不正确', trigger: 'blur' }
|
||||
],
|
||||
// 验证自然数
|
||||
naturalNumber: /^(([0-9]*[1-9][0-9]*)|(0+))$/,
|
||||
naturalNumberMsg: '请输入自然数',
|
||||
// 英文
|
||||
english: /^.[A-Za-z]+$/,
|
||||
englishMsg: '请输入英文字符',
|
||||
// 座机
|
||||
telephone: /^\d{3}-\d{7,8}|\d{4}-\d{7,8}$/,
|
||||
telephoneMsg: '请输入正确的座机号',
|
||||
// 银行卡号码
|
||||
bankCard: /^[1-9]\d{9,19}$/,
|
||||
bankCardMsg: '请输入正确的银行卡号码',
|
||||
// 证件号码
|
||||
IDNumber: /^[a-z0-9A-Z]{0,50}$/,
|
||||
IDNumberMsg: '请输入正确的证件号码',
|
||||
// 身份证号码,包括15位和18位的
|
||||
IDCard: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{7}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/,
|
||||
IDCardMsg: '请输入正确的身份证号码',
|
||||
// QQ号码
|
||||
qq: /^[1-9]\d{4,11}$/,
|
||||
qqMsg: '请输入正确的QQ号码',
|
||||
// 网址, 仅支持http和https开头的
|
||||
url: /^(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&:/~+#]*[\w\-@?^=%&/~+#])?$/,
|
||||
urlMsg: '请输入以http和https开头的网址',
|
||||
// 0到20位的英文字符和数字
|
||||
enNum0to20: /^[a-z0-9A-Z]{0,20}$/,
|
||||
enNum0to20Msg: '请输入20位以内的英文字符和数字',
|
||||
// 2到100位的中英文字符和空格
|
||||
cnEnSpace2to100: /^[a-zA-Z\u4E00-\u9FA5\s*]{2,100}$/,
|
||||
cnEnSpace2to100Msg: '请输入2到100位的中英文字符和空格',
|
||||
// 数字和换行符
|
||||
numLinefeed: /^[0-9\n*]+$/,
|
||||
numLinefeedMsg: '请输入数字和换行符',
|
||||
// 255位以内的字符
|
||||
char0to255: /^.{0,255}$/,
|
||||
char0to255Msg: '请输入255位以内的字符',
|
||||
required: function(min, max) {
|
||||
let rule = [{ required: true, message: '', trigger: 'blur' }]
|
||||
if (min) {
|
||||
let r = { min: min, message: '最小长度' + min + '位字符' }
|
||||
rule.push(r)
|
||||
}
|
||||
if (max) {
|
||||
let m = { max: max, message: '最大长度' + max + '位字符' }
|
||||
rule.push(m)
|
||||
}
|
||||
return rule
|
||||
},
|
||||
select: function() {
|
||||
let rule = [{ required: true, message: '', trigger: 'change' }]
|
||||
return rule
|
||||
},
|
||||
checked: function(min, max) {
|
||||
let rule = [{ required: true, type: 'array', message: '', trigger: 'change' }]
|
||||
if (min) {
|
||||
let r = { type: 'array', min: min, message: '最少选择' + min + '项' }
|
||||
rule.push(r)
|
||||
}
|
||||
if (max) {
|
||||
let m = { type: 'array', max: max, message: '最多选择' + max + '项' }
|
||||
rule.push(m)
|
||||
}
|
||||
return rule
|
||||
}
|
||||
}
|
||||
/**
|
||||
* @description 排序值验证，排序值不可以大于255
|
||||
*/
|
||||
export const validateOrder = function(rule, value, callback) {
|
||||
if (parseInt(value) > 255) {
|
||||
return callback(new Error('排序值不可以大于255'))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -146,7 +146,6 @@ function generateChildRouters (data) {
|
||||
component: componentPath,
|
||||
//component: resolve => require(['@/' + component+'.vue'], resolve),
|
||||
hidden:item.hidden,
|
||||
//component:()=> import(`@/views/${item.component}.vue`),
|
||||
meta: {
|
||||
title:item.meta.title ,
|
||||
icon: item.meta.icon,
|
||||
|
||||
Reference in New Issue
Block a user