youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-26 21:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/queue-based-graph-engine' into feat/rag-2

Browse Source 
# Conflicts:
#	api/core/memory/token_buffer_memory.py
#	api/core/rag/extractor/notion_extractor.py
#	api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
#	api/core/variables/variables.py
#	api/core/workflow/graph/graph.py
#	api/core/workflow/graph_engine/entities/event.py
#	api/services/dataset_service.py
#	web/app/components/app-sidebar/index.tsx
#	web/app/components/base/tag-management/selector.tsx
#	web/app/components/base/toast/index.tsx
#	web/app/components/datasets/create/website/index.tsx
#	web/app/components/datasets/create/website/jina-reader/base/options-wrap.tsx
#	web/app/components/workflow/header/version-history-button.tsx
#	web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
#	web/app/components/workflow/hooks/use-workflow-interactions.ts
#	web/app/components/workflow/panel/version-history-panel/index.tsx
#	web/service/base.ts
This commit is contained in:
jyong
2025-09-03 15:01:06 +08:00
parent c422d732d2 8c97937cae
commit d4aed3df5c
572 changed files with 16030 additions and 7973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/utils/navigation.ts
View File

@ -32,7 +32,7 @@ export function createNavigationPath(basePath: string, preserveParams: boolean =
const separator = queryString ? '?' : ''
return `${basePath}${separator}${queryString}`
}
catch (error) {
catch (error) {
// Fallback to base path if there's any error accessing location
console.warn('Failed to preserve query parameters:', error)
return basePath
@ -89,7 +89,7 @@ export function extractQueryParams(paramNames: string[]): Record<string, string>
return extracted
}
catch (error) {
catch (error) {
console.warn('Failed to extract query parameters:', error)
return {}
}
@ -126,7 +126,7 @@ export function createNavigationPathWithParams(
const separator = queryString ? '?' : ''
return `${basePath}${separator}${queryString}`
}
catch (error) {
catch (error) {
console.warn('Failed to create navigation path with params:', error)
return basePath
}
@ -155,7 +155,7 @@ export function mergeQueryParams(
Object.entries(newParams).forEach(([key, value]) => {
if (value === null || value === undefined)
searchParams.delete(key)
else if (value !== '')
else if (value !== '')
searchParams.set(key, String(value))
})

6
web/utils/var-basePath.js
View File

@ -1,6 +0,0 @@
// export basePath to next.config.js
// same as the one exported from var.ts
module.exports = {
basePath: process.env.NEXT_PUBLIC_BASE_PATH || '',
assetPrefix: '',
}

2
web/utils/var.ts
View File

@ -122,7 +122,7 @@ export const getVars = (value: string) => {
// Set the value of basePath
// example: /dify
export const basePath = ''
export const basePath = process.env.NEXT_PUBLIC_BASE_PATH || ''
export function getMarketplaceUrl(path: string, params?: Record<string, string | undefined>) {
const searchParams = new URLSearchParams({ source: encodeURIComponent(window.location.origin) })