fix conflict

Author: JerryFan626

chat2db-client/src/assets/logo/logo.png

@@ -171,9 +171,12 @@ function Console(props: IProps, ref: ForwardedRef<IConsoleRef>) {
     };
   }, [isActive]);
 
-  function timingAutoSave() {
+  function timingAutoSave(status?: ConsoleStatus) {
+    if (timerRef.current) {
+      clearInterval(timerRef.current);
+    }
     timerRef.current = setInterval(() => {
-      if (executeParams.status === ConsoleStatus.RELEASE) {
+      if (executeParams.status === ConsoleStatus.RELEASE || status === ConsoleStatus.RELEASE) {
         const p: any = {
           id: executeParams.consoleId,
           ddl: editorRef?.current?.getAllContent(),
@@ -186,7 +189,7 @@ function Console(props: IProps, ref: ForwardedRef<IConsoleRef>) {
           userId: getCookie('CHAT2DB.USER_ID'),
         });
       }
-    }, 2000);
+    }, 5000);
   }
 
   const tableListName = useMemo(() => {
@@ -386,6 +389,7 @@ function Console(props: IProps, ref: ForwardedRef<IConsoleRef>) {
       indexedDB.deleteData('chat2db', 'workspaceConsoleDDL', executeParams.consoleId!);
       message.success(i18n('common.tips.saveSuccessfully'));
       props.onConsoleSave && props.onConsoleSave();
+      timingAutoSave(ConsoleStatus.RELEASE);
     });
   };
 

chat2db-client/src/components/Console/index.tsx

@@ -244,9 +244,9 @@ export function formatSql(sql: string, dbType: DatabaseTypeCode) {
 // 桌面端用hash模式，web端用history模式，路由跳转
 export function navigate(path: string) {
   if (__ENV__ === 'desktop') {
-    window.location.href = `#${path}`;
+    window.location.replace(`#${path}`)
   } else {
-    window.location.href = path;
+    window.location.replace(path)
   }
 }
 

chat2db-client/src/utils/index.ts

@@ -108,7 +108,7 @@ public void generate(String databaseName, OutputStream outputStream, ExportOptio
         try {
             export(outputStream, exportOptions);
         } catch (Exception e) {
-            throw new RuntimeException("导出失败！请联系开发者，邮箱：[email protected]" + e);
+            throw new RuntimeException("导出失败！请联系开发者" + e);
         }
         init();
     }