fix(权限设置): 修复组织成员可以修改工作空间成员的bug

frontend/src/business/components/settings/organization/OrganizationWorkspace.vue

@@ -2,7 +2,8 @@
   <div>
     <el-card class="table-card" v-loading="result.loading">
       <template v-slot:header>
-        <ms-table-header :create-permission="['ORGANIZATION_WORKSPACE:READ+CREATE']" :condition.sync="condition" @search="list" @create="create"
+        <ms-table-header :create-permission="['ORGANIZATION_WORKSPACE:READ+CREATE']" :condition.sync="condition"
+                         @search="list" @create="create"
                          :create-tip="$t('workspace.create')" :title="$t('commons.workspace')"/>
       </template>
       <el-table border class="adjust-table" :data="items" style="width: 100%"
@@ -31,7 +32,8 @@
                            :total="total"/>
     </el-card>
 
-    <el-dialog :close-on-click-modal="false" :title="$t('workspace.create')" :visible.sync="dialogWsAddVisible" width="30%" @close="close">
+    <el-dialog :close-on-click-modal="false" :title="$t('workspace.create')" :visible.sync="dialogWsAddVisible"
+               width="30%" @close="close">
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
@@ -46,7 +48,8 @@
           @confirm="submit('form')"/>
       </template>
     </el-dialog>
-    <el-dialog :close-on-click-modal="false" :title="$t('workspace.update')" :visible.sync="dialogWsUpdateVisible" width="30%">
+    <el-dialog :close-on-click-modal="false" :title="$t('workspace.update')" :visible.sync="dialogWsUpdateVisible"
+               width="30%">
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
@@ -63,9 +66,11 @@
     </el-dialog>
 
     <!-- dialog of workspace member -->
-    <el-dialog :close-on-click-modal="false" :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="close"
+    <el-dialog :close-on-click-modal="false" :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true"
+               @close="close"
                class="dialog-css">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
+                       :create-permission="['ORGANIZATION_WORKSPACE:READ+CREATE', 'ORGANIZATION_WORKSPACE:READ+EDIT']"
                        :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       <!-- organization member table -->
       <el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
@@ -80,7 +85,10 @@
         <el-table-column :label="$t('commons.operating')">
           <template v-slot:default="scope">
             <div>
-              <ms-table-operator :tip2="$t('commons.remove')" @editClick="editMember(scope.row)"
+              <ms-table-operator :tip2="$t('commons.remove')"
+                                 :edit-permission="['ORGANIZATION_WORKSPACE:READ+CREATE', 'ORGANIZATION_WORKSPACE:READ+EDIT']"
+                                 :delete-permission="['ORGANIZATION_WORKSPACE:READ+CREATE', 'ORGANIZATION_WORKSPACE:READ+EDIT']"
+                                 @editClick="editMember(scope.row)"
                                  @deleteClick="delMember(scope.row)"/>
             </div>
           </template>
@@ -92,12 +100,14 @@
     </el-dialog>
 
     <!-- add workspace member dialog -->
-    <el-dialog :close-on-click-modal="false" :title="$t('member.create')" :visible.sync="dialogWsMemberAddVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.create')" :visible.sync="dialogWsMemberAddVisible"
+               width="30%"
                :destroy-on-close="true"
                @close="closeFunc">
       <el-form :model="memberForm" ref="form" :rules="wsMemberRule" label-position="right" label-width="100px"
                size="small">
-        <el-form-item :label="$t('commons.member')" prop="memberSign" :rules="{required: true, message: $t('member.input_id_or_email'), trigger: 'change'}">
+        <el-form-item :label="$t('commons.member')" prop="memberSign"
+                      :rules="{required: true, message: $t('member.input_id_or_email'), trigger: 'change'}">
           <el-autocomplete
             class="input-with-autocomplete"
             v-model="memberForm.memberSign"
@@ -135,7 +145,8 @@
     </el-dialog>
 
     <!-- update workspace member dialog -->
-    <el-dialog :close-on-click-modal="false" :title="$t('member.modify')" :visible.sync="dialogWsMemberUpdateVisible" width="30%"
+    <el-dialog :close-on-click-modal="false" :title="$t('member.modify')" :visible.sync="dialogWsMemberUpdateVisible"
+               width="30%"
                :destroy-on-close="true"
                @close="closeFunc">
       <el-form :model="memberForm" label-position="right" label-width="100px" size="small" ref="updateUserForm">
@@ -151,7 +162,8 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds" :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
+        <el-form-item label="用户组" prop="groupIds"
+                      :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
           <el-select v-model="memberForm.groupIds" multiple placeholder="请选择用户组"
                      class="select-width">
             <el-option
@@ -178,7 +190,7 @@
 <script>
 import MsCreateBox from "../CreateBox";
 import {Message} from "element-ui";
-  import {DEFAULT, GROUP_ORGANIZATION, GROUP_WORKSPACE} from "../../../../common/js/constants";
+import {DEFAULT, GROUP_WORKSPACE} from "../../../../common/js/constants";
 import MsTablePagination from "../../common/pagination/TablePagination";
 import MsTableHeader from "../../common/components/MsTableHeader";
 import MsRolesTag from "../../common/components/MsRolesTag";
@@ -186,10 +198,11 @@
 import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
 import MsDialogFooter from "../../common/components/MsDialogFooter";
 import {
-    getCurrentOrganizationId,
   getCurrentUser,
-    getCurrentWorkspaceId, listenGoBack,
+  getCurrentWorkspaceId,
-    refreshSessionAndCookies, removeGoBackListener
+  listenGoBack,
+  refreshSessionAndCookies,
+  removeGoBackListener
 } from "../../../../common/js/utils";
 import MsDeleteConfirm from "../../common/components/MsDeleteConfirm";
 
@@ -223,7 +236,7 @@
         if (valid) {
           let saveType = 'add';
           if (this.form.id) {
-              saveType = 'update'
+            saveType = 'update';
           }
           this.$post("/workspace/" + saveType, this.form, () => {
             this.dialogWsAddVisible = false;
@@ -311,12 +324,12 @@
           let param = {
             name: '',
             workspaceId: this.items[i].id
-            }
+          };
           let path = "user/ws/member/list/all";
           this.$post(path, param, res => {
             let member = res.data;
             this.$set(this.items[i], "memberSize", member.length);
-            })
+          });
         }
         this.total = data.itemCount;
       });
@@ -331,7 +344,7 @@
       });
       this.result = this.$post('/user/group/list', {type: GROUP_WORKSPACE, resourceId: this.wsId}, response => {
         this.$set(this.memberForm, "groups", response.data);
-        })
+      });
       listenGoBack(this.close);
     },
     cellClick(row) {
@@ -353,7 +366,7 @@
           this.$get(url + "/" + encodeURIComponent(this.memberLineData[i].id), response => {
             let groups = response.data;
             this.$set(this.memberLineData[i], "groups", groups);
-            })
+          });
         }
         this.dialogTotal = data.itemCount;
       });
@@ -373,7 +386,7 @@
           this.$get(url + "/" + encodeURIComponent(this.memberLineData[i].id), response => {
             let groups = response.data;
             this.$set(this.memberLineData[i], "groups", groups);
-            })
+          });
         }
         this.dialogTotal = data.itemCount;
       });
@@ -404,7 +417,7 @@
             this.$success(this.$t('commons.save_success'));
             this.cellClick(this.currentWorkspaceRow);
             this.dialogWsMemberAddVisible = false;
-            })
+          });
         } else {
           return false;
         }
@@ -416,7 +429,7 @@
       let groupIds = this.memberForm.groups.map(r => r.id);
       this.result = this.$post('/user/group/list', {type: GROUP_WORKSPACE, resourceId: this.wsId}, response => {
         this.$set(this.memberForm, "allgroups", response.data);
-        })
+      });
       // 编辑时填充角色信息
       this.$set(this.memberForm, 'groupIds', groupIds);
       listenGoBack(this.close);
@@ -443,7 +456,7 @@
         phone: this.memberForm.phone,
         groupIds: this.memberForm.groupIds,
         workspaceId: this.currentWorkspaceRow.id
-        }
+      };
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.result = this.$post("/workspace/member/update", param, () => {
@@ -452,7 +465,7 @@
             this.cellClick(this.currentWorkspaceRow);
           });
         }
-        })
+      });
     },
     close: function () {
       removeGoBackListener(this.close);
@@ -529,9 +542,9 @@
       },
       currentWorkspaceRow: {},
       wsId: ""
+    };
   }
-    }
+};
-  }
 </script>
 
 <style scoped>