Merge pull request #862 from chat2db/dev

Dev

Author: shanhexi

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 3.0.14
+
+`2023-11-20`
+
+**Changelog**
+
+- 🐞【Fixed】Team paging problem
+- 🐞【Fixed】Oracle service name bug
+- 🐞【Fixed】Oracle datatype error
+- 🐞【Fixed】Fixed an issue where MySQL changed table structure without displaying comments.
+- ⚡️【Optimize】Support database or schema
+- 【Developer】Friends don't worry, the company has some things recently, and is preparing 3.1.0, be patient
+
 ## 3.0.13
 
 `2023-11-15`

CHANGELOG_CN.md

@@ -1,3 +1,15 @@
+## 3.0.14
+
+`2023-11-20`
+
+**更新日志**
+
+- 🐞【修复】团队分页问题
+- 🐞【修复】Oracle服务名称错误
+- 🐞【修复】Oracle数据类型错误
+- 🐞【修复】修复MySQL修改表结构，不回显注释的问题。
+- ⚡️【优化】支持数据库或模式
+- 【开发者】友友们不要着急呀，最近公司有些事情，并且在准备3.1.0，耐心等待哦
 ## 3.0.13
 
 `2023-11-15`

chat2db-client/src/components/ConnectionEdit/config/dataSource.ts

@@ -450,8 +450,8 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
                 },
               }],
               onChange: (data: IConnectionConfig) => {
-                data.baseInfo.pattern = /jdbc:oracle:(.*):@\/\/(.*):(\d+):(.*)/;
-                data.baseInfo.template = 'jdbc:oracle:{driver}:@//{host}:{port}:{serviceName}';
+                data.baseInfo.pattern = /jdbc:oracle:(.*):@\/\/(.*):(\d+)\/(.*)/;
+                data.baseInfo.template = 'jdbc:oracle:{driver}:@//{host}:{port}/{serviceName}';
                 return data
               }
             },
@@ -470,15 +470,17 @@ export const dataSourceFormConfigs: IConnectionConfig[] = [
           labelTextAlign: 'right',
           selects: [
             {
-              value: 'thin',
+              value: 'THIN',
+              label: 'thin',
             },
             {
-
-              value: 'oci',
+              value: 'OCI',
+              label: 'oci',
             },
             {
 
-              value: 'oci8',
+              value: 'OCI8',
+              label: 'oci8',
             },
           ],
           styles: {

chat2db-client/src/pages/main/team/datasource-management/index.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Button, Input, Table, Popconfirm, message, Drawer } from 'antd';
 import { SearchOutlined, PlusOutlined } from '@ant-design/icons';
-import ConnectionServer from '@/service/connection'
+import ConnectionServer from '@/service/connection';
 import { createDataSource, deleteDataSource, getDataSourceList, updateDataSource } from '@/service/team';
 import { IConnectionDetails } from '@/typings';
 import { AffiliationType, IDataSourceVO } from '@/typings/team';
@@ -23,13 +23,13 @@ function DataSourceManagement() {
     showQuickJumper: true,
     // pageSizeOptions: ['10', '20', '30', '40'],
   });
-  const [showCreateConnection, setShowCreateConnection] = useState(false)
+  const [showCreateConnection, setShowCreateConnection] = useState(false);
   const connectionInfo = useRef<IConnectionDetails>();
 
   const [drawerInfo, setDrawerInfo] = useState<{ open: boolean; type: AffiliationType; id?: number }>({
     open: false,
-    type: AffiliationType['DATASOURCE_USER/TEAM']
-  })
+    type: AffiliationType['DATASOURCE_USER/TEAM'],
+  });
 
   const columns = useMemo(
     () => [
@@ -49,18 +49,24 @@ function DataSourceManagement() {
         width: 300,
         render: (_: any, record: IDataSourceVO) => (
           <>
-            <Button type='link' onClick={() => {
-              handleEdit(record)
-            }}>
+            <Button
+              type="link"
+              onClick={() => {
+                handleEdit(record);
+              }}
+            >
               {i18n('common.button.edit')}
             </Button>
-            <Button type='link' onClick={() => {
-              setDrawerInfo({
-                ...drawerInfo,
-                open: true,
-                id: record.id,
-              })
-            }}>
+            <Button
+              type="link"
+              onClick={() => {
+                setDrawerInfo({
+                  ...drawerInfo,
+                  open: true,
+                  id: record.id,
+                });
+              }}
+            >
               {i18n('team.action.rightManagement')}
             </Button>
             <Popconfirm
@@ -89,6 +95,10 @@ function DataSourceManagement() {
     let res = await getDataSourceList({ searchKey, pageNo, pageSize });
     if (res) {
       setDataSource(res?.data ?? []);
+      setPagination({
+        ...pagination,
+        total: res?.total ?? 0,
+      } as any);
     }
   };
 
@@ -100,7 +110,6 @@ function DataSourceManagement() {
   };
 
   const handleTableChange = (p: any) => {
-
     setPagination({
       ...pagination,
       ...p,
@@ -110,22 +119,22 @@ function DataSourceManagement() {
   const handleAddDataSource = () => {
     connectionInfo.current = undefined;
     setShowCreateConnection(true);
-  }
+  };
 
   const handleEdit = async (record: IDataSourceVO) => {
     const { id } = record;
     if (!id) {
       return;
     }
 
-    let detail = await ConnectionServer.getDetails({ id })
+    let detail = await ConnectionServer.getDetails({ id });
     connectionInfo.current = detail;
-    setShowCreateConnection(true)
-  }
+    setShowCreateConnection(true);
+  };
 
   const handleDelete = async (id?: number) => {
     if (isNumber(id)) {
-      await deleteDataSource({ id })
+      await deleteDataSource({ id });
       message.success(i18n('common.text.successfullyDelete'));
       queryDataSourceList();
     }
@@ -140,14 +149,12 @@ function DataSourceManagement() {
     const isUpdate = isValid(connectionInfo?.current?.id);
     const requestApi = isUpdate ? updateDataSource : createDataSource;
     try {
-      await requestApi({ ...connectionInfo.current })
-      message.success(isUpdate ? i18n('common.tips.updateSuccess') : i18n('common.tips.createSuccess'))
-      setShowCreateConnection(false)
-      queryDataSourceList()
-    } catch {
-
-    }
-  }
+      await requestApi({ ...connectionInfo.current });
+      message.success(isUpdate ? i18n('common.tips.updateSuccess') : i18n('common.tips.createSuccess'));
+      setShowCreateConnection(false);
+      queryDataSourceList();
+    } catch {}
+  };
 
   return (
     <div>
@@ -163,6 +170,11 @@ function DataSourceManagement() {
         </Button>
       </div>
       <Table
+        style={{
+          maxHeight: '82vh',
+          overflow: 'auto',
+        }}
+        sticky
         rowKey={'id'}
         dataSource={dataSource}
         columns={columns}
@@ -185,11 +197,11 @@ function DataSourceManagement() {
         onClose={() => {
           setDrawerInfo({
             ...drawerInfo,
-            open: false
-          })
+            open: false,
+          });
         }}
       />
-    </div >
+    </div>
   );
 }
 

chat2db-client/src/pages/main/team/index.less

@@ -1,4 +1,9 @@
 .teamWrapper {
   height: 100vh;
-  padding: 24px 36px;
+  padding: 14px 16px;
+  box-sizing: border-box;
+}
+
+.teamTabsBox{
+  height: 100%;
 }

chat2db-client/src/pages/main/team/index.tsx

@@ -33,6 +33,7 @@ const Team = () => {
   return (
     <div className={styles.teamWrapper}>
       <Tabs
+        className={styles.teamTabsBox}
         activeKey={activeKey}
         onChange={(activeKey) => setActiveKey(activeKey)}
         items={tabList.map((tab, index) => {

chat2db-client/src/pages/main/team/team-management/index.tsx

@@ -17,7 +17,7 @@ const requireRule = { required: true, message: i18n('common.form.error.required'
 
 function TeamManagement() {
   const [form] = Form.useForm();
-  const [loadding, setLoading] = useState(false)
+  const [loadding, setLoading] = useState(false);
   const [dataSource, setDataSource] = useState<ITeamVO[]>([]);
   const [pagination, setPagination] = useState({
     searchKey: '',
@@ -66,7 +66,7 @@ function TeamManagement() {
                   ...drawerInfo,
                   open: true,
                   teamId: record.id,
-                  type: AffiliationType.TEAM_USER
+                  type: AffiliationType.TEAM_USER,
                 });
               }}
             >
@@ -79,9 +79,10 @@ function TeamManagement() {
                   ...drawerInfo,
                   open: true,
                   teamId: record.id,
-                  type: AffiliationType.TEAM_DATASOURCE
+                  type: AffiliationType.TEAM_DATASOURCE,
                 });
-              }}>
+              }}
+            >
               {i18n('team.action.affiliation.datasource')}
             </Button>
             <Popconfirm
@@ -112,11 +113,14 @@ function TeamManagement() {
       let res = await getTeamManagementList({ searchKey, pageNo, pageSize });
       if (res) {
         setDataSource(res?.data ?? []);
+        setPagination({
+          ...pagination,
+          total: res?.total ?? 0,
+        } as any);
       }
     } catch (error) {
-
     } finally {
-      setLoading(false)
+      setLoading(false);
     }
   };
 
@@ -169,6 +173,11 @@ function TeamManagement() {
         </Button>
       </div>
       <Table
+        style={{
+          maxHeight: '82vh',
+          overflow: 'auto',
+        }}
+        sticky
         rowKey={'id'}
         loading={loadding}
         dataSource={dataSource}
@@ -192,7 +201,7 @@ function TeamManagement() {
             .catch((errorInfo) => {
               form.scrollToField(errorInfo.errorFields[0].name);
               form.setFields(errorInfo.errorFields);
-            })
+            });
         }}
         onCancel={() => {
           form.resetFields();

chat2db-client/src/pages/main/team/user-management/index.tsx

@@ -116,6 +116,10 @@ function UserManagement() {
     let res = await getUserManagementList({ searchKey, pageNo, pageSize });
     if (res) {
       setDataSource(res?.data ?? []);
+      setPagination({
+        ...pagination,
+        total: res?.total ?? 0,
+      } as any);
     }
   };
 
@@ -178,6 +182,11 @@ function UserManagement() {
         </Button>
       </div>
       <Table
+        style={{
+          maxHeight: '82vh',
+          overflow: 'auto',
+        }}
+        sticky
         rowKey={'id'}
         dataSource={dataSource}
         columns={columns}

chat2db-client/src/service/connection.ts

@@ -80,7 +80,7 @@ const downloadDriver = createRequest<{ dbType: string }, void>('/api/jdbc/driver
   method: 'get',
 });
 
-const saveDriver = createRequest<IUploadDriver, void>('/api/jdbc/driver/save', { errorLevel: false, method: 'post' });
+const saveDriver = createRequest<IUploadDriver, void>('/api/jdbc/driver/save', { method: 'post' });
 
 const getEnvList = createRequest<void, IConnectionEnv[]>('/api/common/environment/list_all', { errorLevel: false });
 

chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/clickhouse.json

@@ -1,5 +1,7 @@
 {
   "dbType": "CLICKHOUSE",
+  "supportDatabase": false,
+  "supportSchema": false,
   "driverConfigList": [
     {
       "url": "jdbc:clickhouse://localhost:8123/",