Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev

frontend/src/i18n/en_US.js

@@ -17,7 +17,8 @@ const en_US = {
     'input_name': 'Please enter a workspace name',
     'input_name_2_50': '2 to 50 characters in length',
     'search_by_name': 'Search by name',
-    'organization_name': 'Organizationn Name'
+    'organization_name': 'Organizationn Name',
+    'please_choose_organization': 'Please Choose Organization',
   },
   project: {
     'recent': 'Recent Projects'

frontend/src/i18n/zh_CN.js

@@ -17,7 +17,8 @@ const zh_CN = {
     'input_name': '请输入工作空间名称',
     'input_name_2_50': '长度在 2 到 50 个字符',
     'search_by_name': '根据名称搜索',
-    'organization_name': '所属组织'
+    'organization_name': '所属组织',
+    'please_choose_organization': '请选择组织',
   },
   project: {
     'recent': '最近的项目'

frontend/src/i18n/zh_TW.js

@@ -17,6 +17,8 @@ const zh_TW = {
     'input_name': '请输入工作空间名称',
     'input_name_2_50': '长度在 2 到 50 个字符',
     'search_by_name': '根据名称搜索',
+    'organization_name': '所属组织',
+    'please_choose_organization': '请选择组织',
   },
   project: {
     'recent': '最近的项目'

frontend/src/performance/components/settings/SystemWorkspace.vue

@@ -52,6 +52,16 @@
         <el-form-item :label="$t('commons.description')">
           <el-input type="textarea" v-model="form.description"></el-input>
         </el-form-item>
+        <el-form-item :label="$t('workspace.organization_name')" prop="userIds">
+          <el-select v-model="form.organizationId" placeholder="请选择组织" class="select-width">
+            <el-option
+              v-for="item in form.orgList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submit('form')" size="medium">{{$t('commons.save')}}</el-button>
@@ -74,6 +84,9 @@
       create() {
         this.createVisible = true;
         this.form = {};
+        this.$get("/organization/list", response => {
+          this.form = { orgList: response.data }
+        })
       },
       submit(formName) {
         this.$refs[formName].validate((valid) => {