Merge branch 'master' of http://47.121.207.11:3000/developers/vue-fastapi-admin

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 = "编辑列配置";
   });

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;

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() {