Skip to content

Commit cc36079

Browse files
perf: Fix some style bugs
1 parent d68aced commit cc36079

File tree

15 files changed

+88
-40
lines changed

15 files changed

+88
-40
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import { Result } from '@/request/Result'
2+
import { get, post, del, put } from '@/request/index'
3+
import { type Ref } from 'vue'
4+
5+
import useStore from '@/stores'
6+
const prefix: any = { _value: '/workspace/' }
7+
Object.defineProperty(prefix, 'value', {
8+
get: function () {
9+
const { user } = useStore()
10+
return this._value + user.getWorkspaceId()
11+
},
12+
})
13+
14+
/**
15+
* 获得文件夹列表
16+
* @params 参数
17+
* source : APPLICATION, KNOWLEDGE, TOOL
18+
* data : {name: string}
19+
*/
20+
const getFolder: (
21+
source: string,
22+
data?: any,
23+
loading?: Ref<boolean>,
24+
) => Promise<Result<Array<any>>> = (source, data, loading) => {
25+
return get(`${prefix.value}/${source}/folder`, data, loading)
26+
}
27+
28+
29+
30+
export default {
31+
getFolder,
32+
33+
}

ui/src/components/folder-tree/CreateFolderDialog.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</template>
5151
<script setup lang="ts">
5252
import { ref, watch, reactive } from 'vue'
53-
import folderApi from '@/api/folder'
53+
import folderApi from '@/api/workspace/folder'
5454
import { MsgSuccess, MsgAlert } from '@/utils/message'
5555
import { t } from '@/locales'
5656
import useStore from '@/stores'
@@ -138,7 +138,7 @@ const submitHandle = async () => {
138138
.then((res) => {
139139
MsgSuccess(t('common.createSuccess'))
140140
folder.setCurrentFolder(res.data)
141-
folder.asyncGetFolder(sourceType.value, {}, loading)
141+
folder.asyncGetFolder(sourceType.value, {}, 'workspace',loading)
142142
clearData()
143143
emit('refresh')
144144
dialogVisible.value = false

ui/src/components/folder-tree/MoveToDialog.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</template>
3131
<script setup lang="ts">
3232
import { ref, watch, reactive } from 'vue'
33-
import folderApi from '@/api/folder'
33+
import folderApi from '@/api/workspace/folder'
3434
import { MsgError, MsgSuccess } from '@/utils/message'
3535
import { t } from '@/locales'
3636
import useStore from '@/stores'
@@ -77,7 +77,7 @@ const open = (data: any, is_folder?: any) => {
7777
7878
function getFolder() {
7979
const params = {}
80-
folder.asyncGetFolder(props.source, params, loading).then((res: any) => {
80+
folder.asyncGetFolder(props.source, params, 'workspace', loading).then((res: any) => {
8181
folderList.value = res.data
8282
if (folderList.value?.length > 0) {
8383
currentNodeKey.value = folderList.value[0]?.id
@@ -154,7 +154,7 @@ defineExpose({ open })
154154
border-radius: 6px;
155155
}
156156
:deep(.el-tree) {
157-
height: calc(100vh - 320px)!important;
157+
height: calc(100vh - 320px) !important;
158158
}
159159
}
160160
</style>

ui/src/components/folder-tree/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ import ResourceAuthorizationDrawer from '@/components/resource-authorization-dra
140140
import { t } from '@/locales'
141141
import MoveToDialog from '@/components/folder-tree/MoveToDialog.vue'
142142
import { i18n_name } from '@/utils/common'
143-
import folderApi from '@/api/folder'
143+
import folderApi from '@/api/workspace/folder'
144144
import { EditionConst } from '@/utils/permission/data'
145145
import { hasPermission } from '@/utils/permission/index'
146146
import useStore from '@/stores'

ui/src/components/workflow-dropdown-menu/application/index.vue

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ const toolTreeData = ref<any[]>([])
247247
const toolList = ref<any[]>([])
248248
249249
async function getToolFolder() {
250-
const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {}, loading)
250+
const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {}, apiType.value, loading)
251251
toolTreeData.value = res.data
252252
folder.setCurrentFolder(res.data?.[0] || {})
253253
}
@@ -269,7 +269,7 @@ const applicationTreeData = ref<any[]>([])
269269
const applicationList = ref<any[]>([])
270270
271271
function getApplicationFolder() {
272-
folder.asyncGetFolder(SourceTypeEnum.APPLICATION, {}, loading).then((res: any) => {
272+
folder.asyncGetFolder(SourceTypeEnum.APPLICATION, {}, apiType.value, loading).then((res: any) => {
273273
applicationTreeData.value = res.data
274274
folder.setCurrentFolder(res.data?.[0] || {})
275275
})
@@ -309,6 +309,4 @@ async function handleClick(val: string) {
309309
310310
onMounted(() => {})
311311
</script>
312-
<style lang="scss" scoped>
313-
314-
</style>
312+
<style lang="scss" scoped></style>

ui/src/components/workflow-dropdown-menu/knowledge-inner/index.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ const toolTreeData = ref<any[]>([])
210210
const toolList = ref<any[]>([])
211211
212212
async function getToolFolder() {
213-
const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {}, loading)
213+
const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {}, apiType.value, loading)
214214
toolTreeData.value = res.data
215215
folder.setCurrentFolder(res.data?.[0] || {})
216216
}
@@ -237,7 +237,9 @@ function folderClickHandle(row: any) {
237237
238238
async function handleClick(val: string) {
239239
if (['DATA_SOURCE_TOOL', 'CUSTOM_TOOL'].includes(val)) {
240-
await getToolFolder()
240+
if (!route.path.includes('shared')) {
241+
await getToolFolder()
242+
}
241243
getToolList()
242244
}
243245
}

ui/src/components/workflow-dropdown-menu/knowledge/index.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ const toolTreeData = ref<any[]>([])
230230
const toolList = ref<any[]>([])
231231
232232
async function getToolFolder() {
233-
const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {}, loading)
233+
const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {}, apiType.value, loading)
234234
toolTreeData.value = res.data
235235
folder.setCurrentFolder(res.data?.[0] || {})
236236
}
@@ -257,7 +257,9 @@ function folderClickHandle(row: any) {
257257
258258
async function handleClick(val: string) {
259259
if (['DATA_SOURCE_TOOL', 'CUSTOM_TOOL'].includes(val)) {
260-
await getToolFolder()
260+
if (!route.path.includes('shared')) {
261+
await getToolFolder()
262+
}
261263
getToolList()
262264
}
263265
}

ui/src/stores/modules/folder.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { defineStore } from 'pinia'
22
import { type Ref } from 'vue'
3-
import folderApi from '@/api/folder'
3+
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
44

55
const useFolderStore = defineStore('folder', {
66
state: () => ({
@@ -10,14 +10,18 @@ const useFolderStore = defineStore('folder', {
1010
setCurrentFolder(folder: any) {
1111
this.currentFolder = folder
1212
},
13-
async asyncGetFolder(source: string, data: any, loading?: Ref<boolean>) {
13+
async asyncGetFolder(source: string, data: any, systemType: any, loading?: Ref<boolean>) {
1414
return new Promise((resolve, reject) => {
15-
folderApi
15+
loadSharedApi({
16+
type: 'folder',
17+
isShared: this.currentFolder?.id === 'share',
18+
systemType,
19+
})
1620
.getFolder(source, data, loading)
17-
.then((res) => {
21+
.then((res: any) => {
1822
resolve(res)
1923
})
20-
.catch((error) => {
24+
.catch((error: any) => {
2125
reject(error)
2226
})
2327
})

ui/src/utils/dynamics-api/shared-api.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import paragraphSystemShareApi from '@/api/system-shared/paragraph'
1919
import problemSystemShareApi from '@/api/system-shared/problem'
2020
import chatUserSystemShareApi from '@/api/system-shared/chat-user'
2121
import workspaceApi from '@/api/workspace/workspace'
22+
import folderWorkspaceApi from '@/api/workspace/folder'
2223
import systemUserApi from '@/api/user/user'
2324
import ToolResourceApi from '@/api/system-resource-management/tool'
2425
import knowledgeResourceApi from '@/api/system-resource-management/knowledge'
@@ -32,7 +33,7 @@ import applicationKeyResourceApi from '@/api/system-resource-management/applicat
3233
import workflowVersionResourceApi from '@/api/system-resource-management/workflow-version'
3334
import chatLogResourceApi from '@/api/system-resource-management/chat-log'
3435
import resourceAuthorizationResourceApi from '@/api/system-resource-management/resource-authorization'
35-
36+
import folderResourceApi from '@/api/system-resource-management/folder'
3637
// 普通 API
3738
const workspaceApiMap = {
3839
knowledge: knowledgeWorkspaceApi,
@@ -48,6 +49,7 @@ const workspaceApiMap = {
4849
workflowVersion: workflowVersionWorkspaceApi,
4950
chatLog: chatLogWorkspaceApi,
5051
resourceAuthorization: resourceAuthorizationWorkspaceApi,
52+
folder: folderWorkspaceApi,
5153
} as any
5254

5355
// 系统分享 API
@@ -76,6 +78,7 @@ const systemManageApiMap = {
7678
workflowVersion: workflowVersionResourceApi,
7779
chatLog: chatLogResourceApi,
7880
resourceAuthorization: resourceAuthorizationResourceApi,
81+
folder: folderResourceApi,
7982
} as any
8083

8184
const data = {

0 commit comments

Comments
 (0)