Jelajahi Sumber

fix:end of day (#7426)

呆萌闷油瓶 8 bulan lalu
induk
melakukan
218380ba43

+ 2 - 2
web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chartView.tsx

@@ -25,7 +25,7 @@ export default function ChartView({ appId }: IChartViewProps) {
   const appDetail = useAppStore(state => state.appDetail)
   const isChatApp = appDetail?.mode !== 'completion' && appDetail?.mode !== 'workflow'
   const isWorkflow = appDetail?.mode === 'workflow'
-  const [period, setPeriod] = useState<PeriodParams>({ name: t('appLog.filter.period.last7days'), query: { start: today.subtract(7, 'day').startOf('day').format(queryDateFormat), end: today.format(queryDateFormat) } })
+  const [period, setPeriod] = useState<PeriodParams>({ name: t('appLog.filter.period.last7days'), query: { start: today.subtract(7, 'day').startOf('day').format(queryDateFormat), end: today.endOf('day').format(queryDateFormat) } })
 
   const onSelect = (item: Item) => {
     if (item.value === 'all') {
@@ -37,7 +37,7 @@ export default function ChartView({ appId }: IChartViewProps) {
       setPeriod({ name: item.name, query: { start: startOfToday, end: endOfToday } })
     }
     else {
-      setPeriod({ name: item.name, query: { start: today.subtract(item.value as number, 'day').startOf('day').format(queryDateFormat), end: today.format(queryDateFormat) } })
+      setPeriod({ name: item.name, query: { start: today.subtract(item.value as number, 'day').startOf('day').format(queryDateFormat), end: today.endOf('day').format(queryDateFormat) } })
     }
   }
 

+ 1 - 1
web/app/components/app/log/index.tsx

@@ -61,7 +61,7 @@ const Logs: FC<ILogsProps> = ({ appDetail }) => {
     ...(queryParams.period !== 'all'
       ? {
         start: dayjs().subtract(queryParams.period as number, 'day').startOf('day').format('YYYY-MM-DD HH:mm'),
-        end: dayjs().format('YYYY-MM-DD HH:mm'),
+        end: dayjs().endOf('day').format('YYYY-MM-DD HH:mm'),
       }
       : {}),
     ...omit(queryParams, ['period']),