test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复操作列按钮权限

This commit is contained in:
Captain.B 2021-05-27 12:23:09 +08:00 committed by BugKing
parent c738139e49
commit 46e7a47d2e
36 changed files with 318 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/business/components/api/automation/report/ApiReportList.vue
View File

@ -58,11 +58,13 @@
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('commons.operating')"> <el-table-column width="150" :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button :tip="$t('api_report.detail')" icon="el-icon-s-data" <div>
@exec="handleView(scope.row)" type="primary"/> <ms-table-operator-button :tip="$t('api_report.detail')" icon="el-icon-s-data"
<ms-table-operator-button :tip="$t('api_report.delete')" @exec="handleView(scope.row)" type="primary"/>
v-permission="['PROJECT_API_REPORT:READ+DELETE']" <ms-table-operator-button :tip="$t('api_report.delete')"
icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger"/> v-permission="['PROJECT_API_REPORT:READ+DELETE']"
icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

30
frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
View File

@ -102,19 +102,23 @@
<header-label-operate @exec="customHeader"/> <header-label-operate @exec="customHeader"/>
</template> </template>
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button class="run-button" <div>
:tip="$t('api_test.automation.execute')" <ms-table-operator-button class="run-button"
icon="el-icon-video-play" :tip="$t('api_test.automation.execute')"
v-permission="['PROJECT_API_DEFINITION:READ+RUN']" icon="el-icon-video-play"
@exec="runTestCase(scope.row)"/> v-permission="['PROJECT_API_DEFINITION:READ+RUN']"
<ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="handleTestCase(scope.row)" @exec="runTestCase(scope.row)"/>
v-permission="['PROJECT_API_DEFINITION:READ+EDIT_CASE']" <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="handleTestCase(scope.row)"
/> v-permission="['PROJECT_API_DEFINITION:READ+EDIT_CASE']"
<ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" @exec="handleDelete(scope.row)" />
v-permission="['PROJECT_API_DEFINITION:READ+DELETE_CASE']" <ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete"
type="danger"/> @exec="handleDelete(scope.row)"
<ms-api-case-table-extend-btns @showCaseRef="showCaseRef" @showEnvironment="showEnvironment" v-permission="['PROJECT_API_DEFINITION:READ+DELETE_CASE']"
@createPerformance="createPerformance" :row="scope.row"/> type="danger"/>
<ms-api-case-table-extend-btns @showCaseRef="showCaseRef"
@showEnvironment="showEnvironment"
@createPerformance="createPerformance" :row="scope.row"/>
</div>
</template> </template>
</el-table-column> </el-table-column>

13
frontend/src/business/components/api/definition/components/mock/MockConfig.vue
View File

@ -38,11 +38,14 @@
</el-table-column> </el-table-column>
<el-table-column fixed="right" min-width="100" align="center" :label="$t('commons.operating')"> <el-table-column fixed="right" min-width="100" align="center" :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button :tip="$t('commons.copy')" icon="el-icon-copy-document" <div>
@exec="copyExpect(scope.row)" <ms-table-operator-button :tip="$t('commons.copy')" icon="el-icon-copy-document"
/> @exec="copyExpect(scope.row)"
<ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-delete" @exec="removeExpect(scope.row)" />
/> <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-delete"
@exec="removeExpect(scope.row)"
/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

9
frontend/src/business/components/api/definition/components/request/database/DatabaseConfigList.vue
View File

@ -15,9 +15,12 @@
<el-table-column :label="$t('commons.operating')" min-width="100"> <el-table-column :label="$t('commons.operating')" min-width="100">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button :tip="$t('commons.copy')" icon="el-icon-document-copy" type="success" <div>
@exec="handleCopy(scope.$index, scope.row)"/> <ms-table-operator-button :tip="$t('commons.copy')" icon="el-icon-document-copy" type="success"
<ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" type="danger" @exec="handleDelete(scope.$index)"/> @exec="handleCopy(scope.$index, scope.row)"/>
<ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" type="danger"
@exec="handleDelete(scope.$index)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>

10
frontend/src/business/components/api/report/ApiReportList.vue
View File

@ -43,10 +43,12 @@
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('commons.operating')"> <el-table-column width="150" :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button :tip="$t('api_report.detail')" icon="el-icon-s-data" <div>
@exec="handleView(scope.row)" type="primary"/> <ms-table-operator-button :tip="$t('api_report.detail')" icon="el-icon-s-data"
<ms-table-operator-button :tip="$t('api_report.delete')" @exec="handleView(scope.row)" type="primary"/>
icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger"/> <ms-table-operator-button :tip="$t('api_report.delete')"
icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

4
frontend/src/business/components/api/test/ApiTestList.vue
View File

@ -45,7 +45,9 @@
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('commons.operating')"> <el-table-column width="150" :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operators :buttons="buttons" :row="scope.row"/> <div>
<ms-table-operators :buttons="buttons" :row="scope.row"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

10
frontend/src/business/components/api/test/components/environment/EnvironmentHttpConfig.vue
View File

@ -69,10 +69,12 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')" width="100px"> <el-table-column :label="$t('commons.operating')" width="100px">
<template v-slot:default="{row}"> <template v-slot:default="{row}">
<ms-table-operator-button :tip="$t('api_test.automation.copy')" <div>
icon="el-icon-document-copy" @exec="copy(row)"/> <ms-table-operator-button :tip="$t('api_test.automation.copy')"
<ms-table-operator-button :tip="$t('api_test.automation.remove')" icon="el-icon-document-copy" @exec="copy(row)"/>
icon="el-icon-delete" @exec="remove(row)" type="danger"/> <ms-table-operator-button :tip="$t('api_test.automation.remove')"
icon="el-icon-delete" @exec="remove(row)" type="danger"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

10
frontend/src/business/components/api/test/components/environment/EnvironmentSSLConfig.vue
View File

@ -23,10 +23,12 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')" width="100px"> <el-table-column :label="$t('commons.operating')" width="100px">
<template v-slot:default="{row}"> <template v-slot:default="{row}">
<ms-table-operator-button :tip="$t('commons.update')" icon="el-icon-edit" <div>
type="primary" @exec="edit(row)"/> <ms-table-operator-button :tip="$t('commons.update')" icon="el-icon-edit"
<ms-table-operator-button :tip="$t('api_test.automation.remove')" type="primary" @exec="edit(row)"/>
icon="el-icon-delete" @exec="remove(row)" type="danger"/> <ms-table-operator-button :tip="$t('api_test.automation.remove')"
icon="el-icon-delete" @exec="remove(row)" type="danger"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

5
frontend/src/business/components/api/test/components/jar/JarConfigList.vue
View File

@ -19,7 +19,10 @@
<el-table-column :label="$t('commons.operating')" min-width="100"> <el-table-column :label="$t('commons.operating')" min-width="100">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" type="danger" @exec="handleDelete(scope.row.id)"/> <div>
<ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" type="danger"
@exec="handleDelete(scope.row.id)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>

9
frontend/src/business/components/api/test/components/request/database/DatabaseConfigList.vue
View File

@ -15,9 +15,12 @@
<el-table-column :label="$t('commons.operating')" min-width="100"> <el-table-column :label="$t('commons.operating')" min-width="100">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button :tip="$t('commons.copy')" icon="el-icon-document-copy" type="success" <div>
@exec="handleCopy(scope.$index, scope.row)"/> <ms-table-operator-button :tip="$t('commons.copy')" icon="el-icon-document-copy" type="success"
<ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" type="danger" @exec="handleDelete(scope.$index)"/> @exec="handleCopy(scope.$index, scope.row)"/>
<ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" type="danger"
@exec="handleDelete(scope.$index)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>

4
frontend/src/business/components/common/components/table/MsTable.vue
View File

@ -41,7 +41,9 @@
<header-label-operate @exec="openCustomHeader"/> <header-label-operate @exec="openCustomHeader"/>
</template> </template>
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operators :buttons="operators" :row="scope.row" :index="scope.$index"/> <div>
<ms-table-operators :buttons="operators" :row="scope.row" :index="scope.$index"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

4
frontend/src/business/components/performance/test/PerformanceTestList.vue
View File

@ -78,7 +78,9 @@
width="150" width="150"
:label="$t('commons.operating')"> :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operators :buttons="buttons" :row="scope.row"/> <div>
<ms-table-operators :buttons="buttons" :row="scope.row"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

9
frontend/src/business/components/settings/organization/OrganizationMember.vue
View File

@ -34,9 +34,12 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['ORGANIZATION_USER:READ+EDIT']" <div>
:delete-permission="['ORGANIZATION_USER:READ+DELETE']" <ms-table-operator :edit-permission="['ORGANIZATION_USER:READ+EDIT']"
:tip2="$t('commons.remove')" @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/> :delete-permission="['ORGANIZATION_USER:READ+DELETE']"
:tip2="$t('commons.remove')" @editClick="edit(scope.row)"
@deleteClick="del(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

13
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
View File

@ -19,9 +19,11 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['ORGANIZATION_WORKSPACE:READ+EDIT']" <div>
:delete-permission="['ORGANIZATION_WORKSPACE:READ+DELETE']" <ms-table-operator :edit-permission="['ORGANIZATION_WORKSPACE:READ+EDIT']"
@editClick="edit(scope.row)" @deleteClick="handleDelete(scope.row)"/> :delete-permission="['ORGANIZATION_WORKSPACE:READ+DELETE']"
@editClick="edit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -77,7 +79,10 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :tip2="$t('commons.remove')" @editClick="editMember(scope.row)" @deleteClick="delMember(scope.row)"/> <div>
<ms-table-operator :tip2="$t('commons.remove')" @editClick="editMember(scope.row)"
@deleteClick="delMember(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

6
frontend/src/business/components/settings/personal/ApiKeys.vue
View File

@ -51,8 +51,10 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" <div>
type="danger" @exec="deleteApiKey(scope.row)"/> <ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete"
type="danger" @exec="deleteApiKey(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

10
frontend/src/business/components/settings/personal/PersonSetting.vue
View File

@ -22,10 +22,12 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button :tip="$t('member.edit_information')" icon="el-icon-edit" <div>
type="primary" @exec="edit(scope.row)"/> <ms-table-operator-button :tip="$t('member.edit_information')" icon="el-icon-edit"
<ms-table-operator-button :tip="$t('member.edit_password')" icon="el-icon-s-tools" v-if="isLocalUser" type="primary" @exec="edit(scope.row)"/>
type="success" @exec="editPassword(scope.row)"/> <ms-table-operator-button :tip="$t('member.edit_password')" icon="el-icon-s-tools" v-if="isLocalUser"
type="success" @exec="editPassword(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

19
frontend/src/business/components/settings/project/EnvironmentList.vue
View File

@ -35,14 +35,17 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['PROJECT_ENVIRONMENT:READ+EDIT']" <div>
:delete-permission="['PROJECT_ENVIRONMENT:READ+DELETE']" <ms-table-operator :edit-permission="['PROJECT_ENVIRONMENT:READ+EDIT']"
@editClick="editEnv(scope.row)" @deleteClick="deleteEnv(scope.row)"> :delete-permission="['PROJECT_ENVIRONMENT:READ+DELETE']"
<template v-slot:middle> @editClick="editEnv(scope.row)" @deleteClick="deleteEnv(scope.row)">
<ms-table-operator-button v-permission="['PROJECT_ENVIRONMENT:READ+COPY']" :tip="$t('commons.copy')" @exec="copyEnv(scope.row)" <template v-slot:middle>
icon="el-icon-document-copy" type="info"/> <ms-table-operator-button v-permission="['PROJECT_ENVIRONMENT:READ+COPY']" :tip="$t('commons.copy')"
</template> @exec="copyEnv(scope.row)"
</ms-table-operator> icon="el-icon-document-copy" type="info"/>
</template>
</ms-table-operator>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

9
frontend/src/business/components/settings/project/Member.vue
View File

@ -20,9 +20,12 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['PROJECT_USER:READ+EDIT']" <div>
:delete-permission="['PROJECT_USER:READ+DELETE']" <ms-table-operator :edit-permission="['PROJECT_USER:READ+EDIT']"
:tip2="$t('commons.remove')" @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/> :delete-permission="['PROJECT_USER:READ+DELETE']"
:tip2="$t('commons.remove')" @editClick="edit(scope.row)"
@deleteClick="del(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

38
frontend/src/business/components/settings/project/ProjectList.vue
View File

@ -53,24 +53,26 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')" width="180"> <el-table-column :label="$t('commons.operating')" width="180">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator <div>
:edit-permission="['PROJECT_MANAGER:READ+EDIT']" <ms-table-operator
:delete-permission="['PROJECT_MANAGER:READ+DELETE']" :edit-permission="['PROJECT_MANAGER:READ+EDIT']"
@editClick="edit(scope.row)" :delete-permission="['PROJECT_MANAGER:READ+DELETE']"
:show-delete="false" @editClick="edit(scope.row)"
@deleteClick="handleDelete(scope.row)"> :show-delete="false"
<template v-slot:behind> @deleteClick="handleDelete(scope.row)">
<ms-table-operator-button <template v-slot:behind>
v-permission="['PROJECT_MANAGER:READ+EDIT']" <ms-table-operator-button
:tip="$t('api_test.environment.environment_config')" icon="el-icon-setting" v-permission="['PROJECT_MANAGER:READ+EDIT']"
type="info" @exec="openEnvironmentConfig(scope.row)"/> :tip="$t('api_test.environment.environment_config')" icon="el-icon-setting"
<ms-table-operator-button type="info" @exec="openEnvironmentConfig(scope.row)"/>
v-permission="['PROJECT_MANAGER:READ+EDIT']" <ms-table-operator-button
:tip="$t('load_test.other_resource')" v-permission="['PROJECT_MANAGER:READ+EDIT']"
icon="el-icon-files" :tip="$t('load_test.other_resource')"
type="success" @exec="openFiles(scope.row)"/> icon="el-icon-files"
</template> type="success" @exec="openFiles(scope.row)"/>
</ms-table-operator> </template>
</ms-table-operator>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

14
frontend/src/business/components/settings/system/Organization.vue
View File

@ -21,9 +21,11 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['SYSTEM_ORGANIZATION:READ+EDIT']" <div>
:delete-permission="['SYSTEM_ORGANIZATION:READ+DELETE']" <ms-table-operator :edit-permission="['SYSTEM_ORGANIZATION:READ+EDIT']"
@editClick="edit(scope.row)" @deleteClick="handleDelete(scope.row)"/> :delete-permission="['SYSTEM_ORGANIZATION:READ+DELETE']"
@editClick="edit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -49,8 +51,10 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :tip2="$t('commons.remove')" @editClick="editMember(scope.row)" <div>
@deleteClick="delMember(scope.row)"/> <ms-table-operator :tip2="$t('commons.remove')" @editClick="editMember(scope.row)"
@deleteClick="delMember(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

13
frontend/src/business/components/settings/system/SystemWorkspace.vue
View File

@ -21,8 +21,11 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['SYSTEM_WORKSPACE:READ+EDIT']" :delete-permission="['SYSTEM_WORKSPACE:READ+DELETE']" <div>
@editClick="edit(scope.row)" @deleteClick="handleDelete(scope.row)"/> <ms-table-operator :edit-permission="['SYSTEM_WORKSPACE:READ+EDIT']"
:delete-permission="['SYSTEM_WORKSPACE:READ+DELETE']"
@editClick="edit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -107,8 +110,10 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :tip2="$t('commons.remove')" @editClick="editMember(scope.row)" <div>
@deleteClick="delMember(scope.row)"/> <ms-table-operator :tip2="$t('commons.remove')" @editClick="editMember(scope.row)"
@deleteClick="delMember(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

8
frontend/src/business/components/settings/system/TestResourcePool.vue
View File

@ -39,9 +39,11 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['SYSTEM_TEST_POOL:READ+EDIT']" <div>
:delete-permission="['SYSTEM_TEST_POOL:READ+DELETE']" <ms-table-operator :edit-permission="['SYSTEM_TEST_POOL:READ+EDIT']"
@editClick="edit(scope.row)" @deleteClick="del(scope.row)"/> :delete-permission="['SYSTEM_TEST_POOL:READ+DELETE']"
@editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

19
frontend/src/business/components/settings/system/User.vue
View File

@ -53,13 +53,18 @@
<el-table-column prop="source" :label="$t('user.source')"/> <el-table-column prop="source" :label="$t('user.source')"/>
<el-table-column :label="$t('commons.operating')" min-width="120px"> <el-table-column :label="$t('commons.operating')" min-width="120px">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['SYSTEM_USER:READ+EDIT']" :delete-permission="['SYSTEM_USER:READ+DELETE']" <div>
@editClick="edit(scope.row)" @deleteClick="del(scope.row)">
<template v-slot:behind> <ms-table-operator :edit-permission="['SYSTEM_USER:READ+EDIT']"
<ms-table-operator-button :tip="$t('member.edit_password')" icon="el-icon-s-tools" :delete-permission="['SYSTEM_USER:READ+DELETE']"
v-permission="['SYSTEM_USER:READ+EDIT_PASSWORD']" type="success" @exec="editPassword(scope.row)" v-if="scope.row.isLocalUser"/> @editClick="edit(scope.row)" @deleteClick="del(scope.row)">
</template> <template v-slot:behind>
</ms-table-operator> <ms-table-operator-button :tip="$t('member.edit_password')" icon="el-icon-s-tools"
v-permission="['SYSTEM_USER:READ+EDIT_PASSWORD']" type="success"
@exec="editPassword(scope.row)" v-if="scope.row.isLocalUser"/>
</template>
</ms-table-operator>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

20
frontend/src/business/components/settings/system/group/UserGroup.vue
View File

@ -29,14 +29,18 @@
<el-table-column prop="description" label="描述"/> <el-table-column prop="description" label="描述"/>
<el-table-column :label="$t('commons.operating')" min-width="120"> <el-table-column :label="$t('commons.operating')" min-width="120">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['SYSTEM_GROUP:READ+EDIT', 'ORGANIZATION_GROUP:READ+EDIT']" <div>
:delete-permission="['SYSTEM_GROUP:READ+DELETE', 'ORGANIZATION_GROUP:READ+DELETE']" <ms-table-operator :edit-permission="['SYSTEM_GROUP:READ+EDIT', 'ORGANIZATION_GROUP:READ+EDIT']"
@editClick="edit(scope.row)" @deleteClick="del(scope.row)"> :delete-permission="['SYSTEM_GROUP:READ+DELETE', 'ORGANIZATION_GROUP:READ+DELETE']"
<template v-slot:middle> @editClick="edit(scope.row)" @deleteClick="del(scope.row)">
<!-- <ms-table-operator-button tip="复制" icon="el-icon-document-copy" @exec="copy(scope.row)"/>--> <template v-slot:middle>
<ms-table-operator-button v-permission="['SYSTEM_GROUP:READ+SETTING_PERMISSION', 'ORGANIZATION_GROUP:READ+SETTING_PERMISSION']" tip="设置权限" icon="el-icon-s-tools" @exec="setPermission(scope.row)"/> <!-- <ms-table-operator-button tip="复制" icon="el-icon-document-copy" @exec="copy(scope.row)"/>-->
</template> <ms-table-operator-button
</ms-table-operator> v-permission="['SYSTEM_GROUP:READ+SETTING_PERMISSION', 'ORGANIZATION_GROUP:READ+SETTING_PERMISSION']"
tip="设置权限" icon="el-icon-s-tools" @exec="setPermission(scope.row)"/>
</template>
</ms-table-operator>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

43
frontend/src/business/components/settings/workspace/MsProject.vue
View File

@ -60,24 +60,26 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')" width="180"> <el-table-column :label="$t('commons.operating')" width="180">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator <div>
:edit-permission="['WORKSPACE_PROJECT_MANAGER:READ+EDIT']" <ms-table-operator
:delete-permission="['WORKSPACE_PROJECT_MANAGER:READ+DELETE']" :edit-permission="['WORKSPACE_PROJECT_MANAGER:READ+EDIT']"
:show-delete="projectId !== scope.row.id" :delete-permission="['WORKSPACE_PROJECT_MANAGER:READ+DELETE']"
@editClick="edit(scope.row)" :show-delete="projectId !== scope.row.id"
@deleteClick="handleDelete(scope.row)"> @editClick="edit(scope.row)"
<template v-slot:behind> @deleteClick="handleDelete(scope.row)">
<ms-table-operator-button <template v-slot:behind>
v-permission="['WORKSPACE_PROJECT_MANAGER:READ+EDIT']" <ms-table-operator-button
:tip="$t('api_test.environment.environment_config')" icon="el-icon-setting" v-permission="['WORKSPACE_PROJECT_MANAGER:READ+EDIT']"
type="info" @exec="openEnvironmentConfig(scope.row)"/> :tip="$t('api_test.environment.environment_config')" icon="el-icon-setting"
<ms-table-operator-button type="info" @exec="openEnvironmentConfig(scope.row)"/>
v-permission="['WORKSPACE_PROJECT_MANAGER:READ+EDIT']" <ms-table-operator-button
:tip="$t('load_test.other_resource')" v-permission="['WORKSPACE_PROJECT_MANAGER:READ+EDIT']"
icon="el-icon-files" :tip="$t('load_test.other_resource')"
type="success" @exec="openFiles(scope.row)"/> icon="el-icon-files"
</template> type="success" @exec="openFiles(scope.row)"/>
</ms-table-operator> </template>
</ms-table-operator>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -149,7 +151,10 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :tip2="$t('commons.remove')" @editClick="editMember(scope.row)" @deleteClick="delMember(scope.row)"/> <div>
<ms-table-operator :tip2="$t('commons.remove')" @editClick="editMember(scope.row)"
@deleteClick="delMember(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

9
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
View File

@ -35,9 +35,12 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['WORKSPACE_USER:READ+EDIT']" <div>
:delete-permission="['WORKSPACE_USER:READ+DELETE']" <ms-table-operator :edit-permission="['WORKSPACE_USER:READ+EDIT']"
:tip2="$t('commons.remove')" @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/> :delete-permission="['WORKSPACE_USER:READ+DELETE']"
:tip2="$t('commons.remove')" @editClick="edit(scope.row)"
@deleteClick="del(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

19
frontend/src/business/components/settings/workspace/WsEnvironmentList.vue
View File

@ -35,14 +35,17 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.operating')"> <el-table-column :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT']" <div>
:delete-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE']" <ms-table-operator :edit-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+EDIT']"
@editClick="editEnv(scope.row)" @deleteClick="deleteEnv(scope.row)"> :delete-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+DELETE']"
<template v-slot:middle> @editClick="editEnv(scope.row)" @deleteClick="deleteEnv(scope.row)">
<ms-table-operator-button v-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY']" :tip="$t('commons.copy')" @exec="copyEnv(scope.row)" <template v-slot:middle>
icon="el-icon-document-copy" type="info"/> <ms-table-operator-button v-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+COPY']"
</template> :tip="$t('commons.copy')" @exec="copyEnv(scope.row)"
</ms-table-operator> icon="el-icon-document-copy" type="info"/>
</template>
</ms-table-operator>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

55
frontend/src/business/components/track/plan/components/TestPlanList.vue
View File

@ -184,32 +184,35 @@
<header-label-operate @exec="customHeader"/> <header-label-operate @exec="customHeader"/>
</template> </template>
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['PROJECT_TRACK_PLAN:READ+EDIT']" <div>
:delete-permission="['PROJECT_TRACK_PLAN:READ+DELETE']" <ms-table-operator :edit-permission="['PROJECT_TRACK_PLAN:READ+EDIT']"
@editClick="handleEdit(scope.row)" :delete-permission="['PROJECT_TRACK_PLAN:READ+DELETE']"
@deleteClick="handleDelete(scope.row)"> @editClick="handleEdit(scope.row)"
<template v-slot:middle> @deleteClick="handleDelete(scope.row)">
<ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+EDIT']" <template v-slot:middle>
style="background-color: #85888E;border-color: #85888E" <ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+EDIT']"
v-if="!scope.row.reportId" style="background-color: #85888E;border-color: #85888E"
:tip="$t('test_track.plan_view.create_report')" icon="el-icon-s-data" v-if="!scope.row.reportId"
@exec="openTestReportTemplate(scope.row)"/> :tip="$t('test_track.plan_view.create_report')" icon="el-icon-s-data"
<ms-table-operator-button v-if="scope.row.reportId" @exec="openTestReportTemplate(scope.row)"/>
v-permission="['PROJECT_TRACK_PLAN:READ+EDIT']" <ms-table-operator-button v-if="scope.row.reportId"
:tip="$t('test_track.plan_view.view_report')" icon="el-icon-s-data" v-permission="['PROJECT_TRACK_PLAN:READ+EDIT']"
@exec="openReport(scope.row.id, scope.row.reportId)"/> :tip="$t('test_track.plan_view.view_report')" icon="el-icon-s-data"
</template> @exec="openReport(scope.row.id, scope.row.reportId)"/>
</ms-table-operator> </template>
<ms-table-operator-button style="margin-left: 10px;color:#85888E;border-color: #85888E; border-width: thin;" </ms-table-operator>
v-permission="['PROJECT_TRACK_PLAN:READ+SCHEDULE']" <ms-table-operator-button style="margin-left: 10px;color:#85888E;border-color: #85888E; border-width: thin;"
v-if="!scope.row.scheduleOpen" type="text" v-permission="['PROJECT_TRACK_PLAN:READ+SCHEDULE']"
:tip="$t('commons.trigger_mode.schedule')" icon="el-icon-time" v-if="!scope.row.scheduleOpen" type="text"
@exec="scheduleTask(scope.row)"/> :tip="$t('commons.trigger_mode.schedule')" icon="el-icon-time"
<ms-table-operator-button style="margin-left: 10px;color:#6C317C; border-color: #6C317C; border-width: thin;" @exec="scheduleTask(scope.row)"/>
v-permission="['PROJECT_TRACK_PLAN:READ+SCHEDULE']" <ms-table-operator-button
v-if="scope.row.scheduleOpen" type="text" style="margin-left: 10px;color:#6C317C; border-color: #6C317C; border-width: thin;"
:tip="$t('commons.trigger_mode.schedule')" icon="el-icon-time" v-permission="['PROJECT_TRACK_PLAN:READ+SCHEDULE']"
@exec="scheduleTask(scope.row)"/> v-if="scope.row.scheduleOpen" type="text"
:tip="$t('commons.trigger_mode.schedule')" icon="el-icon-time"
@exec="scheduleTask(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

17
frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
View File

@ -120,13 +120,16 @@
<header-label-operate @exec="customHeader"/> <header-label-operate @exec="customHeader"/>
</template> </template>
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button class="run-button" v-permission="['PROJECT_API_DEFINITION:READ+RUN']" <div>
:tip="$t('api_test.run')"
icon="el-icon-video-play" <ms-table-operator-button class="run-button" v-permission="['PROJECT_API_DEFINITION:READ+RUN']"
@exec="singleRun(scope.row)"/> :tip="$t('api_test.run')"
<ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+RELEVANCE_OR_CANCEL']" icon="el-icon-video-play"
:tip="$t('test_track.plan_view.cancel_relevance')" @exec="singleRun(scope.row)"/>
icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/> <ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+RELEVANCE_OR_CANCEL']"
:tip="$t('test_track.plan_view.cancel_relevance')"
icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>

18
frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
View File

@ -86,14 +86,16 @@
<header-label-operate @exec="customHeader"/> <header-label-operate @exec="customHeader"/>
</template> </template>
<template v-slot:default="{row}"> <template v-slot:default="{row}">
<ms-table-operator-button class="run-button" <div>
v-permission="['PROJECT_API_SCENARIO:READ+RUN']" <ms-table-operator-button class="run-button"
:tip="$t('api_test.run')" v-permission="['PROJECT_API_SCENARIO:READ+RUN']"
icon="el-icon-video-play" :tip="$t('api_test.run')"
@exec="execute(row)"/> icon="el-icon-video-play"
<ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+RELEVANCE_OR_CANCEL']" @exec="execute(row)"/>
:tip="$t('test_track.plan_view.cancel_relevance')" <ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+RELEVANCE_OR_CANCEL']"
icon="el-icon-unlock" type="danger" @exec="remove(row)"/> :tip="$t('test_track.plan_view.cancel_relevance')"
icon="el-icon-unlock" type="danger" @exec="remove(row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

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

@ -220,12 +220,14 @@
<header-label-operate @exec="customHeader"/> <header-label-operate @exec="customHeader"/>
</template> </template>
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button v-permission="['PROJECT_TRACK_CASE:READ+EDIT']" :tip="$t('commons.edit')" <div>
icon="el-icon-edit" <ms-table-operator-button v-permission="['PROJECT_TRACK_CASE:READ+EDIT']" :tip="$t('commons.edit')"
@exec="handleEdit(scope.row)"/> icon="el-icon-edit"
<ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+RELEVANCE_OR_CANCEL']" @exec="handleEdit(scope.row)"/>
:tip="$t('test_track.plan_view.cancel_relevance')" <ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+RELEVANCE_OR_CANCEL']"
icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/> :tip="$t('test_track.plan_view.cancel_relevance')"
icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

19
frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
View File

@ -117,14 +117,17 @@
<header-label-operate @exec="customHeader"/> <header-label-operate @exec="customHeader"/>
</template> </template>
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button class="run-button" <div>
v-permission="['PROJECT_PERFORMANCE_TEST:READ+RUN']"
:tip="$t('api_test.run')" <ms-table-operator-button class="run-button"
icon="el-icon-video-play" v-permission="['PROJECT_PERFORMANCE_TEST:READ+RUN']"
@exec="run(scope.row)"/> :tip="$t('api_test.run')"
<ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+RELEVANCE_OR_CANCEL']" icon="el-icon-video-play"
:tip="$t('test_track.plan_view.cancel_relevance')" @exec="run(scope.row)"/>
icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/> <ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+RELEVANCE_OR_CANCEL']"
:tip="$t('test_track.plan_view.cancel_relevance')"
icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

11
frontend/src/business/components/track/report/components/TestPlanReportList.vue
View File

@ -54,10 +54,13 @@
</el-table-column> </el-table-column>
<el-table-column min-width="150" :label="$t('commons.operating')"> <el-table-column min-width="150" :label="$t('commons.operating')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button :tip="$t('test_track.plan_view.view_report')" icon="el-icon-document" <div>
@exec="openReport(scope.row.id)"/> <ms-table-operator-button :tip="$t('test_track.plan_view.view_report')" icon="el-icon-document"
<ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+REPORT_DELETE']" type="danger" :tip="$t('commons.delete')" icon="el-icon-delete" @exec="openReport(scope.row.id)"/>
@exec="handleDelete(scope.row)"/> <ms-table-operator-button v-permission="['PROJECT_TRACK_PLAN:READ+REPORT_DELETE']" type="danger"
:tip="$t('commons.delete')" icon="el-icon-delete"
@exec="handleDelete(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

14
frontend/src/business/components/track/review/components/TestCaseReviewList.vue
View File

@ -95,11 +95,15 @@
<header-label-operate @exec="customHeader"/> <header-label-operate @exec="customHeader"/>
</template> </template>
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator :edit-permission="['PROJECT_TRACK_REVIEW:READ+EDIT']" <div>
:delete-permission="['PROJECT_TRACK_REVIEW:READ+DELETE']"
@editClick="handleEdit(scope.row)" <ms-table-operator :edit-permission="['PROJECT_TRACK_REVIEW:READ+EDIT']"
@deleteClick="handleDelete(scope.row)"> :delete-permission="['PROJECT_TRACK_REVIEW:READ+DELETE']"
</ms-table-operator> @editClick="handleEdit(scope.row)"
@deleteClick="handleDelete(scope.row)">
</ms-table-operator>
</div>
</template> </template>
</el-table-column> </el-table-column>
<header-custom ref="headerCustom" :initTableData="initTableData" :optionalFields=headerItems <header-custom ref="headerCustom" :initTableData="initTableData" :optionalFields=headerItems

14
frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
View File

@ -156,12 +156,14 @@
<header-label-operate @exec="customHeader"/> <header-label-operate @exec="customHeader"/>
</template> </template>
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator-button v-permission="['PROJECT_TRACK_CASE:READ+EDIT']" :tip="$t('commons.edit')" <div>
icon="el-icon-edit" <ms-table-operator-button v-permission="['PROJECT_TRACK_CASE:READ+EDIT']" :tip="$t('commons.edit')"
@exec="handleEdit(scope.row)"/> icon="el-icon-edit"
<ms-table-operator-button v-permission="['PROJECT_TRACK_REVIEW:READ+RELEVANCE_OR_CANCEL']" @exec="handleEdit(scope.row)"/>
:tip="$t('test_track.plan_view.cancel_relevance')" <ms-table-operator-button v-permission="['PROJECT_TRACK_REVIEW:READ+RELEVANCE_OR_CANCEL']"
icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/> :tip="$t('test_track.plan_view.cancel_relevance')"
icon="el-icon-unlock" type="danger" @exec="handleDelete(scope.row)"/>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 0af67efb336b3f5f6718c7b2684de4d4985c0aee Subproject commit c85bda6f2fa74e0e696e9f9170742834a7519319