refactor(权限设置): 去掉 checkoutTestManagerOrTestUser

frontend/src/business/components/api/automation/ApiAutomation.vue

@@ -73,7 +73,7 @@ import MsContainer from "@/business/components/common/components/MsContainer";
 import MsAsideContainer from "@/business/components/common/components/MsAsideContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 import MsApiScenarioList from "@/business/components/api/automation/scenario/ApiScenarioList";
-import {checkoutTestManagerOrTestUser, getCurrentUser, getUUID} from "@/common/js/utils";
+import {getCurrentUser, getUUID} from "@/common/js/utils";
 import MsApiScenarioModule from "@/business/components/api/automation/scenario/ApiScenarioModule";
 import MsEditApiScenario from "./scenario/EditApiScenario";
 
@@ -100,7 +100,7 @@ import MsEditApiScenario from "./scenario/EditApiScenario";
         return redirectParam;
       },
       isReadOnly() {
-        return !checkoutTestManagerOrTestUser();
+        return false;
       },
       projectId() {
         return this.$store.state.projectId

frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue

@@ -19,7 +19,6 @@
 </template>
 
 <script>
-  import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 
   export default {
     name: "MsApiReportViewHeader",
@@ -38,9 +37,7 @@
       }
     },
     created() {
-      if (!checkoutTestManagerOrTestUser()) {
+
-        this.isReadOnly = true;
-      }
     },
     methods: {
       handleExport(name) {

frontend/src/business/components/api/automation/scenario/maximize/ScenarioHeader.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-  import {checkoutTestManagerOrTestUser, exportPdf} from "@/common/js/utils";
+  import {exportPdf} from "@/common/js/utils";
   import html2canvas from 'html2canvas';
   import EnvPopover from "../../scenario/EnvPopover";
 

frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue

@@ -144,7 +144,6 @@ import MsTableOperatorButton from "../../../../common/components/MsTableOperator
 import MsTableOperator from "../../../../common/components/MsTableOperator";
 import PlanStatusTableItem from "../../../../track/common/tableItems/plan/PlanStatusTableItem";
 import PlanStageTableItem from "../../../../track/common/tableItems/plan/PlanStageTableItem";
-import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 import TestReportTemplateList from "../../../../track/plan/view/comonents/TestReportTemplateList";
 import TestCaseReportView from "../../../../track/plan/view/comonents/report/TestCaseReportView";
 import MsDeleteConfirm from "../../../../common/components/MsDeleteConfirm";
@@ -207,7 +206,7 @@ export default {
     },
     created() {
       this.projectId = this.$route.params.projectId;
-      this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
+      this.isTestManagerOrTestUser = true;
       this.initTableData();
       this.setScenarioSelectRows(this.row);
       this.getWsProjects();

frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue

@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import {checkoutTestManagerOrTestUser, getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import Crontab from "@/business/components/common/cron/Crontab";
 import CrontabResult from "@/business/components/common/cron/CrontabResult";
 import {cronValidate} from "@/common/js/cron";

frontend/src/business/components/api/definition/ApiDefinition.vue

@@ -158,7 +158,7 @@ import MsRunTestHttpPage from "./components/runtest/RunTestHTTPPage";
 import MsRunTestTcpPage from "./components/runtest/RunTestTCPPage";
 import MsRunTestSqlPage from "./components/runtest/RunTestSQLPage";
 import MsRunTestDubboPage from "./components/runtest/RunTestDubboPage";
-import {checkoutTestManagerOrTestUser, getCurrentUser, getUUID} from "@/common/js/utils";
+import {getCurrentUser, getUUID} from "@/common/js/utils";
 import MsApiModule from "./components/module/ApiModule";
 import ApiCaseSimpleList from "./components/list/ApiCaseSimpleList";
 
@@ -180,7 +180,7 @@ export default {
       return routeParam;
     },
     isReadOnly() {
-      return !checkoutTestManagerOrTestUser();
+      return false;
     },
     projectId() {
       return this.$store.state.projectId;

frontend/src/business/components/api/definition/components/import/ImportScheduleEdit.vue

@@ -39,7 +39,6 @@
 
 <script>
 import {
-  checkoutTestManagerOrTestUser,
   getCurrentProjectID,
   getCurrentUser,
   listenGoBack,
@@ -225,7 +224,7 @@ export default {
   },
   computed: {
     isTesterPermission() {
-      return checkoutTestManagerOrTestUser();
+      return true;
     }
   }
 }

frontend/src/business/components/api/homepage/components/RunningTaskList.vue

@@ -57,7 +57,6 @@
 </template>
 
 <script>
-import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 import MsTag from "@/business/components/common/components/MsTag";
 export default {
   name: "MsRunningTaskList",
@@ -79,7 +78,7 @@ export default {
 
   computed:{
     isReadOnly(){
-      return !checkoutTestManagerOrTestUser();
+      return false;
     },
     projectId() {
       return this.$store.state.projectId

frontend/src/business/components/api/report/ApiReportViewHeader.vue

@@ -15,8 +15,6 @@
 </template>
 
 <script>
-    import {checkoutTestManagerOrTestUser} from "../../../../common/js/utils";
-
     export default {
       name: "MsApiReportViewHeader",
       props: ['report'],
@@ -31,9 +29,7 @@
         }
       },
       created() {
-        if (!checkoutTestManagerOrTestUser()) {
+
-          this.isReadOnly = true;
-        }
       },
       methods: {
         handleExport(name) {

frontend/src/business/components/api/test/ApiTestConfig.vue

@@ -77,7 +77,7 @@ import MsApiScenarioConfig from "./components/ApiScenarioConfig";
 import {Scenario, Test} from "./model/ScenarioModel"
 import MsApiReportStatus from "../report/ApiReportStatus";
 import MsApiReportDialog from "./ApiReportDialog";
-import {checkoutTestManagerOrTestUser, downloadFile, getCurrentProjectID, getUUID} from "@/common/js/utils";
+import {downloadFile, getCurrentProjectID, getUUID} from "@/common/js/utils";
 import MsScheduleConfig from "../../common/components/MsScheduleConfig";
 import ApiImport from "./components/import/ApiImport";
 import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
@@ -121,7 +121,7 @@ export default {
 
     methods: {
       init() {
-        this.isReadOnly = !checkoutTestManagerOrTestUser();
+        this.isReadOnly = false;
 
         if (this.id) {
           this.create = false;

frontend/src/business/components/common/components/MsScheduleEdit.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import {checkoutTestManagerOrTestUser, getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import Crontab from "../cron/Crontab";
 import CrontabResult from "../cron/CrontabResult";
 import {cronValidate} from "@/common/js/cron";
@@ -194,7 +194,7 @@ export default {
   },
   computed: {
     isTesterPermission() {
-      return checkoutTestManagerOrTestUser();
+      return false;
     }
   }
 }

frontend/src/business/components/common/components/MsTableOperatorButton.vue

@@ -27,8 +27,6 @@
 <script>
   import MsTableButton from "./MsTableButton";
   import MsTipButton from "./MsTipButton";
-  import {checkoutTestManagerOrTestUser, hasRoles} from "../../../../common/js/utils";
-  import {ROLE_TEST_MANAGER, ROLE_TEST_USER} from "../../../../common/js/constants";
   export default {
     name: "MsTableOperatorButton",
     components: {MsTipButton, MsTableButton},

frontend/src/business/components/performance/report/PerformanceReportCompare.vue

@@ -23,7 +23,6 @@
 <script>
 import MsContainer from "@/business/components/common/components/MsContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
-import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 import OverviewCompareCard from "@/business/components/performance/report/components/OverviewCompareCard";
 import MsChart from "@/business/components/common/chart/MsChart";
 import LoadCompareCard from "@/business/components/performance/report/components/LoadCompareCard";
@@ -37,7 +36,7 @@ export default {
   },
   computed: {
     isReadOnly() {
-      return !checkoutTestManagerOrTestUser();
+      return false;
     }
   },
   data() {

frontend/src/business/components/performance/report/PerformanceReportExport.vue

@@ -27,8 +27,6 @@
   import MsReportRequestStatistics from './components/RequestStatistics';
   import MsReportTestOverview from './components/TestOverview';
 
-  import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
-  import MsPerformanceReportExport from "./PerformanceReportExport";
   import MsReportTitle from "../../common/components/report/MsReportTitle";
   import MsReportExportTemplate from "../../common/components/report/MsReportExportTemplate";
 

frontend/src/business/components/performance/test/components/ExistFiles.vue

@@ -76,7 +76,6 @@
             <el-tooltip effect="dark" :content="$t('project.upload_file_again')" placement="bottom">
               <el-button circle
                          type="success"
-                         :disabled="!checkoutTestManagerOrTestUser()"
                          icon="el-icon-upload"
                          @click="handleEdit(scope.row)"
                          size="mini"/>
@@ -103,7 +102,7 @@
 <script>
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
-import {checkoutTestManagerOrTestUser, getCurrentProjectID} from "@/common/js/utils";
+import {getCurrentProjectID} from "@/common/js/utils";
 import {findThreadGroup} from "@/business/components/performance/test/model/ThreadGroup";
 import MsTableButton from "@/business/components/common/components/MsTableButton";
 import axios from "axios";
@@ -136,7 +135,6 @@ export default {
     };
   },
   methods: {
-    checkoutTestManagerOrTestUser,
     open(loadType) {
       this.loadFileVisible = true;
       this.loadType = loadType;

frontend/src/business/components/performance/test/components/ResourceFiles.vue

@@ -59,7 +59,6 @@
             <el-tooltip effect="dark" :content="$t('project.upload_file_again')" placement="bottom">
               <el-button circle
                          type="success"
-                         :disabled="!checkoutTestManagerOrTestUser()"
                          icon="el-icon-upload"
                          @click="handleEdit(scope.row)"
                          size="mini"/>
@@ -84,7 +83,7 @@
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import MsTableButton from "@/business/components/common/components/MsTableButton";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
-import {checkoutTestManagerOrTestUser, getCurrentProjectID} from "@/common/js/utils";
+import {getCurrentProjectID} from "@/common/js/utils";
 import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
 import {Message} from "element-ui";
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
@@ -117,7 +116,6 @@ export default {
     };
   },
   methods: {
-    checkoutTestManagerOrTestUser,
     open(project) {
       this.projectId = project.id;
       this.loadFileVisible = true;

frontend/src/business/components/settings/project/EnvironmentList.vue

@@ -110,7 +110,7 @@
   import MsAsideContainer from "@/business/components/common/components/MsAsideContainer";
   import ProjectSwitch from "@/business/components/common/head/ProjectSwitch";
   import SearchList from "@/business/components/common/head/SearchList";
-  import {checkoutTestManagerOrTestUser, downloadFile, getCurrentProjectID} from "@/common/js/utils";
+  import {downloadFile, getCurrentProjectID} from "@/common/js/utils";
   import EnvironmentImport from "@/business/components/settings/project/EnvironmentImport";
 
   export default {
@@ -150,8 +150,6 @@
       }
     },
     created() {
-      this.isTesterPermission = checkoutTestManagerOrTestUser();
-
     },
 
     activated() {

frontend/src/business/components/settings/workspace/WsEnvironmentList.vue

@@ -110,7 +110,7 @@
   import MsAsideContainer from "@/business/components/common/components/MsAsideContainer";
   import ProjectSwitch from "@/business/components/common/head/ProjectSwitch";
   import SearchList from "@/business/components/common/head/SearchList";
-  import {checkoutTestManagerOrTestUser, downloadFile} from "@/common/js/utils";
+  import {downloadFile} from "@/common/js/utils";
   import EnvironmentImport from "@/business/components/settings/project/EnvironmentImport";
 
   export default {
@@ -150,7 +150,6 @@
       }
     },
     created() {
-      this.isTesterPermission = checkoutTestManagerOrTestUser();
 
     },
 

frontend/src/business/components/track/case/TestCase.vue

@@ -104,7 +104,7 @@ import SelectMenu from "../common/SelectMenu";
 import MsContainer from "../../common/components/MsContainer";
 import MsAsideContainer from "../../common/components/MsAsideContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
-import {checkoutTestManagerOrTestUser, getUUID} from "../../../../common/js/utils";
+import {getUUID} from "../../../../common/js/utils";
 import TestCaseNodeTree from "../common/TestCaseNodeTree";
 
 import MsTabButton from "@/business/components/common/components/MsTabButton";
@@ -275,9 +275,6 @@ export default {
       let path = route.path;
       if (path.indexOf("/track/case/edit") >= 0 || path.indexOf("/track/case/create") >= 0) {
         this.testCaseReadOnly = false;
-        if (!checkoutTestManagerOrTestUser()) {
-          this.testCaseReadOnly = true;
-        }
         let caseId = this.$route.params.caseId;
         if (!this.projectId) {
           this.$warning(this.$t('commons.check_project_tip'));

frontend/src/business/components/track/case/components/TestCaseComment.vue

@@ -27,7 +27,7 @@
 
 <script>
 import ReviewCommentItem from "@/business/components/track/review/commom/ReviewCommentItem";
-import {checkoutTestManagerOrTestUser, getUUID} from "@/common/js/utils";
+import {getUUID} from "@/common/js/utils";
 
 export default {
   name: "TestCaseComment",
@@ -45,7 +45,7 @@ export default {
     }
   },
   created() {
-    this.isReadOnly = !checkoutTestManagerOrTestUser();
+
   },
   methods: {
     open() {

frontend/src/business/components/track/case/components/TestCaseEdit.vue

@@ -121,7 +121,6 @@
   import {TokenKey, WORKSPACE_ID} from '@/common/js/constants';
   import MsDialogFooter from '../../../common/components/MsDialogFooter'
   import {
-    checkoutTestManagerOrTestUser,
     getCurrentUser,
     getNodePath,
     handleCtrlSEvent,
@@ -281,9 +280,6 @@
       }
     },
     mounted() {
-      if (!checkoutTestManagerOrTestUser()) {
-        this.readOnly = true;
-      }
       this.getSelectOptions();
       if (this.type === 'edit' || this.type === 'copy') {
         this.open(this.currentTestCaseInfo)

frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue

@@ -92,7 +92,7 @@ import MsRichText from "@/business/components/track/case/components/MsRichText";
 import {TEST} from "@/business/components/api/definition/model/JsonData";
 import TestCaseAttachment from "@/business/components/track/case/components/TestCaseAttachment";
 import TestCaseIssueRelate from "@/business/components/track/case/components/TestCaseIssueRelate";
-import {checkoutTestManagerOrTestUser, enableModules} from "@/common/js/utils";
+import {enableModules} from "@/common/js/utils";
 import FormRichTextItem from "@/business/components/track/case/components/FormRichTextItem";
 
 export default {
@@ -117,9 +117,6 @@ export default {
   },
   computed: {
     isTesterPermission() {
-      if (!checkoutTestManagerOrTestUser()) {
-        return false;
-      }
       return true;
     }
   },

frontend/src/business/components/track/common/NodeTree.vue

@@ -86,7 +86,6 @@
 </template>
 
 <script>
-import {checkoutTestManagerOrTestUser} from "../../../../common/js/utils";
 
 export default {
   name: "MsNodeTree",
@@ -134,7 +133,7 @@ export default {
   },
   computed: {
     disabled() {
-      return this.type != 'edit' || !checkoutTestManagerOrTestUser();
+      return this.type !== 'edit';
     }
   },
   methods: {

frontend/src/business/components/track/plan/components/ScheduleMaintain.vue

@@ -94,7 +94,7 @@
 </template>
 
 <script>
-import {checkoutTestManagerOrTestUser, getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import Crontab from "@/business/components/common/cron/Crontab";
 import CrontabResult from "@/business/components/common/cron/CrontabResult";
 import {cronValidate} from "@/common/js/cron";
@@ -370,7 +370,7 @@ export default {
   },
   computed: {
     isTesterPermission() {
-      return checkoutTestManagerOrTestUser();
+      return true;
     }
   }
 };

frontend/src/business/components/track/plan/components/TestPlanList.vue

@@ -237,7 +237,6 @@ import MsTableOperatorButton from "../../../common/components/MsTableOperatorBut
 import MsTableOperator from "../../../common/components/MsTableOperator";
 import PlanStatusTableItem from "../../common/tableItems/plan/PlanStatusTableItem";
 import PlanStageTableItem from "../../common/tableItems/plan/PlanStageTableItem";
-import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 import TestReportTemplateList from "../view/comonents/TestReportTemplateList";
 import TestCaseReportView from "../view/comonents/report/TestCaseReportView";
 import MsDeleteConfirm from "../../../common/components/MsDeleteConfirm";
@@ -309,7 +308,7 @@ export default {
     if (!this.projectId) {
       this.projectId = this.$store.state.projectId;
     }
-    this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
+    this.isTestManagerOrTestUser = true;
     this.initTableData();
   },
   methods: {
@@ -339,10 +338,12 @@ export default {
             item.tags = JSON.parse(item.tags);
           }
           item.passRate = item.passRate + '%';
-          this.$get("user/info/" + item.creator, response => {
+          if (item.creator) {
-            let name = response.data.name;
+            this.$get("user/info/" + item.creator, response => {
-            item.createUser = name;
+              let name = response.data.name;
-          });
+              item.createUser = name;
+            });
+          }
         });
       });
       getLabel(this, TEST_PLAN_LIST);

frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue

@@ -264,7 +264,7 @@ import {
   TokenKey,
   WORKSPACE_ID
 } from "@/common/js/constants";
-import {checkoutTestManagerOrTestUser, hasRoles} from "@/common/js/utils";
+import {hasRoles} 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";
@@ -419,7 +419,7 @@ export default {
       this.$refs.testPlanTestCaseEdit.openTestCaseEdit(row);
     });
     this.refreshTableAndPlan();
-    this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
+    this.isTestManagerOrTestUser = true;
     this.getMaintainerOptions();
   },
   beforeDestroy() {
@@ -526,9 +526,6 @@ export default {
     },
     handleEdit(testCase, index) {
       this.isReadOnly = false;
-      if (!checkoutTestManagerOrTestUser()) {
-        this.isReadOnly = true;
-      }
       this.$refs.testPlanTestCaseEdit.openTestCaseEdit(testCase);
     },
     handleDelete(testCase) {

frontend/src/business/components/track/plan/view/comonents/load/LoadCaseReportView.vue

@@ -83,7 +83,7 @@
 
 <script>
 
-import {checkoutTestManagerOrTestUser, exportPdf} from "@/common/js/utils";
+import {exportPdf} from "@/common/js/utils";
 import html2canvas from 'html2canvas';
 import {Message} from "element-ui";
 import MsPerformanceReportExport from "@/business/components/performance/report/PerformanceReportExport";

frontend/src/business/components/track/plan/view/comonents/report/TestCaseReportView.vue

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-  import {checkoutTestManagerOrTestUser, exportPdf, jsonToMap, mapToJson} from "../../../../../../../common/js/utils";
+  import {exportPdf, jsonToMap, mapToJson} from "../../../../../../../common/js/utils";
   import BaseInfoComponent from "./TemplateComponent/BaseInfoComponent";
   import TestResultChartComponent from "./TemplateComponent/TestResultChartComponent";
   import TestResultComponent from "./TemplateComponent/TestResultComponent";
@@ -90,7 +90,7 @@
       }
     },
     mounted() {
-      this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
+      this.isTestManagerOrTestUser = true;
     },
     methods: {
       listenGoBack() {

frontend/src/business/components/track/plan/view/comonents/report/statistics/TestCaseStatisticsReportView.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script>
-  import {checkoutTestManagerOrTestUser, exportPdf, jsonToMap, mapToJson} from "../../../../../../../../common/js/utils";
+  import {exportPdf, jsonToMap, mapToJson} from "../../../../../../../../common/js/utils";
   import BaseInfoComponent from "../TemplateComponent/BaseInfoComponent";
   import TestResultChartComponent from "../TemplateComponent/TestResultChartComponent";
   import TestResultComponent from "../TemplateComponent/TestResultComponent";
@@ -80,7 +80,7 @@
       }
     },
     mounted() {
-      this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
+      this.isTestManagerOrTestUser = true;
       this.getReport();
     },
     watch: {

frontend/src/business/components/track/report/components/TestPlanReportList.vue

@@ -66,7 +66,6 @@ import MsTablePagination from '../../../../components/common/pagination/TablePag
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
 import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
 import MsTableOperator from "../../../common/components/MsTableOperator";
-import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 import {TEST_PLAN_REPORT_CONFIGS} from "../../../common/components/search/search-components";
 import TestPlanReportView from "@/business/components/track/report/components/TestPlanReportView";
 import ReportTriggerModeItem from "@/business/components/common/tableItem/ReportTriggerModeItem";
@@ -134,7 +133,7 @@ export default {
     if (!this.projectId) {
       this.projectId = this.$store.state.projectId;
     }
-    this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
+    this.isTestManagerOrTestUser = true;
     this.initTableData();
   },
   methods: {

frontend/src/business/components/track/report/components/TestPlanReportView.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script>
-  import {checkoutTestManagerOrTestUser, exportPdf, jsonToMap, mapToJson} from "@/common/js/utils";
+  import {exportPdf, jsonToMap, mapToJson} from "@/common/js/utils";
   import BaseInfoComponent
     from "@/business/components/track/plan/view/comonents/report/TemplateComponent/BaseInfoComponent";
   import TestResultChartComponent
@@ -93,7 +93,7 @@
       }
     },
     mounted() {
-      this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
+      this.isTestManagerOrTestUser = true;
     },
     watch: {
       reportComponents() {

frontend/src/business/components/track/review/commom/ReviewComment.vue

@@ -39,7 +39,6 @@
 
 <script>
 import ReviewCommentItem from "./ReviewCommentItem";
-import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 
 export default {
   name: "ReviewComment",
@@ -58,7 +57,7 @@ export default {
     };
   },
   created() {
-    this.isReadOnly = !checkoutTestManagerOrTestUser();
+    this.isReadOnly = false;
   },
   methods: {
     sendComment() {

frontend/src/business/components/track/review/components/TestCaseReviewList.vue

@@ -120,7 +120,7 @@ import MsDialogFooter from "../../../common/components/MsDialogFooter";
 import MsTableHeader from "../../../common/components/MsTableHeader";
 import MsCreateBox from "../../../settings/CreateBox";
 import MsTablePagination from "../../../common/pagination/TablePagination";
-import {checkoutTestManagerOrTestUser, getCurrentWorkspaceId} from "@/common/js/utils";
+import {getCurrentWorkspaceId} from "@/common/js/utils";
 import {_filter, _sort, deepClone, getLabel} from "@/common/js/tableUtils";
 import PlanStatusTableItem from "../../common/tableItems/plan/PlanStatusTableItem";
 import {Test_Case_Review} from "@/business/components/common/model/JsonData";
@@ -172,7 +172,7 @@ export default {
     }
   },
   created() {
-    this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
+    this.isTestManagerOrTestUser = true;
     this.initTableData();
   },
   computed: {

frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue

@@ -201,7 +201,7 @@ import MsTableButton from "../../../../common/components/MsTableButton";
 import ShowMoreBtn from "../../../case/components/ShowMoreBtn";
 import BatchEdit from "../../../case/components/BatchEdit";
 import MsTablePagination from '../../../../common/pagination/TablePagination';
-import {checkoutTestManagerOrTestUser, hasRoles} from "../../../../../../common/js/utils";
+import {hasRoles} from "../../../../../../common/js/utils";
 import {TEST_CASE_CONFIGS} from "../../../../common/components/search/search-components";
 import {ROLE_TEST_MANAGER, ROLE_TEST_USER, TEST_CASE_REVIEW_CASE_LIST} from "../../../../../../common/js/constants";
 import TestReviewTestCaseEdit from "./TestReviewTestCaseEdit";
@@ -311,7 +311,7 @@ export default {
   },
   mounted() {
     this.refreshTableAndReview();
-    this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
+    this.isTestManagerOrTestUser = true;
   },
   methods: {
     customHeader() {
@@ -402,9 +402,6 @@ export default {
     },
     handleEdit(testCase, index) {
       this.isReadOnly = false;
-      if (!checkoutTestManagerOrTestUser()) {
-        this.isReadOnly = true;
-      }
       this.$refs.testReviewTestCaseEdit.openTestCaseEdit(testCase);
     },
     handleDelete(testCase) {

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 5b479f6e7a0314e266ba75647f6f51302df0a7dd
+Subproject commit 236818facb9d5c17d46bfced77d31a834ba2dc2b

frontend/src/business/main.js

@@ -58,8 +58,6 @@ Vue.directive('roles', roles);
 
 Vue.directive('xpack', xpack);
 
-Vue.directive('tester', tester);
-
 Vue.directive('modules', modules);
 
 //支持左右拖拽

frontend/src/business/permission.js

@@ -1,7 +1,6 @@
 import router from './components/common/router/router';
 import {TokenKey} from '@/common/js/constants';
 import {
-  checkoutTestManagerOrTestUser,
   enableModules,
   hasLicense,
   hasPermissions,
@@ -13,14 +12,6 @@ const whiteList = ['/login']; // no redirect whitelist
 
 NProgress.configure({showSpinner: false}); // NProgress Configuration
 
-function checkTestManagerOrTestUser(el, binding) {
-  let v = checkoutTestManagerOrTestUser();
-
-  if (!v) {
-    el.parentNode && el.parentNode.removeChild(el);
-  }
-}
-
 function checkLicense(el, binding, type) {
   let v = hasLicense();
 
@@ -73,12 +64,6 @@ export const xpack = {
   }
 };
 
-export const tester = {
-  inserted(el, binding) {
-    checkTestManagerOrTestUser(el, binding);
-  }
-};
-
 export const modules = {
   inserted(el, binding) {
     checkModule(el, binding);