From 6745d8b5fcfb69c20eed4930cb5fd5ad3781e660 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Fri, 8 May 2020 11:04:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dkey=20value=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/test/ApiTestConfig.vue     | 30 +++++++++++--------
 .../api/test/components/ApiScenarioConfig.vue | 24 ++++++++-------
 frontend/src/common/js/message.js             |  4 +--
 frontend/src/i18n/zh-CN.js                    |  1 +
 4 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index 4c981189f4..f3581e31f9 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -16,9 +16,13 @@
                 {{$t('commons.save')}}
               </el-button>
 
-              <el-button type="primary" plain @click="runTest">
+              <el-button type="primary" plain v-if="!isDisabled" @click="saveRunTest">
                 {{$t('load_test.save_and_run')}}
               </el-button>
+
+              <el-button type="primary" plain v-if="isDisabled" @click="runTest">
+                {{$t('api_test.run')}}
+              </el-button>
               <el-button type="warning" plain @click="cancel">{{$t('commons.cancel')}}</el-button>
             </el-row>
           </el-header>
@@ -91,29 +95,31 @@
           }
         });
       },
+      save: function (callback) {
+        this.change = false;
+        let url = this.create ? "/api/create" : "/api/update";
+        this.result = this.$request(this.getOptions(url), () => {
+          this.create = false;
+          if (callback) callback();
+        });
+      },
       saveTest: function () {
         this.save(() => {
           this.$success(this.$t('commons.save_success'));
         })
       },
-      save: function (callback) {
-        this.change = false;
-        let url = this.create ? "/api/create" : "/api/update";
-        this.result = this.$request(this.getOptions(url), response => {
-          this.create = false;
-          if (callback) callback();
+      runTest: function () {
+        this.result = this.$post("/api/run", {id: this.test.id}, () => {
+          this.$success(this.$t('api_test.running'));
         });
       },
-      runTest: function () {
+      saveRunTest: function () {
         this.change = false;
 
         this.save(() => {
           this.$success(this.$t('commons.save_success'));
-          this.result = this.$post("/api/run", {id: this.test.id}, response => {
-            this.$success(this.$t('api_test.running'));
-          });
+          this.runTest();
         })
-
       },
       cancel: function () {
         this.$router.push('/api/test/list/all');
diff --git a/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue b/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
index 149b18264a..76b4d241fd 100644
--- a/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
+++ b/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
@@ -12,20 +12,20 @@
                   {{$t('api_test.scenario.config')}}
                 </span>
               </div>
-<!--              暂时去掉，将来再加-->
-<!--              <el-dropdown trigger="click" @command="handleCommand">-->
-<!--                <span class="el-dropdown-link el-icon-more scenario-btn"/>-->
-<!--                <el-dropdown-menu slot="dropdown">-->
-<!--                  <el-dropdown-item :command="{type:'delete', index:index}">删除场景</el-dropdown-item>-->
-<!--                </el-dropdown-menu>-->
-<!--              </el-dropdown>-->
+              <!--              暂时去掉，将来再加-->
+              <!--              <el-dropdown trigger="click" @command="handleCommand">-->
+              <!--                <span class="el-dropdown-link el-icon-more scenario-btn"/>-->
+              <!--                <el-dropdown-menu slot="dropdown">-->
+              <!--                  <el-dropdown-item :command="{type:'delete', index:index}">删除场景</el-dropdown-item>-->
+              <!--                </el-dropdown-menu>-->
+              <!--              </el-dropdown>-->
             </template>
             <ms-api-request-config :requests="scenario.requests" :open="select"/>
           </ms-api-collapse-item>
         </ms-api-collapse>
       </div>
-<!--      暂时去掉，将来再加-->
-<!--      <el-button class="scenario-create" type="primary" size="mini" icon="el-icon-plus" plain @click="createScenario"/>-->
+      <!--      暂时去掉，将来再加-->
+      <!--      <el-button class="scenario-create" type="primary" size="mini" icon="el-icon-plus" plain @click="createScenario"/>-->
     </el-aside>
 
     <el-main class="scenario-main">
@@ -90,9 +90,13 @@
         }
       },
       select: function (obj) {
-        this.selected = obj;
+        this.selected = null;
+        this.$nextTick(function () {
+          this.selected = obj;
+        });
       },
       reset: function () {
+        this.selected = null;
         this.$nextTick(function () {
           this.activeName = 0;
           this.select(this.scenarios[0]);
diff --git a/frontend/src/common/js/message.js b/frontend/src/common/js/message.js
index cb3d2fa2a8..0b88ec7ed8 100644
--- a/frontend/src/common/js/message.js
+++ b/frontend/src/common/js/message.js
@@ -12,7 +12,7 @@ export default {
         message: message,
         type: "success",
         showClose: true,
-        duration: 1000
+        duration: 1500
       })
     };
 
@@ -30,7 +30,7 @@ export default {
         message: message,
         type: "warning",
         showClose: true,
-        duration: 2000
+        duration: 5000
       })
     };
 
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index eda4519f39..b52c9cc388 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -187,6 +187,7 @@ export default {
   },
   api_test: {
     save_and_run: "保存并执行",
+    run: "执行",
     running: "正在执行",
     reset: "重置",
     input_name: "请输入测试名称",

From d38fe65d2bb41aa1356e4edb210ec3ccf22c9473 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 8 May 2020 12:11:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/system/SystemWorkspace.vue       | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index 2a73b74da7..cf8a4d2d4a 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -12,7 +12,8 @@
         <el-table-column prop="organizationName" :label="$t('workspace.organization_name')"/>
         <el-table-column :label="$t('commons.member')">
           <template v-slot:default="scope">
-            <el-button type="text" class="member-size" @click="cellClick(scope.row)">{{scope.row.memberSize}}
+            <el-button type="text" class="member-size" @click="cellClick(scope.row)">
+              {{scope.row.memberSize}}
             </el-button>
           </template>
         </el-table-column>
@@ -85,7 +86,7 @@
     </el-dialog>
 
     <!-- dialog of workspace member -->
-    <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
+    <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeWsMemberDialog">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="dialogBtnTips" :title="$t('commons.member')"/>
       <!-- organization member table -->
@@ -112,7 +113,7 @@
     <!-- add workspace member dialog -->
     <el-dialog :title="$t('member.create')" :visible.sync="dialogWsMemberAddVisible" width="30%"
                :destroy-on-close="true"
-               @close="closeFunc">
+               @close="closeWsMemberAddDialog">
       <el-form :model="memberForm" ref="form" :rules="wsMemberRule" label-position="right" label-width="100px"
                size="small">
         <el-form-item :label="$t('commons.member')" prop="userIds">
@@ -152,7 +153,7 @@
     <!-- update workspace member dialog -->
     <el-dialog :title="$t('member.modify')" :visible.sync="dialogWsMemberUpdateVisible" width="30%"
                :destroy-on-close="true"
-               @close="closeFunc">
+               @close="closeWsMemberUpdateDialog">
       <el-form :model="memberForm" label-position="right" label-width="100px" size="small" ref="updateUserForm">
         <el-form-item label="ID" prop="id">
           <el-input v-model="memberForm.id" autocomplete="off" :disabled="true"/>
@@ -180,7 +181,7 @@
       </el-form>
       <template v-slot:footer>
         <span class="dialog-footer">
-          <el-button type="primary" @click="updateOrgMember('updateUserForm')" @keydown.enter.native.prevent
+          <el-button type="primary" @click="updateWorkspaceMember('updateUserForm')" @keydown.enter.native.prevent
                      size="medium">{{$t('commons.save')}}
           </el-button>
         </span>
@@ -232,7 +233,6 @@
       },
       addMember() {
         this.dialogWsMemberAddVisible = true;
-        this.memberForm = {};
         this.result = this.$get('/user/list/', response => {
           this.$set(this.memberForm, "userList", response.data);
         });
@@ -318,13 +318,16 @@
 
         });
       },
-      closeFunc() {
-        this.form = {};
+      closeWsMemberAddDialog() {
+        this.memberForm = {};
       },
-      closeMemberFunc() {
+      closeWsMemberDialog() {
         this.memberLineData = [];
         this.list();
       },
+      closeWsMemberUpdateDialog() {
+        this.dialogSearch();
+      },
       list() {
         let url = '/workspace/list/all/' + this.currentPage + '/' + this.pageSize;
         this.result = this.$post(url, this.condition, response => {
@@ -385,7 +388,7 @@
           this.$info(this.$t('commons.delete_cancel'));
         });
       },
-      updateOrgMember() {
+      updateWorkspaceMember() {
         let param = {
           id: this.memberForm.id,
           name: this.memberForm.name,

From 3ec68ed0c1b355d7dd400496577d5b06151b2f3a Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 8 May 2020 14:40:42 +0800
Subject: [PATCH 3/4] bug fix

---
 .../java/io/metersphere/controller/WorkspaceController.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/controller/WorkspaceController.java b/backend/src/main/java/io/metersphere/controller/WorkspaceController.java
index 580013ed18..be16dbe380 100644
--- a/backend/src/main/java/io/metersphere/controller/WorkspaceController.java
+++ b/backend/src/main/java/io/metersphere/controller/WorkspaceController.java
@@ -9,6 +9,7 @@ import io.metersphere.commons.utils.Pager;
 import io.metersphere.controller.request.WorkspaceRequest;
 import io.metersphere.dto.WorkspaceDTO;
 import io.metersphere.dto.WorkspaceMemberDTO;
+import io.metersphere.service.OrganizationService;
 import io.metersphere.service.WorkspaceService;
 import io.metersphere.user.SessionUtils;
 import org.apache.shiro.authz.annotation.Logical;
@@ -23,11 +24,14 @@ import java.util.List;
 public class WorkspaceController {
     @Resource
     private WorkspaceService workspaceService;
+    @Resource
+    private OrganizationService organizationService;
 
     @PostMapping("add")
     @RequiresRoles(RoleConstants.ORG_ADMIN)
     public Workspace addWorkspace(@RequestBody Workspace workspace) {
-        workspaceService.checkWorkspaceOwnerByOrgAdmin(workspace.getId());
+        String currentOrganizationId = SessionUtils.getCurrentOrganizationId();
+        organizationService.checkOrgOwner(currentOrganizationId);
         return workspaceService.saveWorkspace(workspace);
     }
 

From 7d586af28be09efcc6b56b65f7fbe5aa9e35fc3e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 8 May 2020 15:34:45 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/organization/OrganizationMember.vue      |  2 +-
 .../settings/organization/OrganizationWorkspace.vue   |  4 ++--
 .../components/settings/personal/PersonSetting.vue    |  2 +-
 .../components/settings/system/Organization.vue       |  4 ++--
 .../components/settings/system/SystemWorkspace.vue    | 11 ++++-------
 .../src/business/components/settings/system/User.vue  |  2 +-
 .../components/settings/workspace/WorkspaceMember.vue |  2 +-
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index a820cac769..c14d93551f 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -167,7 +167,7 @@
       },
       edit(row) {
         this.updateVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
         let roleIds = this.form.roles.map(r => r.id);
         this.result = this.$get('/role/list/org', response => {
           this.$set(this.form, "allroles", response.data);
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 21d8c4f64b..612d331dbd 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -193,7 +193,7 @@
       },
       edit(row) {
         this.dialogWsAddVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
       },
       del(row) {
         this.$confirm(this.$t('workspace.delete_confirm'), '', {
@@ -317,7 +317,7 @@
       },
       editMember(row) {
         this.dialogWsMemberUpdateVisible = true;
-        this.memberForm = row;
+        this.memberForm = Object.assign({}, row);
         let roleIds = this.memberForm.roles.map(r => r.id);
         this.result = this.$get('/role/list/test', response => {
           this.$set(this.memberForm, "allroles", response.data);
diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index a021e33f2c..5ba794f2bf 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -110,7 +110,7 @@
       },
       edit(row) {
         this.updateVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
       },
       updateUser(updateUserForm) {
         this.$refs[updateUserForm].validate(valide => {
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index c840c6d01e..ef7944015a 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -258,11 +258,11 @@
       },
       edit(row) {
         this.dialogOrgUpdateVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
       },
       editMember(row) {
         this.dialogOrgMemberUpdateVisible = true;
-        this.memberForm = row;
+        this.memberForm = Object.assign({}, row);
         let roleIds = this.memberForm.roles.map(r => r.id);
         this.result = this.$get('/role/list/org', response => {
           this.$set(this.memberForm, "allroles", response.data);
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index cf8a4d2d4a..b6da351f7f 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -113,7 +113,7 @@
     <!-- add workspace member dialog -->
     <el-dialog :title="$t('member.create')" :visible.sync="dialogWsMemberAddVisible" width="30%"
                :destroy-on-close="true"
-               @close="closeWsMemberAddDialog">
+               @close="handleClose">
       <el-form :model="memberForm" ref="form" :rules="wsMemberRule" label-position="right" label-width="100px"
                size="small">
         <el-form-item :label="$t('commons.member')" prop="userIds">
@@ -153,7 +153,7 @@
     <!-- update workspace member dialog -->
     <el-dialog :title="$t('member.modify')" :visible.sync="dialogWsMemberUpdateVisible" width="30%"
                :destroy-on-close="true"
-               @close="closeWsMemberUpdateDialog">
+               @close="handleClose">
       <el-form :model="memberForm" label-position="right" label-width="100px" size="small" ref="updateUserForm">
         <el-form-item label="ID" prop="id">
           <el-input v-model="memberForm.id" autocomplete="off" :disabled="true"/>
@@ -318,16 +318,13 @@
 
         });
       },
-      closeWsMemberAddDialog() {
+      handleClose() {
         this.memberForm = {};
       },
       closeWsMemberDialog() {
         this.memberLineData = [];
         this.list();
       },
-      closeWsMemberUpdateDialog() {
-        this.dialogSearch();
-      },
       list() {
         let url = '/workspace/list/all/' + this.currentPage + '/' + this.pageSize;
         this.result = this.$post(url, this.condition, response => {
@@ -366,7 +363,7 @@
       },
       editMember(row) {
         this.dialogWsMemberUpdateVisible = true;
-        this.memberForm = row;
+        this.memberForm = Object.assign({}, row);
         let roleIds = this.memberForm.roles.map(r => r.id);
         this.result = this.$get('/role/list/test', response => {
           this.$set(this.memberForm, "allroles", response.data);
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 279b85543e..127b87d080 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -162,7 +162,7 @@
       },
       edit(row) {
         this.updateVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
       },
       del(row) {
         this.$confirm(this.$t('user.delete_confirm'), '', {
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 8bdeda0f97..04ee8d7bc8 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -191,7 +191,7 @@
       },
       edit(row) {
         this.updateVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
         let roleIds = this.form.roles.map(r => r.id);
         this.result = this.$get('/role/list/test', response => {
           this.$set(this.form, "allroles", response.data);