Skip to content

Commit 263872d

Browse files
Merge remote-tracking branch 'origin/v2' into v2
2 parents 01e89ee + 0c54f5b commit 263872d

File tree

8 files changed

+277
-100
lines changed

8 files changed

+277
-100
lines changed

ui/src/locales/lang/en-US/views/tool.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export default {
99
toolStore: {
1010
title: 'Tool Store',
1111
createFromToolStore: 'Create from Tool Store',
12+
internal: 'Built in system',
1213
recommend: 'Recommended',
1314
webSearch: 'Web Search',
1415
databaseQuery: 'Database Query',

ui/src/locales/lang/zh-CN/views/tool.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export default {
77
toolStore: {
88
title: '工具商店',
99
createFromToolStore: '从工具商店创建',
10+
internal: '系统内置',
1011
recommend: '推荐',
1112
webSearch: '联网搜索',
1213
databaseQuery: '数据库查询',

ui/src/locales/lang/zh-Hant/views/tool.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export default {
99
toolStore: {
1010
title: '工具商店',
1111
createFromToolStore: '從工具商店創建',
12+
internal: '系统内置',
1213
recommend: '推薦',
1314
webSearch: '聯網搜索',
1415
databaseQuery: '數據庫查詢',

ui/src/permission/model/system-share.ts

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,37 @@ import { ComplexPermission } from '@/utils/permission/type'
33
import { EditionConst, PermissionConst, RoleConst } from '@/utils/permission/data'
44
const share = {
55
is_share: () => false,
6-
addModel: () => false,
7-
modify: () => false,
8-
paramSetting: () => false,
9-
delete: () => false,
10-
6+
addModel: () =>
7+
hasPermission(
8+
[
9+
RoleConst.ADMIN,
10+
PermissionConst.SHARED_MODEL_CREATE,
11+
],
12+
'OR',
13+
),
14+
modify: () =>
15+
hasPermission(
16+
[
17+
RoleConst.ADMIN,
18+
PermissionConst.SHARED_MODEL_EDIT,
19+
],
20+
'OR',
21+
),
22+
paramSetting: () =>
23+
hasPermission(
24+
[
25+
RoleConst.ADMIN,
26+
PermissionConst.SHARED_MODEL_EDIT,
27+
],
28+
'OR',
29+
),
30+
delete: () =>
31+
hasPermission(
32+
[
33+
RoleConst.ADMIN,
34+
PermissionConst.SHARED_MODEL_DELETE,
35+
],
36+
'OR',
37+
),
1138
}
1239
export default share

ui/src/router/modules/system.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,14 @@ const systemRouter = {
164164
activeMenu: '/system',
165165
parentPath: '/system',
166166
parentName: 'system',
167+
permission: [
168+
new ComplexPermission(
169+
[RoleConst.ADMIN],
170+
[PermissionConst.SHARED_MODEL_READ],
171+
[EditionConst.IS_EE],
172+
'OR'
173+
)
174+
]
167175
},
168176
component: () => import('@/views/system-shared/ModelSharedIndex.vue'),
169177
},

ui/src/utils/permission/data.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,11 @@ const PermissionConst = {
146146
SHARED_TOOL_EXPORT:new Permission('SYSTEM_TOOL:READ+EXPORT'),
147147
SHARED_TOOL_DEBUG:new Permission('SYSTEM_TOOL:READ+DEBUG'),
148148

149+
SHARED_MODEL_READ:new Permission('SYSTEM_MODEL:READ'),
150+
SHARED_MODEL_CREATE:new Permission('SYSTEM_MODEL:READ+CREATE'),
151+
SHARED_MODEL_EDIT:new Permission('SYSTEM_MODEL:READ+EDIT'),
152+
SHARED_MODEL_DELETE:new Permission('SYSTEM_MODEL:READ+DELETE'),
153+
149154
SHARED_KNOWLEDGE_READ:new Permission('SYSTEM_KNOWLEDGE:READ'),
150155
SHARED_KNOWLEDGE_CREATE:new Permission('SYSTEM_KNOWLEDGE:READ+CREATE'),
151156
SHARED_KNOWLEDGE_EDIT:new Permission('SYSTEM_KNOWLEDGE:READ+EDIT'),

0 commit comments

Comments
 (0)