Skip to content

Commit 3d2a5d3

Browse files
authored
Merge pull request #545 from tapdata/feat/TAP-10709-role
Feat/tap 10709 role
2 parents bfb4564 + e900fb3 commit 3d2a5d3

File tree

17 files changed

+1324
-1003
lines changed

17 files changed

+1324
-1003
lines changed

apps/daas/src/directives/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@ export function installDirectives(app) {
3737
app.provide('hasPermissionByCode', hasPermissionByCode)
3838

3939
app.directive('readonlybtn', {
40-
mounted(el, binding, vnode) {
40+
mounted(el, binding) {
4141
const code = binding.value
4242

4343
if (!hasPermissionByCode(code)) {
4444
el.remove()
45-
vnode.child && vnode.child.$destroy()
4645
}
4746
},
4847
})

apps/daas/src/i18n/langs/en.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,6 +1971,7 @@ export default {
19711971
account_editFail: 'User name modification failed',
19721972
role_allData: 'All role data',
19731973
role_functionDataPermission: 'Function and data permissions',
1974+
role_dataPermission: 'Data Permissions',
19741975
role_module: 'Module',
19751976
role_choosePermissionTip:
19761977
'Please select the functions and data permissions available for this role (checking all role data means you can browse or operate the data of all roles, unchecking means you can only browse or operate your own data )',

apps/daas/src/i18n/langs/zh-CN.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1871,6 +1871,7 @@ export default {
18711871
account_editFail: '用户名修改失败',
18721872
role_allData: '全部角色数据',
18731873
role_functionDataPermission: '功能与数据权限',
1874+
role_dataPermission: '数据权限',
18741875
role_module: '模块',
18751876
role_choosePermissionTip:
18761877
'请选择此角色可用的功能和数据权限 (勾选全部角色数据表示可对全部角色的数据进行浏览或操作,不勾选则表示只能对自己的数据进行浏览或操作)',

apps/daas/src/i18n/langs/zh-TW.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,6 +1862,7 @@ export default {
18621862
account_editFail: '用戶名修改失敗',
18631863
role_allData: '全部角色數據',
18641864
role_functionDataPermission: '功能與數據權限',
1865+
role_dataPermission: '數據權限',
18651866
role_module: '模塊',
18661867
role_choosePermissionTip:
18671868
'請選擇此角色可用的功能和數據權限 (勾選全部角色數據表示可對全部角色的數據進行瀏覽或操作,不勾選則表示只能對自己的數據進行瀏覽或操作)',

apps/daas/src/router/routes.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -891,6 +891,7 @@ export const routes = [
891891
import('@/views/data-import-export/ProjectManagement.vue'),
892892
meta: {
893893
title: 'page_title_project_management',
894+
code: 'v2_project_management',
894895
},
895896
},
896897
{
@@ -899,6 +900,7 @@ export const routes = [
899900
component: () => import('@/views/data-import-export/List.vue'),
900901
meta: {
901902
title: 'page_title_data_import_export',
903+
code: 'v2_project_import_and_export',
902904
},
903905
},
904906
],

0 commit comments

Comments
 (0)