Merge branch 'upstream/main'

2025-11-11 10:53:42 +08:00 · 2025-02-16 13:18:50 +00:00
parent 33f3400c12 7ac553541b
commit 2a5908586d
40 changed files with 1185 additions and 340 deletions
--- a/web/default/src/components/ChannelsTable.js
+++ b/web/default/src/components/ChannelsTable.js
@@ -1,17 +1,7 @@
-import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Dropdown,
-  Form,
-  Input,
-  Label,
-  Message,
-  Pagination,
-  Popup,
-  Table,
-} from 'semantic-ui-react';
-import { Link } from 'react-router-dom';
+import React, {useEffect, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import {Button, Dropdown, Form, Input, Label, Message, Pagination, Popup, Table,} from 'semantic-ui-react';
+import {Link} from 'react-router-dom';
 import {
  API,
  loadChannelModels,
@@ -23,8 +13,8 @@ import {
  timestamp2string,
 } from '../helpers';

-import { CHANNEL_OPTIONS, ITEMS_PER_PAGE } from '../constants';
-import { renderGroup, renderNumber } from '../helpers/render';
+import {CHANNEL_OPTIONS, ITEMS_PER_PAGE} from '../constants';
+import {renderGroup, renderNumber} from '../helpers/render';

 function renderTimestamp(timestamp) {
  return <>{timestamp2string(timestamp)}</>;
@@ -54,6 +44,9 @@ function renderType(type, t) {
 function renderBalance(type, balance, t) {
  switch (type) {
    case 1: // OpenAI
+        if (balance === 0) {
+            return <span>{t('channel.table.balance_not_supported')}</span>;
+        }
      return <span>${balance.toFixed(2)}</span>;
    case 4: // CloseAI
      return <span>¥{balance.toFixed(2)}</span>;
@@ -67,6 +60,8 @@ function renderBalance(type, balance, t) {
      return <span>¥{balance.toFixed(2)}</span>;
    case 13: // AIGC2D
      return <span>{renderNumber(balance)}</span>;
+    case 20: // OpenRouter
+      return <span>${balance.toFixed(2)}</span>;
    case 36: // DeepSeek
      return <span>¥{balance.toFixed(2)}</span>;
    case 44: // SiliconFlow
@@ -93,30 +88,32 @@ const ChannelsTable = () => {
  const [showPrompt, setShowPrompt] = useState(shouldShowPrompt(promptID));
  const [showDetail, setShowDetail] = useState(isShowDetail());

+  const processChannelData = (channel) => {
+    if (channel.models === '') {
+      channel.models = [];
+      channel.test_model = '';
+    } else {
+      channel.models = channel.models.split(',');
+      if (channel.models.length > 0) {
+        channel.test_model = channel.models[0];
+      }
+      channel.model_options = channel.models.map((model) => {
+        return {
+          key: model,
+          text: model,
+          value: model,
+        };
+      });
+      console.log('channel', channel);
+    }
+    return channel;
+  };
+
  const loadChannels = async (startIdx) => {
    const res = await API.get(`/api/channel/?p=${startIdx}`);
    const { success, message, data } = res.data;
    if (success) {
-      let localChannels = data.map((channel) => {
-        if (channel.models === '') {
-          channel.models = [];
-          channel.test_model = '';
-        } else {
-          channel.models = channel.models.split(',');
-          if (channel.models.length > 0) {
-            channel.test_model = channel.models[0];
-          }
-          channel.model_options = channel.models.map((model) => {
-            return {
-              key: model,
-              text: model,
-              value: model,
-            };
-          });
-          console.log('channel', channel);
-        }
-        return channel;
-      });
+      let localChannels = data.map(processChannelData);
      if (startIdx === 0) {
        setChannels(localChannels);
      } else {
@@ -301,7 +298,8 @@ const ChannelsTable = () => {
    const res = await API.get(`/api/channel/search?keyword=${searchKeyword}`);
    const { success, message, data } = res.data;
    if (success) {
-      setChannels(data);
+      let localChannels = data.map(processChannelData);
+      setChannels(localChannels);
      setActivePage(1);
    } else {
      showError(message);
@@ -495,7 +493,6 @@ const ChannelsTable = () => {
              onClick={() => {
                sortChannel('balance');
              }}
-              hidden={!showDetail}
            >
              {t('channel.table.balance')}
            </Table.HeaderCell>
@@ -504,6 +501,7 @@ const ChannelsTable = () => {
              onClick={() => {
                sortChannel('priority');
              }}
+              hidden={!showDetail}
            >
              {t('channel.table.priority')}
            </Table.HeaderCell>
@@ -543,7 +541,7 @@ const ChannelsTable = () => {
                      basic
                    />
                  </Table.Cell>
-                  <Table.Cell hidden={!showDetail}>
+                  <Table.Cell>
                    <Popup
                      trigger={
                        <span
@@ -559,7 +557,7 @@ const ChannelsTable = () => {
                      basic
                    />
                  </Table.Cell>
-                  <Table.Cell>
+                  <Table.Cell hidden={!showDetail}>
                    <Popup
                      trigger={
                        <Input
@@ -593,7 +591,15 @@ const ChannelsTable = () => {
                    />
                  </Table.Cell>
                  <Table.Cell>
-                    <div>
+                    <div
+                      style={{
+                        display: 'flex',
+                        alignItems: 'center',
+                        flexWrap: 'wrap',
+                        gap: '2px',
+                        rowGap: '6px',
+                      }}
+                    >
                      <Button
                        size={'tiny'}
                        positive
--- a/web/default/src/constants/channel.constants.js
+++ b/web/default/src/constants/channel.constants.js
@@ -1,48 +1,108 @@
 export const CHANNEL_OPTIONS = [
-    { key: 1, text: 'OpenAI', value: 1, color: 'green' },
-    { key: 14, text: 'Anthropic Claude', value: 14, color: 'black' },
-    { key: 33, text: 'AWS', value: 33, color: 'black' },
-    { key: 3, text: 'Azure OpenAI', value: 3, color: 'olive' },
-    { key: 11, text: 'Google PaLM2', value: 11, color: 'orange' },
-    { key: 24, text: 'Google Gemini', value: 24, color: 'orange' },
-    { key: 28, text: 'Mistral AI', value: 28, color: 'orange' },
-    { key: 41, text: 'Novita', value: 41, color: 'purple' },
-    {key: 40, text: '火山引擎', value: 40, color: 'blue'},
-    { key: 15, text: '百度文心千帆', value: 15, color: 'blue' },
-    { key: 17, text: '阿里通义千问', value: 17, color: 'orange' },
-    { key: 18, text: '讯飞星火认知', value: 18, color: 'blue' },
-    { key: 16, text: '智谱 ChatGLM', value: 16, color: 'violet' },
-    { key: 19, text: '360 智脑', value: 19, color: 'blue' },
-    { key: 25, text: 'Moonshot AI', value: 25, color: 'black' },
-    { key: 23, text: '腾讯混元', value: 23, color: 'teal' },
-    { key: 26, text: '百川大Model', value: 26, color: 'orange' },
-    { key: 27, text: 'MiniMax', value: 27, color: 'red' },
-    { key: 29, text: 'Groq', value: 29, color: 'orange' },
-    { key: 30, text: 'Ollama', value: 30, color: 'black' },
-    { key: 31, text: '零一万物', value: 31, color: 'green' },
-    { key: 32, text: '阶跃星辰', value: 32, color: 'blue' },
-    { key: 34, text: 'Coze', value: 34, color: 'blue' },
-    { key: 35, text: 'Cohere', value: 35, color: 'blue' },
-    { key: 36, text: 'DeepSeek', value: 36, color: 'black' },
-    { key: 37, text: 'Cloudflare', value: 37, color: 'orange' },
-    { key: 38, text: 'DeepL', value: 38, color: 'black' },
-    { key: 39, text: 'together.ai', value: 39, color: 'blue' },
-    { key: 42, text: 'VertexAI', value: 42, color: 'blue' },
-    { key: 43, text: 'Proxy', value: 43, color: 'blue' },
-    { key: 44, text: 'SiliconFlow', value: 44, color: 'blue' },
-    { key: 45, text: 'xAI', value: 45, color: 'blue' },
-    { key: 46, text: 'Replicate', value: 46, color: 'blue' },
-    { key: 8, text: 'CustomChannel', value: 8, color: 'pink' },
-    { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
-    { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },
-    { key: 20, text: 'Proxy：OpenRouter', value: 20, color: 'black' },
-    { key: 2, text: 'Proxy：API2D', value: 2, color: 'blue' },
-    { key: 5, text: 'Proxy：OpenAI-SB', value: 5, color: 'brown' },
-    { key: 7, text: 'Proxy：OhMyGPT', value: 7, color: 'purple' },
-    { key: 10, text: 'Proxy：AI Proxy', value: 10, color: 'purple' },
-    { key: 4, text: 'Proxy：CloseAI', value: 4, color: 'teal' },
-    { key: 6, text: 'Proxy：OpenAI Max', value: 6, color: 'violet' },
-    { key: 9, text: 'Proxy：AI.LS', value: 9, color: 'yellow' },
-    { key: 12, text: 'Proxy：API2GPT', value: 12, color: 'blue' },
-    { key: 13, text: 'Proxy：AIGC2D', value: 13, color: 'purple' }
+  { key: 1, text: 'OpenAI', value: 1, color: 'green' },
+  {
+    key: 50,
+    text: 'OpenAI 兼容',
+    value: 50,
+    color: 'olive',
+    description: 'OpenAI 兼容渠道，支持设置 Base URL',
+  },
+  {key: 14, text: 'Anthropic', value: 14, color: 'black'},
+  { key: 33, text: 'AWS', value: 33, color: 'black' },
+  {key: 3, text: 'Azure', value: 3, color: 'olive'},
+  {key: 11, text: 'PaLM2', value: 11, color: 'orange'},
+  {key: 24, text: 'Gemini', value: 24, color: 'orange'},
+  {
+    key: 51,
+    text: 'Gemini (OpenAI)',
+    value: 51,
+    color: 'orange',
+    description: 'Gemini OpenAI 兼容格式',
+  },
+  { key: 28, text: 'Mistral AI', value: 28, color: 'orange' },
+  { key: 41, text: 'Novita', value: 41, color: 'purple' },
+  {
+    key: 40,
+    text: '字节火山引擎',
+    value: 40,
+    color: 'blue',
+    description: '原字节跳动豆包',
+  },
+  {
+    key: 15,
+    text: '百度文心千帆',
+    value: 15,
+    color: 'blue',
+    tip: '请前往<a href="https://console.bce.baidu.com/qianfan/ais/console/applicationConsole/application/v1" target="_blank">此处</a>获取 AK（API Key）以及 SK（Secret Key），注意，V2 版本接口请使用 <strong>百度文心千帆 V2 </strong>渠道类型',
+  },
+  {
+    key: 47,
+    text: '百度文心千帆 V2',
+    value: 47,
+    color: 'blue',
+    tip: '请前往<a href="https://console.bce.baidu.com/iam/#/iam/apikey/list" target="_blank">此处</a>获取 API Key，注意本渠道仅支持<a target="_blank" href="https://cloud.baidu.com/doc/WENXINWORKSHOP/s/em4tsqo3v">推理服务 V2</a>相关模型',
+  },
+  {
+    key: 17,
+    text: '阿里通义千问',
+    value: 17,
+    color: 'orange',
+    tip: '如需使用阿里云百炼，请使用<strong>阿里云百炼</strong>渠道',
+  },
+  { key: 49, text: '阿里云百炼', value: 49, color: 'orange' },
+  {
+    key: 18,
+    text: '讯飞星火认知',
+    value: 18,
+    color: 'blue',
+    tip: '本渠道基于讯飞 WebSocket 版本 API，如需 HTTP 版本，请使用<strong>讯飞星火认知 V2</strong>渠道',
+  },
+  {
+    key: 48,
+    text: '讯飞星火认知 V2',
+    value: 48,
+    color: 'blue',
+    tip: 'HTTP 版本的讯飞接口，前往<a href="https://console.xfyun.cn/services/cbm" target="_blank">此处</a>获取 HTTP 服务接口认证密钥',
+  },
+  { key: 16, text: '智谱 ChatGLM', value: 16, color: 'violet' },
+  { key: 19, text: '360 智脑', value: 19, color: 'blue' },
+  { key: 25, text: 'Moonshot AI', value: 25, color: 'black' },
+  { key: 23, text: '腾讯混元', value: 23, color: 'teal' },
+  { key: 26, text: '百川大模型', value: 26, color: 'orange' },
+  { key: 27, text: 'MiniMax', value: 27, color: 'red' },
+  { key: 29, text: 'Groq', value: 29, color: 'orange' },
+  { key: 30, text: 'Ollama', value: 30, color: 'black' },
+  { key: 31, text: '零一万物', value: 31, color: 'green' },
+  { key: 32, text: '阶跃星辰', value: 32, color: 'blue' },
+  { key: 34, text: 'Coze', value: 34, color: 'blue' },
+  { key: 35, text: 'Cohere', value: 35, color: 'blue' },
+  { key: 36, text: 'DeepSeek', value: 36, color: 'black' },
+  { key: 37, text: 'Cloudflare', value: 37, color: 'orange' },
+  { key: 38, text: 'DeepL', value: 38, color: 'black' },
+  { key: 39, text: 'together.ai', value: 39, color: 'blue' },
+  { key: 42, text: 'VertexAI', value: 42, color: 'blue' },
+  { key: 43, text: 'Proxy', value: 43, color: 'blue' },
+  { key: 44, text: 'SiliconFlow', value: 44, color: 'blue' },
+  { key: 45, text: 'xAI', value: 45, color: 'blue' },
+  { key: 46, text: 'Replicate', value: 46, color: 'blue' },
+  {
+    key: 8,
+    text: '自定义渠道',
+    value: 8,
+    color: 'pink',
+    tip: '不推荐使用，请使用 <strong>OpenAI 兼容</strong>渠道类型。注意，这里所需要填入的代理地址仅会在实际请求时替换域名部分，如果你想填入 OpenAI SDK 中所要求的 Base URL，请使用 OpenAI 兼容渠道类型',
+    description: '不推荐使用，请使用 OpenAI 兼容渠道类型',
+  },
+  { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
+  { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },
+  { key: 20, text: 'OpenRouter', value: 20, color: 'black' },
+  { key: 2, text: '代理：API2D', value: 2, color: 'blue' },
+  { key: 5, text: '代理：OpenAI-SB', value: 5, color: 'brown' },
+  { key: 7, text: '代理：OhMyGPT', value: 7, color: 'purple' },
+  { key: 10, text: '代理：AI Proxy', value: 10, color: 'purple' },
+  { key: 4, text: '代理：CloseAI', value: 4, color: 'teal' },
+  { key: 6, text: '代理：OpenAI Max', value: 6, color: 'violet' },
+  { key: 9, text: '代理：AI.LS', value: 9, color: 'yellow' },
+  { key: 12, text: '代理：API2GPT', value: 12, color: 'blue' },
+  { key: 13, text: '代理：AIGC2D', value: 13, color: 'purple' },
 ];
--- a/web/default/src/helpers/helper.js
+++ b/web/default/src/helpers/helper.js
@@ -0,0 +1,13 @@
+import {CHANNEL_OPTIONS} from '../constants';
+
+let channelMap = undefined;
+
+export function getChannelOption(channelId) {
+    if (channelMap === undefined) {
+        channelMap = {};
+        CHANNEL_OPTIONS.forEach((option) => {
+            channelMap[option.key] = option;
+        });
+    }
+    return channelMap[channelId];
+}
--- a/web/default/src/helpers/render.js
+++ b/web/default/src/helpers/render.js
@@ -1,5 +1,6 @@
-import { Label } from 'semantic-ui-react';
-import { useTranslation } from 'react-i18next';
+import { Label, Message } from 'semantic-ui-react';
+import { getChannelOption } from './helper';
+import React from 'react';

 export function renderText(text, limit) {
  if (text.length > limit) {
@@ -15,7 +16,15 @@ export function renderGroup(group) {
  let groups = group.split(',');
  groups.sort();
  return (
-    <>
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        flexWrap: 'wrap',
+        gap: '2px',
+        rowGap: '6px',
+      }}
+    >
      {groups.map((group) => {
        if (group === 'vip' || group === 'pro') {
          return <Label color='yellow'>{group}</Label>;
@@ -24,7 +33,7 @@ export function renderGroup(group) {
        }
        return <Label>{group}</Label>;
      })}
-    </>
+    </div>
  );
 }

@@ -98,3 +107,15 @@ export function renderColorLabel(text) {
    </Label>
  );
 }
+
+export function renderChannelTip(channelId) {
+  let channel = getChannelOption(channelId);
+  if (channel === undefined || channel.tip === undefined) {
+    return <></>;
+  }
+  return (
+    <Message>
+      <div dangerouslySetInnerHTML={{ __html: channel.tip }}></div>
+    </Message>
+  );
+}
--- a/web/default/src/helpers/utils.js
+++ b/web/default/src/helpers/utils.js
@@ -1,7 +1,7 @@
-import { toast } from 'react-toastify';
-import { toastConstants } from '../constants';
+import {toast} from 'react-toastify';
+import {toastConstants} from '../constants';
 import React from 'react';
-import { API } from './api';
+import {API} from './api';

 const HTMLToastContent = ({ htmlContent }) => {
  return <div dangerouslySetInnerHTML={{ __html: htmlContent }} />;
@@ -74,6 +74,7 @@ if (isMobile()) {
 }

 export function showError(error) {
+  if (!error) return;
  console.error(error);
  if (error.message) {
    if (error.name === 'AxiosError') {
@@ -158,17 +159,7 @@ export function timestamp2string(timestamp) {
    second = '0' + second;
  }
  return (
-    year +
-    '-' +
-    month +
-    '-' +
-    day +
-    ' ' +
-    hour +
-    ':' +
-    minute +
-    ':' +
-    second
+      year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
  );
 }

@@ -193,7 +184,6 @@ export const verifyJSON = (str) => {
 export function shouldShowPrompt(id) {
  let prompt = localStorage.getItem(`prompt-${id}`);
  return !prompt;
-
 }

 export function setPromptShown(id) {
--- a/web/default/src/locales/en/translation.json
+++ b/web/default/src/locales/en/translation.json
@@ -104,8 +104,10 @@
      "model_mapping_placeholder": "Optional, used to modify model names in request body. A JSON string where keys are request model names and values are target model names",
      "system_prompt": "System Prompt",
      "system_prompt_placeholder": "Optional, used to force set system prompt. Use with custom model & model mapping. First create a unique custom model name above, then map it to a natively supported model",
-      "base_url": "Proxy",
-      "base_url_placeholder": "Optional, used for API calls through proxy. Enter proxy address in format: https://domain.com",
+      "proxy_url": "Proxy",
+      "proxy_url_placeholder": "This is optional and used for API calls via a proxy. Please enter the proxy URL, formatted as: https://domain.com",
+      "base_url": "Base URL",
+      "base_url_placeholder": "The Base URL required by the OpenAPI SDK",
      "key": "Key",
      "key_placeholder": "Please enter key",
      "batch": "Batch Create",
--- a/web/default/src/locales/zh/translation.json
+++ b/web/default/src/locales/zh/translation.json
@@ -104,8 +104,10 @@
      "model_mapping_placeholder": "此项可选，用于修改请求体中的模型名称，为一个 JSON 字符串，键为请求中模型名称，值为要替换的模型名称",
      "system_prompt": "系统提示词",
      "system_prompt_placeholder": "此项可选，用于强制设置给定的系统提示词，请配合自定义模型 & 模型重定向使用，首先创建一个唯一的自定义模型名称并在上面填入，之后将该自定义模型重定向映射到该渠道一个原生支持的模型",
-      "base_url": "代理",
-      "base_url_placeholder": "此项可选，用于通过代理站来进行 API 调用，请输入代理站地址，格式为：https://domain.com",
+      "proxy_url": "代理",
+      "proxy_url_placeholder": "此项可选，用于通过代理站来进行 API 调用，请输入代理站地址，格式为：https://domain.com。注意，这里所需要填入的代理地址仅会在实际请求时替换域名部分，如果你想填入 OpenAI SDK 中所要求的 Base URL，请使用 OpenAI 兼容渠道类型",
+      "base_url": "Base URL",
+      "base_url_placeholder": "OpenAPI SDK 中所要求的 Base URL",
      "key": "密钥",
      "key_placeholder": "请输入密钥",
      "batch": "批量创建",
--- a/web/default/src/pages/Channel/EditChannel.js
+++ b/web/default/src/pages/Channel/EditChannel.js
@@ -1,25 +1,10 @@
-import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Form,
-  Header,
-  Input,
-  Message,
-  Segment,
-  Card,
-} from 'semantic-ui-react';
-import { useNavigate, useParams } from 'react-router-dom';
-import {
-  API,
-  copy,
-  getChannelModels,
-  showError,
-  showInfo,
-  showSuccess,
-  verifyJSON,
-} from '../../helpers';
-import { CHANNEL_OPTIONS } from '../../constants';
+import React, {useEffect, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import {Button, Card, Form, Input, Message} from 'semantic-ui-react';
+import {useNavigate, useParams} from 'react-router-dom';
+import {API, copy, getChannelModels, showError, showInfo, showSuccess, verifyJSON,} from '../../helpers';
+import {CHANNEL_OPTIONS} from '../../constants';
+import {renderChannelTip} from '../../helpers/render';

 const MODEL_MAPPING_EXAMPLE = {
  'gpt-3.5-turbo-0301': 'gpt-3.5-turbo',
@@ -310,6 +295,7 @@ const EditChannel = () => {
                options={groupOptions}
              />
            </Form.Field>
+            {renderChannelTip(inputs.type)}

            {/* Azure OpenAI specific fields */}
            {inputs.type === 3 && (
@@ -352,6 +338,20 @@ const EditChannel = () => {
            {inputs.type === 8 && (
              <Form.Field>
                <Form.Input
+                    required
+                    label={t('channel.edit.proxy_url')}
+                    name='base_url'
+                    placeholder={t('channel.edit.proxy_url_placeholder')}
+                    onChange={handleInputChange}
+                    value={inputs.base_url}
+                    autoComplete='new-password'
+                />
+              </Form.Field>
+            )}
+            {inputs.type === 50 && (
+                <Form.Field>
+                  <Form.Input
+                      required
                  label={t('channel.edit.base_url')}
                  name='base_url'
                  placeholder={t('channel.edit.base_url_placeholder')}
@@ -650,12 +650,13 @@ const EditChannel = () => {
            {inputs.type !== 3 &&
              inputs.type !== 33 &&
              inputs.type !== 8 &&
+                inputs.type !== 50 &&
              inputs.type !== 22 && (
                <Form.Field>
                  <Form.Input
-                    label={t('channel.edit.base_url')}
+                      label={t('channel.edit.proxy_url')}
                    name='base_url'
-                    placeholder={t('channel.edit.base_url_placeholder')}
+                      placeholder={t('channel.edit.proxy_url_placeholder')}
                    onChange={handleInputChange}
                    value={inputs.base_url}
                    autoComplete='new-password'
--- a/web/default/src/pages/Dashboard/index.js
+++ b/web/default/src/pages/Dashboard/index.js
@@ -1,6 +1,6 @@
-import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Card, Grid } from 'semantic-ui-react';
+import React, {useEffect, useState} from 'react';
+import {useTranslation} from 'react-i18next';
+import {Card, Grid} from 'semantic-ui-react';
 import {
  Bar,
  BarChart,
@@ -122,11 +122,11 @@ const Dashboard = () => {
        ? new Date(Math.min(...dates.map((d) => new Date(d))))
        : new Date();

-    // 确保至少显示5天的数据
-    const fiveDaysAgo = new Date();
-    fiveDaysAgo.setDate(fiveDaysAgo.getDate() - 4); // -4是因为包含今天
-    if (minDate > fiveDaysAgo) {
-      minDate = fiveDaysAgo;
+    // 确保至少显示7天的数据
+    const sevenDaysAgo = new Date();
+    sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 6); // -6是因为包含今天
+    if (minDate > sevenDaysAgo) {
+      minDate = sevenDaysAgo;
    }

    // 生成所有日期
@@ -164,11 +164,11 @@ const Dashboard = () => {
        ? new Date(Math.min(...dates.map((d) => new Date(d))))
        : new Date();

-    // 确保至少显示5天的数据
-    const fiveDaysAgo = new Date();
-    fiveDaysAgo.setDate(fiveDaysAgo.getDate() - 4); // -4是因为包含今天
-    if (minDate > fiveDaysAgo) {
-      minDate = fiveDaysAgo;
+    // 确保至少显示7天的数据
+    const sevenDaysAgo = new Date();
+    sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 6); // -6是因为包含今天
+    if (minDate > sevenDaysAgo) {
+      minDate = sevenDaysAgo;
    }

    // 生成所有日期