Skip to content

Commit 449aa63

Browse files
wangdan-fit2cloudwangdan-fit2cloud
committed
feat: permission
1 parent 3360c49 commit 449aa63

File tree

14 files changed

+33
-26
lines changed

14 files changed

+33
-26
lines changed

‎ui/src/api/knowledge/knowledge.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ const putGenerateRelated: (
158158
* @query { query_text: string, top_number: number, similarity: number }
159159
* @returns
160160
*/
161-
const getKnowledgeHitTest: (
161+
const putKnowledgeHitTest: (
162162
knowledge_id: string,
163163
data: any,
164164
loading?: Ref<boolean>,
165165
) => Promise<Result<Array<any>>> = (knowledge_id, data, loading) => {
166-
return get(`${prefix.value}/${knowledge_id}/hit_test`, data, loading)
166+
return put(`${prefix.value}/${knowledge_id}/hit_test`, undefined, data, loading)
167167
}
168168

169169
/**
@@ -265,7 +265,7 @@ export default {
265265
exportKnowledge,
266266
exportZipKnowledge,
267267
putGenerateRelated,
268-
getKnowledgeHitTest,
268+
putKnowledgeHitTest,
269269
putSyncWebKnowledge,
270270
postKnowledge,
271271
getKnowledgeModel,

‎ui/src/api/shared/knowledge.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,22 @@ const putGenerateRelated: (
143143
) => Promise<Result<Array<any>>> = (knowledge_id, data, loading) => {
144144
return put(`${prefix}/${knowledge_id}/generate_related`, data, null, loading)
145145
}
146-
147146
/**
148147
* 命中测试列表
149148
* @param knowledge_id
150149
* @param loading
151150
* @query { query_text: string, top_number: number, similarity: number }
152151
* @returns
153152
*/
154-
const getKnowledgeHitTest: (
153+
const putKnowledgeHitTest: (
155154
knowledge_id: string,
156155
data: any,
157156
loading?: Ref<boolean>,
158157
) => Promise<Result<Array<any>>> = (knowledge_id, data, loading) => {
159-
return get(`${prefix}/${knowledge_id}/hit_test`, data, loading)
158+
return put(`${prefix}/${knowledge_id}/hit_test`, undefined, data, loading)
160159
}
161160

161+
162162
/**
163163
* 同步知识库
164164
* @param 参数 knowledge_id
@@ -260,7 +260,7 @@ export default {
260260
exportKnowledge,
261261
exportZipKnowledge,
262262
putGenerateRelated,
263-
getKnowledgeHitTest,
263+
putKnowledgeHitTest,
264264
putSyncWebKnowledge,
265265
postKnowledge,
266266
getKnowledgeModel,

‎ui/src/layout/layout-header/UserHeader.vue‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
<div class="logo mt-4">
55
<LogoFull />
66
</div>
7+
78
<el-divider
89
direction="vertical"
910
class="ml-24 mr-24"
1011
v-if="hasPermission(EditionConst.IS_EE, 'OR')"
1112
/>
13+
<!-- 企业版: 工作空间下拉框-->
1214
<WorkspaceDropdown v-if="hasPermission(EditionConst.IS_EE, 'OR')" />
1315
<div class="flex-between w-full">
1416
<div></div>

‎ui/src/router/modules/2knowledge.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const ModelRouter = {
1414

1515
// 上传文档
1616
{
17-
path: '/knowledge/document/upload',
17+
path: '/knowledge/document/upload/:folderId',
1818
name: 'UploadDocument',
1919
meta: { activeMenu: '/knowledge' },
2020
component: () => import('@/views/document/UploadDocument.vue'),

‎ui/src/router/modules/application-detail.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ChatUserResourceEnum } from '@/enums/workspaceChatUser'
22

3-
import { PermissionConst, RoleConst } from '@/utils/permission/data'
3+
import { PermissionConst, EditionConst, RoleConst } from '@/utils/permission/data'
44

55
const ApplicationDetailRouter = {
66
path: '/application/:id/:type',
@@ -49,7 +49,7 @@ const ApplicationDetailRouter = {
4949
active: 'access',
5050
parentPath: '/application/:id/:type',
5151
parentName: 'ApplicationDetail',
52-
// permission: new ComplexPermission([], ['x-pack'], 'OR'),
52+
permission: [EditionConst.IS_PE, EditionConst.IS_EE],
5353
},
5454
component: () => import('@/views/application/ApplicationAccess.vue'),
5555
},
@@ -75,9 +75,10 @@ const ApplicationDetailRouter = {
7575
active: 'chat-log',
7676
parentPath: '/application/:id/:type',
7777
parentName: 'ApplicationDetail',
78-
resourceType: ChatUserResourceEnum.APPLICATION
78+
resourceType: ChatUserResourceEnum.APPLICATION,
79+
permission: [EditionConst.IS_PE, EditionConst.IS_EE],
7980
},
80-
component: () => import('@/views/chat-user/index.vue')
81+
component: () => import('@/views/chat-user/index.vue'),
8182
},
8283
{
8384
path: 'chat-log',

‎ui/src/router/modules/document.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { ChatUserResourceEnum } from '@/enums/workspaceChatUser'
22

3+
import { PermissionConst, EditionConst, RoleConst } from '@/utils/permission/data'
34
const DocumentRouter = {
45
path: '/knowledge/:id/:folderId',
56
name: 'KnowledgeDetail',
@@ -55,9 +56,10 @@ const DocumentRouter = {
5556
active: 'chat-log',
5657
parentPath: '/knowledge/:id/:folderId',
5758
parentName: 'KnowledgeDetail',
58-
resourceType: ChatUserResourceEnum.KNOWLEDGE
59+
resourceType: ChatUserResourceEnum.KNOWLEDGE,
60+
permission: [EditionConst.IS_PE, EditionConst.IS_EE],
5961
},
60-
component: () => import('@/views/chat-user/index.vue')
62+
component: () => import('@/views/chat-user/index.vue'),
6163
},
6264
{
6365
path: 'setting',

‎ui/src/views/document/UploadDocument.vue‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ const documentsType = computed(() => knowledge.documentsType)
7171
const router = useRouter()
7272
const route = useRoute()
7373
const {
74+
params: { folderId },
7475
query: { id }, // id为knowledgeID，有id的是上传文档
7576
} = route
7677
@@ -96,7 +97,7 @@ async function next() {
9697
documentApi.postQADocument(id as string, fd, loading).then((res) => {
9798
MsgSuccess(t('common.submitSuccess'))
9899
clearStore()
99-
router.push({ path: `/knowledge/${id}/document` })
100+
router.push({ path: `/knowledge/${id}/${folderId}/document` })
100101
})
101102
}
102103
} else if (documentsType.value === 'table') {
@@ -111,7 +112,7 @@ async function next() {
111112
documentApi.postTableDocument(id as string, fd, loading).then((res) => {
112113
MsgSuccess(t('common.submitSuccess'))
113114
clearStore()
114-
router.push({ path: `/knowledge/${id}/document` })
115+
router.push({ path: `/knowledge/${id}/${folderId}/document` })
115116
})
116117
}
117118
} else {
@@ -151,7 +152,7 @@ function submit() {
151152
.then(() => {
152153
MsgSuccess(t('common.submitSuccess'))
153154
clearStore()
154-
router.push({ path: `/knowledge/${id}/document` })
155+
router.push({ path: `/knowledge/${id}/${folderId}/document` })
155156
})
156157
.catch(() => {
157158
loading.value = false

‎ui/src/views/document/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<el-button
1010
v-if="knowledgeDetail.type === 0"
1111
type="primary"
12-
@click="router.push({ path: '/knowledge/document/upload', query: { id: id } })"
12+
@click="router.push({ path: `/knowledge/document/upload/${folderId}`, query: { id: id } })"
1313
v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_DOCUMENT_CREATE.getWorkspacePermission]"
1414
>{{ $t('views.document.uploadDocument') }}
1515
</el-button>
@@ -526,7 +526,7 @@
526526
</div>
527527
</el-card>
528528
<div class="mul-operation w-full flex" v-if="multipleSelection.length !== 0">
529-
<el-button :disabled="multipleSelection.length === 0" @click="cancelTaskHandle(1, row)"
529+
<el-button :disabled="multipleSelection.length === 0" @click="cancelTaskHandle(1, row)"
530530
v-hasPermission="[RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,PermissionConst.KNOWLEDGE_DOCUMENT_VECTOR.getWorkspacePermission]">
531531
{{ $t('views.document.setting.cancelVectorization') }}
532532
</el-button>

‎ui/src/views/hit-test/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ function getHitTestList() {
312312
...formInline.value,
313313
}
314314
if (isDataset.value) {
315-
KnowledgeApi.getKnowledgeHitTest(id, obj, loading).then((res) => {
315+
KnowledgeApi.putKnowledgeHitTest(id, obj, loading).then((res) => {
316316
paragraphDetail.value = res.data && arraySort(res.data, 'comprehensive_score', true)
317317
questionTitle.value = inputValue.value
318318
inputValue.value = ''

‎ui/src/views/login/index.vue‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ import QrCodeTab from '@/views/login/scanCompinents/QrCodeTab.vue'
140140
import { MsgConfirm, MsgError } from '@/utils/message.ts'
141141
import * as dd from 'dingtalk-jsapi'
142142
import { loadScript } from '@/utils/utils'
143+
import { EditionConst } from '@/utils/permission/data'
144+
import { hasPermission } from '@/utils/permission/index'
145+
143146
const router = useRouter()
144147
const { login, user, theme } = useStore()
145148
const { locale } = useI18n({ useScope: 'global' })
@@ -296,7 +299,8 @@ function changeMode(val: string) {
296299
onBeforeMount(() => {
297300
loading.value = true
298301
user.asyncGetProfile().then((res) => {
299-
if (user.isEnterprise()) {
302+
// 企业版和专业版：第三方登录
303+
if (hasPermission([EditionConst.IS_EE, EditionConst.IS_PE], 'OR')) {
300304
login
301305
.getAuthType()
302306
.then((res) => {

0 commit comments

Comments
 (0)