fix:connection save bug

shanhexi · shanhexi · commit 88fd4d8a7b54 · 2023-12-13T13:58:29.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 `2023-12-13`
 
-**更新日志**
+**Changelog**
 
-- 🐞【修复】切换Tabs时，表空白问题
-- 🐞【修复】DM、Oracle无法显示Schema问题
-- 🐞【修复】导入链接丢失问题
+- 🐞【Fixed】Table blank problem when switching Tabs
+- 🐞【Fixed】DM or Oracle cannot display Schema
+- 🐞【Fixed】The import connection is lost. Procedure
 
 ## 3.1.0
 
diff --git a/chat2db-client/src/components/ConnectionEdit/index.tsx b/chat2db-client/src/components/ConnectionEdit/index.tsx
@@ -15,7 +15,7 @@ import LoadingGracile from '@/components/Loading/LoadingGracile';
 import Driver from './components/Driver';
 
 // ----- store -----
-import { useConnectionStore } from '@/pages/main/store/connection';
+import { useConnectionStore, getConnectionList } from '@/pages/main/store/connection';
 
 const { Option } = Select;
 
@@ -30,7 +30,6 @@ export enum submitType {
 interface IProps {
   closeCreateConnection: () => void;
   connectionData: IConnectionDetails;
-  submitCallback?: any;
   submit?: (data: IConnectionDetails) => Promise<any>;
 }
 
@@ -39,7 +38,7 @@ export interface ICreateConnectionFunction {
 }
 
 const ConnectionEdit = forwardRef((props: IProps, ref: ForwardedRef<ICreateConnectionFunction>) => {
-  const { closeCreateConnection, submitCallback, connectionData, submit } = props;
+  const { closeCreateConnection, connectionData, submit } = props;
   const [baseInfoForm] = Form.useForm();
   const [sshForm] = Form.useForm();
   const [driveData, setDriveData] = useState<any>({});
@@ -200,7 +199,6 @@ const ConnectionEdit = forwardRef((props: IProps, ref: ForwardedRef<ICreateConne
     }
 
     const api: any = connectionService[type](p);
-
     api
       .then((res: any) => {
         if (type === submitType.TEST) {
@@ -216,13 +214,13 @@ const ConnectionEdit = forwardRef((props: IProps, ref: ForwardedRef<ICreateConne
               : i18n('common.message.addedSuccessfully'),
           );
 
-          setBackfillData({
-            ...backfillData,
-            id: res,
-          });
-
+          getConnectionList();
+          
           if (type === submitType.SAVE) {
-            submitCallback?.();
+            setBackfillData({
+              ...backfillData,
+              id: res,
+            });
           }
         }
       })
diff --git a/chat2db-client/src/utils/index.ts b/chat2db-client/src/utils/index.ts
@@ -227,17 +227,30 @@ export function getCookie(name: string) {
   return null;
 }
 
-// 注释出参的含义
+// 判断两个版本的大小
 export function compareVersion(version1: string, version2: string) {
-  const version1Arr = version1.split('.');
-  const version2Arr = version2.split('.');
-  const v1 = Number(version1Arr.join(''));
-  const v2 = Number(version2Arr.join(''));
-  if (v1 > v2) {
-    return 1;
-  } else if (v1 < v2) {
-    return -1;
+  const v1 = version1.split('.');
+  const v2 = version2.split('.');
+  const len = Math.max(v1.length, v2.length);
+  
+  while (v1.length < len) {
+    v1.push('0');
   }
+  while (v2.length < len) {
+    v2.push('0');
+  }
+
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i]);
+    const num2 = parseInt(v2[i]);
+
+    if (num1 > num2) {
+      return 1;
+    } else if (num1 < num2) {
+      return -1;
+    }
+  }
+
   return 0;
 }
 
