From 06aecf44256d8492d1b08e0a273b5ed6baecaf3c Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 27 May 2020 16:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E5=8F=AA?=
 =?UTF-8?q?=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/MsTableButton.vue       | 17 +++++++--
 .../common/components/MsTableHeader.vue       |  6 +++-
 .../common/components/MsTableOperator.vue     |  8 +++--
 .../components/MsTableOperatorButton.vue      | 29 +++++++++++----
 .../common/components/MsTipButton.vue         |  4 +--
 .../business/components/project/MsProject.vue |  6 ++--
 .../track/case/components/TestCaseList.vue    | 12 +++----
 .../components/track/common/NodeTree.vue      | 12 +++++--
 .../track/plan/components/TestPlanList.vue    |  8 +++--
 .../view/comonents/TestPlanTestCaseList.vue   | 36 ++++++++++---------
 10 files changed, 94 insertions(+), 44 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsTableButton.vue b/frontend/src/business/components/common/components/MsTableButton.vue
index 9f38473448..22f6998628 100644
--- a/frontend/src/business/components/common/components/MsTableButton.vue
+++ b/frontend/src/business/components/common/components/MsTableButton.vue
@@ -1,12 +1,20 @@
 <template>
-  <el-button v-permission="['test_manager', 'test_user']" @click="exec()" plain :type="type" :icon="icon" :size="size">
+  <el-button :disabled="disabled" @click="exec()" plain :type="type" :icon="icon" :size="size">
     {{content}}
   </el-button>
 </template>
 
 <script>
+    import {hasRoles} from "../../../../common/js/utils";
+    import {ROLE_TEST_MANAGER, ROLE_TEST_USER} from "../../../../common/js/constants";
+
     export default {
       name: "MsTableButton",
+      data() {
+        return {
+          disabled: false
+        }
+      },
       props: {
         content: String,
         icon: {
@@ -25,11 +33,16 @@
           type: String,
           default: 'mini'
         },
-        disabled: {
+        isTesterPermission: {
           type: Boolean,
           default: false
         }
       },
+      mounted() {
+        if (this.isTesterPermission &&!hasRoles(ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
+          this.disabled = true;
+        }
+      },
       methods: {
         exec() {
           this.$emit('click');
diff --git a/frontend/src/business/components/common/components/MsTableHeader.vue b/frontend/src/business/components/common/components/MsTableHeader.vue
index 9d6292d7fe..4a1163991b 100644
--- a/frontend/src/business/components/common/components/MsTableHeader.vue
+++ b/frontend/src/business/components/common/components/MsTableHeader.vue
@@ -8,7 +8,7 @@
     </el-row>
     <el-row type="flex" justify="space-between" align="middle">
       <span class="operate-button">
-        <ms-table-button v-if="showCreate" icon="el-icon-circle-plus-outline" :content="createTip" @click="create"/>
+        <ms-table-button :is-tester-permission="isTesterPermission" v-if="showCreate" icon="el-icon-circle-plus-outline" :content="createTip" @click="create"/>
         <slot name="button"></slot>
       </span>
       <span>
@@ -45,6 +45,10 @@
           default() {
             return this.$t('commons.create');
           }
+        },
+        isTesterPermission: {
+          type: Boolean,
+          default: false
         }
       },
       methods: {
diff --git a/frontend/src/business/components/common/components/MsTableOperator.vue b/frontend/src/business/components/common/components/MsTableOperator.vue
index 3c5aa550bb..7477ba8c3a 100644
--- a/frontend/src/business/components/common/components/MsTableOperator.vue
+++ b/frontend/src/business/components/common/components/MsTableOperator.vue
@@ -1,9 +1,9 @@
 <template>
   <span>
     <slot name="front"></slot>
-    <ms-table-operator-button :tip="tip1" icon="el-icon-edit" @exec="editClick" @click.stop="editClickStop"/>
+    <ms-table-operator-button :isTesterPermission="isTesterPermission" :tip="tip1" icon="el-icon-edit" @exec="editClick" @click.stop="editClickStop"/>
     <slot name="middle"></slot>
-    <ms-table-operator-button :tip="tip2" icon="el-icon-delete" type="danger" @exec="deleteClick" @click.stop="deleteClickStop"/>
+    <ms-table-operator-button :isTesterPermission="isTesterPermission" :tip="tip2" icon="el-icon-delete" type="danger" @exec="deleteClick" @click.stop="deleteClickStop"/>
     <slot name="behind"></slot>
   </span>
 
@@ -26,6 +26,10 @@
           default() {
             return this.$t('commons.delete');
           }
+        },
+        isTesterPermission: {
+          type: Boolean,
+          default: false
         }
       },
       methods: {
diff --git a/frontend/src/business/components/common/components/MsTableOperatorButton.vue b/frontend/src/business/components/common/components/MsTableOperatorButton.vue
index 21dcccf944..8b03620d11 100644
--- a/frontend/src/business/components/common/components/MsTableOperatorButton.vue
+++ b/frontend/src/business/components/common/components/MsTableOperatorButton.vue
@@ -1,18 +1,26 @@
 <template>
-  <ms-tip-button v-permission="['test_manager', 'test_user']"
-                 @click="exec"
-                 @clickStop="clickStop"
-                 :type="type"
-                 :tip="tip"
-                 :icon="icon" size="mini" circle/>
+  <ms-tip-button
+    :disabled="disabled"
+    @click="exec"
+    @clickStop="clickStop"
+    :type="type"
+    :tip="tip"
+    :icon="icon" size="mini" circle/>
 </template>
 
 <script>
   import MsTableButton from "./MsTableButton";
   import MsTipButton from "./MsTipButton";
+  import {hasRoles} from "../../../../common/js/utils";
+  import {ROLE_TEST_MANAGER, ROLE_TEST_USER} from "../../../../common/js/constants";
   export default {
     name: "MsTableOperatorButton",
     components: {MsTipButton, MsTableButton},
+    data() {
+      return{
+        disabled: false
+      }
+    },
     props: {
       icon: {
         type: String,
@@ -24,6 +32,15 @@
       },
       tip: {
         type: String
+      },
+      isTesterPermission: {
+        type: Boolean,
+        default: false
+      }
+    },
+    mounted() {
+      if (this.isTesterPermission && !hasRoles(ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
+        this.disabled = true;
       }
     },
     methods: {
diff --git a/frontend/src/business/components/common/components/MsTipButton.vue b/frontend/src/business/components/common/components/MsTipButton.vue
index c9abd6055f..dfcc4003dc 100644
--- a/frontend/src/business/components/common/components/MsTipButton.vue
+++ b/frontend/src/business/components/common/components/MsTipButton.vue
@@ -1,13 +1,13 @@
 <template>
 
-  <el-tooltip :disabled="disabled"
-              :content="tip"
+  <el-tooltip :content="tip"
               placement="bottom"
               :effect="effect">
     <el-button @click="exec()"
                @click.stop="clickStop"
                @keydown.enter.native.prevent
                circle
+               :disabled="disabled"
                :type="type"
                :icon="icon"
                :size="size"/>
diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index 42ee94fc9e..a185d93618 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -3,7 +3,7 @@
     <ms-main-container>
       <el-card class="table-card" v-loading="result.loading">
         <template v-slot:header>
-          <ms-table-header :condition.sync="condition" @search="search" @create="create"
+          <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="search" @create="create"
                            :create-tip="btnTips" :title="title"/>
         </template>
         <el-table :data="items" style="width: 100%">
@@ -24,9 +24,9 @@
               <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column>
+          <el-table-column :label="$t('commons.operating')">
             <template v-slot:default="scope">
-              <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>
+              <ms-table-operator :is-tester-permission="true" @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 5c1c732fe8..3783a0e296 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -4,15 +4,15 @@
     <el-card class="card-content" v-loading="result.loading">
       <template v-slot:header>
 
-        <ms-table-header :condition.sync="condition" @search="initTableData"
+        <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData"
                          :create-tip="$t('test_track.case.create')" @create="testCaseCreate">
           <template v-slot:title>
             <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh"/>
           </template>
           <template v-slot:button>
-            <ms-table-button icon="el-icon-upload2" :content="$t('test_track.case.import.import')" @click="importTestCase"/>
-            <ms-table-button icon="el-icon-right" :content="$t('test_track.case.move')" @click="handleBatch('move')"/>
-            <ms-table-button icon="el-icon-delete" :content="$t('test_track.case.delete')" @click="handleBatch('delete')"/>
+            <ms-table-button :is-tester-permission="true" icon="el-icon-upload2" :content="$t('test_track.case.import.import')" @click="importTestCase"/>
+            <ms-table-button :is-tester-permission="true" icon="el-icon-right" :content="$t('test_track.case.move')" @click="handleBatch('move')"/>
+            <ms-table-button :is-tester-permission="true" icon="el-icon-delete" :content="$t('test_track.case.delete')" @click="handleBatch('delete')"/>
             <!--<test-case-export/>-->
           </template>
         </ms-table-header>
@@ -85,9 +85,9 @@
         <el-table-column
           :label="$t('commons.operating')">
           <template v-slot:default="scope">
-            <ms-table-operator @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)">
+            <ms-table-operator :is-tester-permission="true" @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)">
               <template v-slot:middle>
-                <ms-table-operator-button :tip="$t('commons.copy')" icon="el-icon-document-copy"
+                <ms-table-operator-button :is-tester-permission="true" :tip="$t('commons.copy')" icon="el-icon-document-copy"
                                           type="success" @exec="handleCopy(scope.row)"/>
               </template>
             </ms-table-operator>
diff --git a/frontend/src/business/components/track/common/NodeTree.vue b/frontend/src/business/components/track/common/NodeTree.vue
index 0077fc29c0..c986cf628f 100644
--- a/frontend/src/business/components/track/common/NodeTree.vue
+++ b/frontend/src/business/components/track/common/NodeTree.vue
@@ -2,7 +2,7 @@
   <div v-loading="result.loading">
     <el-input :placeholder="$t('test_track.module.search')" v-model="filterText" size="small">
       <template v-if="type == 'edit'" v-slot:append>
-        <el-button v-permission="['test_manager', 'test_user']" icon="el-icon-folder-add" @click="openEditNodeDialog('add')"></el-button>
+        <el-button :disabled="disabled" icon="el-icon-folder-add" @click="openEditNodeDialog('add')"></el-button>
       </template>
     </el-input>
 
@@ -55,6 +55,8 @@
 
 <script>
 import NodeEdit from "./NodeEdit";
+import {ROLE_TEST_MANAGER, ROLE_TEST_USER} from "../../../../common/js/constants";
+import {hasRoles} from "../../../../common/js/utils";
 
 export default {
   name: "NodeTree",
@@ -66,7 +68,8 @@ export default {
       defaultProps: {
         children: "children",
         label: "label"
-      }
+      },
+      disabled: false
     };
   },
   props: {
@@ -93,6 +96,11 @@ export default {
       this.$refs.tree.filter(val);
     }
   },
+  mounted() {
+    if (!hasRoles(ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
+      this.disabled = true;
+    }
+  },
   methods: {
     handleDragEnd(draggingNode, dropNode, dropType, ev) {
       let param = {};
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 687c62f7e9..78e880fa38 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -1,8 +1,10 @@
 <template>
   <el-card class="table-card" v-loading="result.loading">
         <template v-slot:header>
-          <ms-table-header :condition.sync="condition" @search="initTableData" @create="testPlanCreate"
-                           :create-tip="$t('test_track.plan.create_plan')" :title="$t('test_track.plan.test_plan')"/>
+          <ms-table-header :is-tester-permission="true" :condition.sync="condition"
+                           @search="initTableData" @create="testPlanCreate"
+                           :create-tip="$t('test_track.plan.create_plan')"
+                           :title="$t('test_track.plan.test_plan')"/>
         </template>
 
         <el-table
@@ -56,7 +58,7 @@
           <el-table-column
             :label="$t('commons.operating')">
             <template v-slot:default="scope">
-              <ms-table-operator @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
+              <ms-table-operator :is-tester-permission="true" @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
index 9b77031436..3ca32edb81 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
@@ -2,19 +2,19 @@
   <div class="card-container">
     <el-card class="card-content" v-loading="result.loading">
       <template v-slot:header>
-        <ms-table-header :condition.sync="condition" @search="initTableData" :show-create="false">
+        <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData" :show-create="false">
           <template v-slot:title>
             <node-breadcrumb class="table-title" :nodes="selectParentNodes" @refresh="refresh"/>
           </template>
           <template v-slot:button>
-            <ms-table-button v-if="!showMyTestCase" icon="el-icon-s-custom" :content="$t('test_track.plan_view.my_case')" @click="searchMyTestCase"/>
-            <ms-table-button v-if="showMyTestCase" icon="el-icon-files" :content="$t('test_track.plan_view.all_case')" @click="searchMyTestCase"/>
-            <ms-table-button icon="el-icon-connection" :content="$t('test_track.plan_view.relevance_test_case')" @click="$emit('openTestCaseRelevanceDialog')"/>
-            <ms-table-button icon="el-icon-unlock" :content="$t('test_track.plan_view.cancel_relevance')" @click="handleBatch('delete')"/>
-            <ms-table-button icon="el-icon-edit-outline" :content="$t('test_track.plan_view.change_execution_results')" @click="handleBatch('status')"/>
-            <ms-table-button icon="el-icon-user" :content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/>
-            <ms-table-button v-if="!testPlan.reportId" icon="el-icon-document" :content="$t('test_track.plan_view.create_report')" @click="openTestReport"/>
-            <ms-table-button v-if="testPlan.reportId" icon="el-icon-document" :content="$t('test_track.plan_view.view_report')" @click="openReport"/>
+            <ms-table-button :is-tester-permission="true" v-if="!showMyTestCase" icon="el-icon-s-custom" :content="$t('test_track.plan_view.my_case')" @click="searchMyTestCase"/>
+            <ms-table-button :is-tester-permission="true" v-if="showMyTestCase" icon="el-icon-files" :content="$t('test_track.plan_view.all_case')" @click="searchMyTestCase"/>
+            <ms-table-button :is-tester-permission="true" icon="el-icon-connection" :content="$t('test_track.plan_view.relevance_test_case')" @click="$emit('openTestCaseRelevanceDialog')"/>
+            <ms-table-button :is-tester-permission="true" icon="el-icon-unlock" :content="$t('test_track.plan_view.cancel_relevance')" @click="handleBatch('delete')"/>
+            <ms-table-button :is-tester-permission="true" icon="el-icon-edit-outline" :content="$t('test_track.plan_view.change_execution_results')" @click="handleBatch('status')"/>
+            <ms-table-button :is-tester-permission="true" icon="el-icon-user" :content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/>
+            <ms-table-button :is-tester-permission="true" v-if="!testPlan.reportId" icon="el-icon-document" :content="$t('test_track.plan_view.create_report')" @click="openTestReport"/>
+            <ms-table-button :is-tester-permission="true" v-if="testPlan.reportId" icon="el-icon-document" :content="$t('test_track.plan_view.view_report')" @click="openReport"/>
           </template>
         </ms-table-header>
       </template>
@@ -103,8 +103,8 @@
         <el-table-column
           :label="$t('commons.operating')">
           <template v-slot:default="scope">
-            <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="handleEdit(scope.row)" />
-            <ms-table-operator-button :tip="$t('test_track.plan_view.cancel_relevance')" icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/>
+            <ms-table-operator-button :is-tester-permission="true" :tip="$t('commons.edit')" icon="el-icon-edit" @exec="handleEdit(scope.row)" />
+            <ms-table-operator-button :is-tester-permission="true" :tip="$t('test_track.plan_view.cancel_relevance')" icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -135,8 +135,8 @@
   import MsTableButton from '../../../../common/components/MsTableButton';
   import NodeBreadcrumb from '../../../common/NodeBreadcrumb';
 
-  import {TokenKey} from '../../../../../../common/js/constants';
-  import {_filter, _sort, humpToLine, tableFilter} from '../../../../../../common/js/utils';
+  import {ROLE_TEST_MANAGER, ROLE_TEST_USER, TokenKey} from '../../../../../../common/js/constants';
+  import {_filter, _sort, hasRoles, humpToLine, tableFilter} from '../../../../../../common/js/utils';
   import PriorityTableItem from "../../../common/tableItems/planview/PriorityTableItem";
   import StatusTableItem from "../../../common/tableItems/planview/StatusTableItem";
   import TypeTableItem from "../../../common/tableItems/planview/TypeTableItem";
@@ -239,10 +239,12 @@
           this.initTableData();
         },
         refreshTestPlanRecent() {
-          let param = {};
-          param.id = this.planId;
-          param.updateTime = Date.now();
-          this.$post('/test/plan/edit', param);
+          if (hasRoles(ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
+            let param = {};
+            param.id = this.planId;
+            param.updateTime = Date.now();
+            this.$post('/test/plan/edit', param);
+          }
         },
         search() {
           this.initTableData();