Merge pull request #8 from suwubee/dev-split

修复导出空白
suwubee · Jan 20, 2025 · 83b7166 · 83b7166
2 parents 65eda53 + 1bac579
commit 83b7166
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 12 deletions.
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "./static/css/main.5c16e056.css",
-    "main.js": "./static/js/main.56f2db6f.js",
+    "main.js": "./static/js/main.3b48708e.js",
     "static/js/139.cdc23c38.chunk.js": "./static/js/139.cdc23c38.chunk.js",
     "index.html": "./index.html",
     "main.5c16e056.css.map": "./static/css/main.5c16e056.css.map",
-    "main.56f2db6f.js.map": "./static/js/main.56f2db6f.js.map",
+    "main.3b48708e.js.map": "./static/js/main.3b48708e.js.map",
     "139.cdc23c38.chunk.js.map": "./static/js/139.cdc23c38.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.5c16e056.css",
-    "static/js/main.56f2db6f.js"
+    "static/js/main.3b48708e.js"
   ]
 }
diff --git a/build/index.html b/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.56f2db6f.js"></script><link href="./static/css/main.5c16e056.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.3b48708e.js"></script><link href="./static/css/main.5c16e056.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/build/static/js/main.56f2db6f.js → build/static/js/main.3b48708e.js b/build/static/js/main.56f2db6f.js → build/static/js/main.3b48708e.js
diff --git a/build/static/js/main.56f2db6f.js.LICENSE.txt → build/static/js/main.3b48708e.js.LICENSE.txt b/build/static/js/main.56f2db6f.js.LICENSE.txt → build/static/js/main.3b48708e.js.LICENSE.txt
diff --git a/build/static/js/main.56f2db6f.js.map → build/static/js/main.3b48708e.js.map b/build/static/js/main.56f2db6f.js.map → build/static/js/main.3b48708e.js.map
diff --git a/src/services/exportImportService.js b/src/services/exportImportService.js
@@ -34,10 +34,19 @@ const createDynamicConfig = () => ({
  * @returns {string} 下载文件的URL
  */
 export const exportChatData = (chatHistories, configurations, selectedConfig) => {
+  // 过滤掉系统配置
+  const configsToExport = configurations.filter(config => !config.isSystemConfig);
+
+  // 如果选中的配置是系统配置，使用第一个非系统配置
+  let selectedConfigToExport = selectedConfig;
+  if (selectedConfig.isSystemConfig) {
+    selectedConfigToExport = configsToExport[0] || null;
+  }
+
   const dataStr = JSON.stringify({
     chatHistories,
-    configurations,
-    selectedConfig,
+    configurations: configsToExport,
+    selectedConfig: selectedConfigToExport,
   }, null, 2);
   const blob = new Blob([dataStr], { type: 'application/json' });
   return URL.createObjectURL(blob);
@@ -73,9 +82,18 @@ export const importChatData = (jsonString) => {
  * @returns {string} 下载文件的URL
  */
 export const exportConfigurations = (configurations, selectedConfig) => {
+  // 过滤掉系统配置
+  const configsToExport = configurations.filter(config => !config.isSystemConfig);
+
+  // 如果选中的配置是系统配置，使用第一个非系统配置
+  let selectedConfigToExport = selectedConfig;
+  if (selectedConfig.isSystemConfig) {
+    selectedConfigToExport = configsToExport[0] || null;
+  }
+
   const dataStr = JSON.stringify({
-    configurations,
-    selectedConfig,
+    configurations: configsToExport,
+    selectedConfig: selectedConfigToExport,
   }, null, 2);
   const blob = new Blob([dataStr], { type: 'application/json' });
   return URL.createObjectURL(blob);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.56f2db6f.js"></script><link href="./static/css/main.5c16e056.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.3b48708e.js"></script><link href="./static/css/main.5c16e056.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>