root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ldj_willow
2022-10-31 10:57:06 +08:00
parent 3102a3f0f1 3574a6896b
commit 8cb251abac
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
acs/nladmin-ui/src/components/Crud/crud.js
View File

@@ -268,7 +268,11 @@ function CRUD(options) {
/** /**
* 取消新增/编辑 * 取消新增/编辑
*/ */
cancelCU() { cancelCU(formName) {
if (formName instanceof PointerEvent) {
formName = 'form'
}
const addStatus = crud.status.add const addStatus = crud.status.add
const editStatus = crud.status.edit const editStatus = crud.status.edit
const viewStatus = crud.status.view const viewStatus = crud.status.view
@@ -296,18 +300,21 @@ function CRUD(options) {
callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form) callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form)
} }
// 清除表单验证 // 清除表单验证
if (crud.findVM('form').$refs['form']) { if (crud.findVM('form').$refs[formName]) {
crud.findVM('form').$refs['form'].clearValidate() crud.findVM('form').$refs[formName].clearValidate()
} }
}, },
/** /**
* 提交新增/编辑 * 提交新增/编辑
*/ */
submitCU(form) { submitCU(formName) {
if (formName instanceof PointerEvent) {
formName = 'form'
}
if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) { if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) {
return return
} }
crud.findVM('form').$refs['form'].validate(valid => { crud.findVM('form').$refs[formName].validate(valid => {
if (!valid) { if (!valid) {
return return
} }
@@ -493,8 +500,10 @@ function CRUD(options) {
} }
} }
// add by ghl 2020-10-04 页面重复添加信息时，下拉框的校验会存在，需要找工取消 // add by ghl 2020-10-04 页面重复添加信息时，下拉框的校验会存在，需要找工取消
if (crud.findVM('form').$refs['form']) { let form_ref = 'form'
crud.findVM('form').$refs['form'].clearValidate() if (crudFrom.form_ref) form_ref = crudFrom.form_ref
if (crud.findVM('form').$refs[form_ref]) {
crud.findVM('form').$refs[form_ref].clearValidate()
} }
}, },
/** /**

23
lms/nladmin-ui/src/components/Crud/crud.js
View File

@@ -268,7 +268,11 @@ function CRUD(options) {
/** /**
* 取消新增/编辑 * 取消新增/编辑
*/ */
cancelCU() { cancelCU(formName) {
if (formName instanceof PointerEvent) {
formName = 'form'
}
const addStatus = crud.status.add const addStatus = crud.status.add
const editStatus = crud.status.edit const editStatus = crud.status.edit
const viewStatus = crud.status.view const viewStatus = crud.status.view
@@ -296,18 +300,21 @@ function CRUD(options) {
callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form) callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form)
} }
// 清除表单验证 // 清除表单验证
if (crud.findVM('form').$refs['form']) { if (crud.findVM('form').$refs[formName]) {
crud.findVM('form').$refs['form'].clearValidate() crud.findVM('form').$refs[formName].clearValidate()
} }
}, },
/** /**
* 提交新增/编辑 * 提交新增/编辑
*/ */
submitCU(form) { submitCU(formName) {
if (formName instanceof PointerEvent) {
formName = 'form'
}
if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) { if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) {
return return
} }
crud.findVM('form').$refs['form'].validate(valid => { crud.findVM('form').$refs[formName].validate(valid => {
if (!valid) { if (!valid) {
return return
} }
@@ -493,8 +500,10 @@ function CRUD(options) {
} }
} }
// add by ghl 2020-10-04 页面重复添加信息时，下拉框的校验会存在，需要找工取消 // add by ghl 2020-10-04 页面重复添加信息时，下拉框的校验会存在，需要找工取消
if (crud.findVM('form').$refs['form']) { let form_ref = 'form'
crud.findVM('form').$refs['form'].clearValidate() if (crudFrom.form_ref) form_ref = crudFrom.form_ref
if (crud.findVM('form').$refs[form_ref]) {
crud.findVM('form').$refs[form_ref].clearValidate()
} }
}, },
/** /**