update

arvinxx · web-flow · commit 1c801e8eac09 · 2025-03-17T09:59:22.000Z
diff --git a/src/app/[variants]/(main)/settings/storage/Advanced.tsx b/src/app/[variants]/(main)/settings/storage/Advanced.tsx
@@ -1,12 +1,15 @@
 'use client';
 
-import { Form, type ItemGroup } from '@lobehub/ui';
-import { App, Button } from 'antd';
+import { Form, Icon, type ItemGroup } from '@lobehub/ui';
+import { App, Button, Dropdown, Space } from 'antd';
 import isEqual from 'fast-deep-equal';
+import { ChevronDown, HardDriveDownload, HardDriveUpload } from 'lucide-react';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
+import DataImporter from '@/features/DataImporter';
+import { configService } from '@/services/config';
 import { useChatStore } from '@/store/chat';
 import { useFileStore } from '@/store/file';
 import { useSessionStore } from '@/store/session';
@@ -52,6 +55,51 @@ const AdvancedActions = () => {
 
   const system: ItemGroup = {
     children: [
+      {
+        children: (
+          <DataImporter>
+            <Button icon={<Icon icon={HardDriveDownload} />}>
+              {t('storage.actions.import.button')}
+            </Button>
+          </DataImporter>
+        ),
+        label: t('storage.actions.import.title'),
+        minWidth: undefined,
+      },
+      {
+        children: (
+          <Space.Compact>
+            <Button icon={<Icon icon={HardDriveUpload} />} onClick={configService.exportAll}>
+              {t('storage.actions.export.button')}
+            </Button>
+            <Dropdown
+              menu={{
+                items: [
+                  {
+                    key: 'allAgent',
+                    label: t('storage.actions.export.exportType.allAgent'),
+                    onClick: configService.exportAgents,
+                  },
+                  {
+                    key: 'allAgentWithMessage',
+                    label: t('storage.actions.export.exportType.allAgentWithMessage'),
+                    onClick: configService.exportSessions,
+                  },
+                  {
+                    key: 'globalSetting',
+                    label: t('storage.actions.export.exportType.globalSetting'),
+                    onClick: configService.exportSettings,
+                  },
+                ],
+              }}
+            >
+              <Button icon={<Icon icon={ChevronDown} />} />
+            </Dropdown>
+          </Space.Compact>
+        ),
+        label: t('storage.actions.export.title'),
+        minWidth: undefined,
+      },
       {
         children: (
           <Button danger onClick={handleClear} type="primary">
diff --git a/src/app/[variants]/(main)/settings/storage/IndexedDBStorage.tsx b/src/app/[variants]/(main)/settings/storage/IndexedDBStorage.tsx
@@ -21,7 +21,7 @@ const IndexedDBStorage = memo(() => {
 
     const percent = (usage / quota) * 100;
 
-    return { percent: percent < 1 ? 2 : percent, total: quota, used: usage };
+    return { percent: percent < 1 ? 1 : percent, total: quota, used: usage };
   });
 
   return (
diff --git a/src/database/repositories/dataExporter/index.ts b/src/database/repositories/dataExporter/index.ts
@@ -47,22 +47,22 @@ export const DATA_EXPORT_CONFIG = {
   relationTables: [
     {
       relations: [
-        { sourceField: 'id', sourceTable: 'agents', field: 'agentId' },
+        { field: 'agentId', sourceField: 'id', sourceTable: 'agents' },
         { sourceField: 'sessionId', sourceTable: 'sessions' },
       ],
       table: 'agentsToSessions',
     },
-    // {
-    //   relations: [
-    //     { sourceField: 'agentId', sourceTable: 'agents' },
-    //     { sourceField: 'fileId', sourceTable: 'files' },
-    //   ],
-    //   table: 'agentsFiles',
-    // },
-    // {
-    //   relations: [{ field: 'sessionId', sourceTable: 'sessions' }],
-    //   table: 'filesToSessions',
-    // },
+    {
+      relations: [
+        { sourceField: 'agentId', sourceTable: 'agents' },
+        { sourceField: 'fileId', sourceTable: 'files' },
+      ],
+      table: 'agentsFiles',
+    },
+    {
+      relations: [{ field: 'sessionId', sourceTable: 'sessions' }],
+      table: 'filesToSessions',
+    },
     // {
     //   relations: [{ field: 'id', sourceTable: 'chunks' }],
     //   table: 'fileChunks',
@@ -115,10 +115,13 @@ export const DATA_EXPORT_CONFIG = {
 };
 
 export class DataExporterRepos {
-  constructor(
-    private db: LobeChatDatabase,
-    private userId: string,
-  ) {}
+  private userId: string;
+  private db: LobeChatDatabase;
+
+  constructor(db: LobeChatDatabase, userId: string) {
+    this.db = db;
+    this.userId = userId;
+  }
 
   private removeUserId(data: any[]) {
     return data.map((item) => {
@@ -134,17 +137,31 @@ export class DataExporterRepos {
     if (!tableObj) throw new Error(`Table ${table} not found`);
 
     try {
-      let where;
+      const conditions = [];
 
-      const conditions = config.relations.map((relation) => {
+      // 处理每个关联条件
+      for (const relation of config.relations) {
         const sourceData = existingData[relation.sourceTable] || [];
 
+        // 如果源数据为空，这个表可能无法查询到任何数据
+        if (sourceData.length === 0) {
+          console.log(
+            `Source table ${relation.sourceTable} has no data, skipping query for ${table}`,
+          );
+          return [];
+        }
+
         const sourceIds = sourceData.map((item) => item[relation.sourceField || 'id']);
-        console.log(sourceIds);
-        return inArray(tableObj[relation.field], sourceIds);
-      });
+        conditions.push(inArray(tableObj[relation.field], sourceIds));
+      }
+
+      // 如果表有userId字段并且不是users表，添加用户过滤
+      if ('userId' in tableObj && table !== 'users' && !config.relations) {
+        conditions.push(eq(tableObj.userId, this.userId));
+      }
 
-      where = conditions.length === 1 ? conditions[0] : and(...conditions);
+      // 组合所有条件
+      const where = conditions.length === 1 ? conditions[0] : and(...conditions);
 
       // @ts-expect-error query
       const result = await this.db.query[table].findMany({ where });
@@ -204,10 +221,22 @@ export class DataExporterRepos {
     console.log('Querying relation tables...');
     const relationResults = await pMap(
       DATA_EXPORT_CONFIG.relationTables,
-      async (config) => ({
-        data: await this.queryTable(config, result),
-        table: config.table,
-      }),
+      async (config) => {
+        // 检查所有依赖的源表是否有数据
+        const allSourcesHaveData = config.relations.every(
+          (relation) => (result[relation.sourceTable] || []).length > 0,
+        );
+
+        if (!allSourcesHaveData) {
+          console.log(`Skipping table ${config.table} as some source tables have no data`);
+          return { data: [], table: config.table };
+        }
+
+        return {
+          data: await this.queryTable(config, result),
+          table: config.table,
+        };
+      },
       { concurrency },
     );
 
diff --git a/src/features/User/UserPanel/useMenu.tsx b/src/features/User/UserPanel/useMenu.tsx
@@ -9,7 +9,6 @@ import {
   Feather,
   FileClockIcon,
   HardDriveDownload,
-  HardDriveUpload,
   LifeBuoy,
   LogOut,
   Mail,
@@ -32,10 +31,8 @@ import {
   UTM_SOURCE,
   mailTo,
 } from '@/const/url';
-import { isServerMode } from '@/const/version';
 import DataImporter from '@/features/DataImporter';
 import { usePWAInstall } from '@/hooks/usePWAInstall';
-import { configService } from '@/services/config';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
@@ -121,38 +118,6 @@ export const useMenu = () => {
           key: 'import',
           label: <DataImporter>{t('import')}</DataImporter>,
         },
-        isServerMode
-          ? null
-          : {
-              children: [
-                {
-                  key: 'allAgent',
-                  label: t('exportType.allAgent'),
-                  onClick: configService.exportAgents,
-                },
-                {
-                  key: 'allAgentWithMessage',
-                  label: t('exportType.allAgentWithMessage'),
-                  onClick: configService.exportSessions,
-                },
-                {
-                  key: 'globalSetting',
-                  label: t('exportType.globalSetting'),
-                  onClick: configService.exportSettings,
-                },
-                {
-                  type: 'divider',
-                },
-                {
-                  key: 'all',
-                  label: t('exportType.all'),
-                  onClick: configService.exportAll,
-                },
-              ],
-              icon: <Icon icon={HardDriveUpload} />,
-              key: 'export',
-              label: t('export'),
-            },
         {
           type: 'divider',
         },
diff --git a/src/locales/default/setting.ts b/src/locales/default/setting.ts
@@ -339,6 +339,22 @@ export default {
   },
   storage: {
     actions: {
+      export: {
+        button: '导出',
+        exportType: {
+          agent: '导出助手设定',
+          agentWithMessage: '导出助手和消息',
+          all: '导出全局设置和所有助手数据',
+          allAgent: '导出所有助手设定',
+          allAgentWithMessage: '导出所有助手和消息',
+          globalSetting: '导出全局设置',
+        },
+        title: '导出数据',
+      },
+      import: {
+        button: '导入',
+        title: '导入数据',
+      },
       title: '高级操作',
     },
     desc: '当前浏览器中的存储用量',
