From dc6a1f095e040d51c19229247096fbea71915581 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 15 Nov 2023 11:11:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BA=A7=E5=88=AB=E7=94=A8=E6=88=B7=E7=BB=84?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1032890 --user=宋昌昌 [系统设置]github#27552创建用户组页面字段含义和选项值存在差异 https://www.tapd.cn/55049933/s/1436627
---
 system-setting/frontend/src/api/project.js    |  2 +-
 .../business/system/group/EditUserGroup.vue   | 36 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/system-setting/frontend/src/api/project.js b/system-setting/frontend/src/api/project.js
index 09d7b58b1d..dca05f317a 100644
--- a/system-setting/frontend/src/api/project.js
+++ b/system-setting/frontend/src/api/project.js
@@ -58,6 +58,6 @@ export function getFieldTemplateApiOption(projectId) {
   return get(projectId ? `/project/field/template/api/option/${projectId}` : `/project/field/template/api/option`);
 }
 
-export function getproject() {
+export function getProject() {
   return get('/project/list');
 }
diff --git a/system-setting/frontend/src/business/system/group/EditUserGroup.vue b/system-setting/frontend/src/business/system/group/EditUserGroup.vue
index 46d10cdabd..b9c59328a2 100644
--- a/system-setting/frontend/src/business/system/group/EditUserGroup.vue
+++ b/system-setting/frontend/src/business/system/group/EditUserGroup.vue
@@ -42,9 +42,9 @@
 
 <script>
 import {GROUP_SYSTEM} from "metersphere-frontend/src/utils/constants";
-import {createUserGroup, modifyUserGroup} from "../../../api/user-group";
-import {getWorkspaces} from "../../../api/workspace";
-import {getproject} from "../../../api/project";
+import {createUserGroup, modifyUserGroup} from "@/api/user-group";
+import {getWorkspaces} from "@/api/workspace";
+import {getProject} from "@/api/project";
 
 export default {
   name: "EditUserGroup",
@@ -122,11 +122,11 @@ export default {
     },
     open(row, type, title) {
       this.workspaces = [];
+      this.initWorkspace(row.scopeId);
       this.showLabel = '';
       this.title = title;
       this.isSystem = false;
       this.show = true;
-      this.dialogVisible = true;
       this.dialogType = type;
       this.form = Object.assign({}, row);
       if (type !== 'create') {
@@ -138,10 +138,7 @@ export default {
           this.show = !this.form.global;
         }
       }
-      this.getWorkspace();
-      if(type === 'edit'){
-        this.getproject();
-      }
+      this.dialogVisible = true;
     },
     cancel() {
       this.dialogVisible = false;
@@ -158,28 +155,29 @@ export default {
         this.isSystem = false;
       }
     },
-    getWorkspace() {
+    initWorkspace(scopeId) {
+      // 获取工作空间选项
       getWorkspaces().then(res => {
         let data = res.data;
         if (data) {
           this.workspaces = data;
-          let name = this.workspaces.find(item => item.id === this.form.scopeId)
-          if (name) {
+          let workspace = this.workspaces.find(item => item.id === scopeId);
+          if (workspace) {
+            // 所属范围为工作空间
             this.showLabel = this.$t('project.owning_workspace');
           } else {
+            // 所属范围为项目
             this.showLabel = this.$t('project.owning_project');
+            getProject().then(res => {
+              let data = res.data;
+              if (data) {
+                this.workspaces = data;
+              }
+            })
           }
         }
       })
     },
-    getproject() {
-      getproject().then(res => {
-        let data = res.data;
-        if (data) {
-          this.workspaces = this.workspaces.concat(data);
-        }
-      })
-    }
   }
 }
 </script>