cloud-web-corejs 1.0.163 → 1.0.165

package/src/views/user/role/edit.vue

@@ -150,8 +150,16 @@
                             v-model="fourthItem.hasAuth"
                             @change="changeBtnSelect(subItem, index3, index4)"
                           ></el-checkbox>
+                          <authConfig
+                            v-if="thrItem.checkPermission"
+                            :formData="thrItem"
+                          ></authConfig>
                         </div>
                       </div>
+                      <authConfig
+                        v-if="subItem.checkPermission"
+                        :formData="subItem"
+                      ></authConfig>
                     </div>
                   </div>
                 </div>
@@ -219,10 +227,13 @@
 </template>
 
 <script>
+import authConfig from "./authConfig.vue";
 export default {
   name: "roleEdit",
   props: ["_dataId"],
-  components: {},
+  components: {
+    authConfig,
+  },
   data() {
     return {
       tabIndex: 0,
@@ -231,6 +242,8 @@ export default {
       role: {
         menus: [],
         mobileMenuIds: [],
+        menuRolePermDTOs: [],
+        menuRolePermOrgDTOs: [],
       },
       allMenus: [],
       allMobileMenus: [],
@@ -267,14 +280,51 @@ export default {
           isLoading: true,
           modalStrictly: true,
           success: (res) => {
-            this.role = res.objx || {};
-            this.initMenuData();
+            let role = res.objx || {};
+            this.getPermissionData((rows, orgRows) => {
+              role.menuRolePermDTOs = rows;
+              role.menuRolePermOrgDTOs = orgRows;
+              this.role = role;
+              this.initMenuData();
+            });
           },
         });
       } else {
         this.initMenuData();
       }
     },
+    getPermissionData(callback) {
+      this.$http({
+        url: USER_PREFIX + `/menu_role_perm/listPerms`,
+        method: `post`,
+        data: {
+          id: this.dataId,
+        },
+        isLoading: true,
+        modalStrictly: true,
+        success: (res) => {
+          let rows = res.objx || [];
+          this.getListPermOrgs((orgRows) => {
+            callback(rows, orgRows);
+          });
+        },
+      });
+    },
+    getListPermOrgs(callback) {
+      this.$http({
+        url: USER_PREFIX + `/menu_role_perm/listPermOrgs`,
+        method: `post`,
+        data: {
+          id: this.dataId,
+        },
+        isLoading: true,
+        modalStrictly: true,
+        success: (res) => {
+          let rows = res.objx || [];
+          callback(rows);
+        },
+      });
+    },
     saveData() {
       this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
@@ -284,6 +334,9 @@ export default {
             formData.menuIds = this.getMenuFormData();
             formData.mobileMenuIds = this.getMobileMenuFormData();
 
+            //处理权限数据
+            this.handleDataBeforeSubmit();
+
             this.$http({
               url: url,
               method: `post`,
@@ -394,7 +447,7 @@ export default {
       subItem.hasAuth = isCheckSubItem;
       this.$forceUpdate();
     },
-    getMenuFormData() {
+    getMenuFormData(item, menuRolePermDTOs, menuRolePermOrgDTOs) {
       let selectIds = [];
       let menus = this.allMenus;
       menus.forEach(function (item) {
@@ -425,6 +478,41 @@ export default {
       });
       return selectIds;
     },
+    handlePermission(item, menuRolePermDTOs, menuRolePermOrgDTOs) {
+      if (item.checkPermission) {
+        if (item.permissions) {
+          menuRolePermDTOs.push({
+            menus: item.id,
+            permissions: item.permissions,
+          });
+
+          if (item.permissions === 2 && item.menuRolePermOrgDTOs.length) {
+            menuRolePermOrgDTOs.push(...item.menuRolePermOrgDTOs);
+          }
+        }
+      }
+    },
+    handleDataBeforeSubmit() {
+      let menuRolePermDTOs = [];
+      let menuRolePermOrgDTOs = [];
+      let that = this;
+      let menus = this.allMenus;
+      menus.forEach(function (item) {
+        that.handlePermission(item, menuRolePermDTOs, menuRolePermOrgDTOs);
+        if (item.children) {
+          item.children.forEach(function (subItem) {
+            that.handlePermission(subItem, menuRolePermDTOs, menuRolePermOrgDTOs);
+            if (subItem.children) {
+              subItem.children.forEach(function (thrItem) {
+                that.handlePermission(thrItem, menuRolePermDTOs, menuRolePermOrgDTOs);
+              });
+            }
+          });
+        }
+      });
+      this.role.menuRolePermDTOs = menuRolePermDTOs;
+      this.role.menuRolePermOrgDTOs = menuRolePermOrgDTOs;
+    },
     getMobileMenuFormData() {
       let selectIds = [];
       let menus = this.allMobileMenus;
@@ -457,9 +545,31 @@ export default {
       return selectIds;
     },
     handleRoles(rows, menuIds) {
+      let menuRolePermDTOs = this.role.menuRolePermDTOs || [];
+      let menuRolePermOrgDTOs = this.role.menuRolePermOrgDTOs || [];
       let newRows = [];
       for (let i = 0; i < rows.length; i++) {
         let row = rows[i];
+        let permissions = null;
+        let permOrgDTOs = [];
+        if (row.checkPermission) {
+          menuRolePermDTOs.find((item) => {
+            if (item.menus == row.id) {
+              permissions = item.permissions;
+              return true;
+            }
+            return false;
+          });
+
+          menuRolePermOrgDTOs.forEach((item) => {
+            if (item.menus == row.id) {
+              permOrgDTOs.push(item);
+            }
+          });
+        }
+
+        row.permissions = permissions;
+        row.menuRolePermOrgDTOs = permOrgDTOs;
         if (menuIds.includes(row.id)) {
           row.hasAuth = true;
         } else {