Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into hotfix-role

Signed-off-by: AhJindeg <ahjindeg@gmail.com>
This commit is contained in:
AhJindeg
2024-04-06 14:37:34 +00:00
committed by Gitee
181 changed files with 8718 additions and 2300 deletions

View File

@ -103,6 +103,10 @@ const open = async (row: RoleApi.RoleVO) => {
formData.code = row.code
formData.dataScope = row.dataScope
await nextTick()
row.dataScopeDeptIds?.forEach((deptId: number): void => {
await nextTick()
// 需要在 DOM 渲染完成后,再设置选中状态
row.dataScopeDeptIds?.forEach((deptId: number): void => {
treeRef.value.setChecked(deptId, true, false)
})

View File

@ -59,11 +59,11 @@ const formData = ref({
remark: ''
})
const formRules = reactive({
name: [{ required: true, message: '岗位标题不能为空', trigger: 'blur' }],
code: [{ required: true, message: '岗位编码不能为空', trigger: 'change' }],
sort: [{ required: true, message: '岗位顺序不能为空', trigger: 'change' }],
status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }],
remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }]
name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
code: [{ required: true, message: '角色标识不能为空', trigger: 'change' }],
sort: [{ required: true, message: '显示顺序不能为空', trigger: 'change' }],
status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
remark: [{ required: false, message: '备注不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref