outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use ISO time

Browse Source
This commit is contained in:
jZonG 2025-03-04 17:37:29 +08:00
parent 086254c0b1
commit 651ec24152
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/app/components/app/workflow-log/index.tsx
View File

@ -6,6 +6,8 @@ import { usePathname } from 'next/navigation'
import { useDebounce } from 'ahooks' import { useDebounce } from 'ahooks'
import { omit } from 'lodash-es' import { omit } from 'lodash-es'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import utc from 'dayjs/plugin/utc'
import timezone from 'dayjs/plugin/timezone'
import { Trans, useTranslation } from 'react-i18next' import { Trans, useTranslation } from 'react-i18next'
import Link from 'next/link' import Link from 'next/link'
import List from './list' import List from './list'
@ -15,6 +17,10 @@ import Loading from '@/app/components/base/loading'
import { fetchWorkflowLogs } from '@/service/log' import { fetchWorkflowLogs } from '@/service/log'
import { APP_PAGE_LIMIT } from '@/config' import { APP_PAGE_LIMIT } from '@/config'
import type { App, AppMode } from '@/types/app' import type { App, AppMode } from '@/types/app'
import { useAppContext } from '@/context/app-context'
dayjs.extend(utc)
dayjs.extend(timezone)
export type ILogsProps = { export type ILogsProps = {
appDetail: App appDetail: App
@ -51,6 +57,7 @@ const EmptyElement: FC<{ appUrl: string }> = ({ appUrl }) => {
const Logs: FC<ILogsProps> = ({ appDetail }) => { const Logs: FC<ILogsProps> = ({ appDetail }) => {
const { t } = useTranslation() const { t } = useTranslation()
const { userProfile: { timezone } } = useAppContext()
const [queryParams, setQueryParams] = useState<QueryParam>({ status: 'all', period: '2' }) const [queryParams, setQueryParams] = useState<QueryParam>({ status: 'all', period: '2' })
const [currPage, setCurrPage] = React.useState<number>(0) const [currPage, setCurrPage] = React.useState<number>(0)
const debouncedQueryParams = useDebounce(queryParams, { wait: 500 }) const debouncedQueryParams = useDebounce(queryParams, { wait: 500 })
@ -63,8 +70,8 @@ const Logs: FC<ILogsProps> = ({ appDetail }) => {
...(debouncedQueryParams.keyword ? { keyword: debouncedQueryParams.keyword } : {}), ...(debouncedQueryParams.keyword ? { keyword: debouncedQueryParams.keyword } : {}),
...((debouncedQueryParams.period !== '9') ...((debouncedQueryParams.period !== '9')
? { ? {
start: dayjs().subtract(TIME_PERIOD_MAPPING[debouncedQueryParams.period].value, 'day').startOf('day').format('YYYY-MM-DD HH:mm'), created_at__after: dayjs().subtract(TIME_PERIOD_MAPPING[debouncedQueryParams.period].value, 'day').startOf('day').tz(timezone).format('YYYY-MM-DDTHH:mm:ssZ'),
end: dayjs().endOf('day').format('YYYY-MM-DD HH:mm'), created_at__before: dayjs().endOf('day').tz(timezone).format('YYYY-MM-DDTHH:mm:ssZ'),
} }
: {}), : {}),
...omit(debouncedQueryParams, ['period', 'status']), ...omit(debouncedQueryParams, ['period', 'status']),

3
web/service/log.ts
View File

@ -17,7 +17,6 @@ import type {
LogMessageAnnotationsResponse, LogMessageAnnotationsResponse,
LogMessageFeedbacksRequest, LogMessageFeedbacksRequest,
LogMessageFeedbacksResponse, LogMessageFeedbacksResponse,
WorkflowLogsRequest,
WorkflowLogsResponse, WorkflowLogsResponse,
WorkflowRunDetailResponse, WorkflowRunDetailResponse,
} from '@/models/log' } from '@/models/log'
@ -64,7 +63,7 @@ export const fetchAnnotationsCount: Fetcher<AnnotationsCountResponse, { url: str
return get<AnnotationsCountResponse>(url) return get<AnnotationsCountResponse>(url)
} }
export const fetchWorkflowLogs: Fetcher<WorkflowLogsResponse, { url: string; params?: WorkflowLogsRequest }> = ({ url, params }) => { export const fetchWorkflowLogs: Fetcher<WorkflowLogsResponse, { url: string; params: Record<string, any> }> = ({ url, params }) => {
return get<WorkflowLogsResponse>(url, { params }) return get<WorkflowLogsResponse>(url, { params })
} }