diff --git a/vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityCol.vue b/vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityCol.vue index d89e085..1421fd2 100644 --- a/vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityCol.vue +++ b/vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityCol.vue @@ -536,7 +536,13 @@ const handleEdit = (row) => { } form.value = data; - + if (data.objType === '0') { + userOrRoleList.value = userList.value; // 用户 + } else if (data.objType === '1') { + userOrRoleList.value = roleList.value; // 角色 + } else { + userOrRoleList.value = []; + } dialogVisible.value = true; dialogTitle.value = "编辑列配置"; }); diff --git a/vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityRow.vue b/vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityRow.vue index e4d4906..6c53e13 100644 --- a/vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityRow.vue +++ b/vue-fastapi-frontend/src/views/meta/metasercurity/MetaSecurityRow.vue @@ -485,7 +485,13 @@ const handleEdit = (row) => { } else if (!data.dbCName) { data.dbCName = []; } - + if (data.objType === '0') { + userOrRoleList.value = userList.value; // 用户 + } else if (data.objType === '1') { + userOrRoleList.value = roleList.value; // 角色 + } else { + userOrRoleList.value = []; + } form.value = data; dialogVisible.value = true; @@ -509,7 +515,7 @@ function handleSave() { submitData.objValue = submitData.objValue.join(','); } // 判断是新增还是修改 - if (submitData.colId) { + if (submitData.rowId) { updateMetaSecurityRow(submitData).then(() => { proxy.$modal.msgSuccess("修改成功"); dialogVisible.value = false; diff --git a/vue-fastapi-frontend/src/views/metadataConfig/bizConfig/index.vue b/vue-fastapi-frontend/src/views/metadataConfig/bizConfig/index.vue index 37f27d7..0b3409f 100644 --- a/vue-fastapi-frontend/src/views/metadataConfig/bizConfig/index.vue +++ b/vue-fastapi-frontend/src/views/metadataConfig/bizConfig/index.vue @@ -477,7 +477,7 @@ async function loadRightTable(onum) { // 用唯一键:ssysCd + mdlName + tabEngName 来判断是否重复 function buildKey(row) { - return `${row.ssysCd}||${row.mdlName}||${row.tabEngName}` + return `${row.ssysId}||${row.mdlName}||${row.tabEngName}` } function moveToRight() {