Skip to content

Commit eb52421

Browse files
author
fanjin.fjy
committed
feat: Optimize code
1 parent f934f9f commit eb52421

9 files changed

Lines changed: 50 additions & 20 deletions

File tree

‎chat2db-client/src/blocks/Setting/AiSetting/index.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import i18n from '@/i18n';
66
import classnames from 'classnames';
77
import { IAiConfig } from '@/typings/setting';
88
import styles from './index.less';
9+
import Popularize from '@/components/Popularize';
910
interface IProps {
1011
handleApplyAiConfig: (aiConfig: IAiConfig) => void;
1112
aiConfig: IAiConfig;
@@ -201,10 +202,8 @@ export default function SettingAI(props: IProps) {
201202
{i18n('setting.button.apply')}
202203
</Button>
203204
</div>
204-
{/* {aiConfig?.aiSqlSource === AiSqlSourceType.CHAT2DBAI && (
205-
<Popularize source='setting'></Popularize>
206-
)
207-
} */}
205+
206+
{aiConfig?.aiSqlSource === AiSqlSourceType.CHAT2DBAI && !aiConfig.apiKey && <Popularize source="setting" />}
208207
</>
209208
);
210209
}

‎chat2db-client/src/components/Popularize/index.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ interface IProps {
99
imageUrl?: string;
1010
tip?: string;
1111
}
12-
const url = 'https://oss-chat2db.alibaba.com/static/wechat.webp';
12+
const url =
13+
'http://oss.sqlgpt.cn/static/chat2db-wechat.jpg?x-oss-process=image/auto-orient,1/resize,m_lfit,w_256/quality,Q_80/format,webp';
1314
export default memo<IProps>(function Popularize(props) {
1415
const { className } = props;
1516

@@ -19,7 +20,7 @@ export default memo<IProps>(function Popularize(props) {
1920
}
2021
let dom;
2122
if (props.source === 'setting') {
22-
dom = <p>{i18n('common.text.wechatPopularizeAi2')}</p>;
23+
dom = <p>{'关注公众号获取AI Key'}</p>;
2324
} else {
2425
dom = <p>{i18n('common.text.wechatPopularizeAi')}</p>;
2526
}

chat2db-client/src/components/SearchResult/Pagination.less renamed to chat2db-client/src/components/SearchResult/Pagination/index.less

File renamed without changes.

chat2db-client/src/components/SearchResult/Pagination.tsx renamed to chat2db-client/src/components/SearchResult/Pagination/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Button, InputNumber, Popover, Select } from 'antd';
55
import { IResultConfig } from '@/typings';
66
import i18n from '@/i18n';
77
import _ from 'lodash';
8-
import styles from './Pagination.less';
8+
import styles from './index.less';
99

1010
interface IProps {
1111
onPageSizeChange?: (pageSize: number) => void;

chat2db-client/src/components/SearchResult/TableBox.less renamed to chat2db-client/src/components/SearchResult/TableBox/index.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../styles/var.less';
1+
@import '../../../styles/var.less';
22

33
.tableBox {
44
position: absolute;

chat2db-client/src/components/SearchResult/TableBox.tsx renamed to chat2db-client/src/components/SearchResult/TableBox/index.tsx

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
import React, { useEffect, useMemo, useState } from 'react';
1+
import React, { useMemo, useState } from 'react';
22
import { TableDataType } from '@/constants/table';
3-
import { IManageResultData, IResultConfig, ITableHeaderItem } from '@/typings/database';
3+
import { IManageResultData, IResultConfig } from '@/typings/database';
44
import { formatDate } from '@/utils/date';
5-
import { Button, message, Modal, Pagination, Select, Table } from 'antd';
6-
import antd from 'antd';
7-
import { BaseTable, ArtColumn, useTablePipeline, features, SortItem, BaseTableProps } from 'ali-react-table';
8-
import Iconfont from '../Iconfont';
5+
import { Button, message, Modal } from 'antd';
6+
import { BaseTable, ArtColumn, useTablePipeline, features, SortItem } from 'ali-react-table';
7+
import Iconfont from '../../Iconfont';
98
import classnames from 'classnames';
10-
import StateIndicator from '../StateIndicator';
11-
import MonacoEditor from '../Console/MonacoEditor';
9+
import StateIndicator from '../../StateIndicator';
10+
import MonacoEditor from '../../Console/MonacoEditor';
1211
import { useTheme } from '@/hooks/useTheme';
1312
import styled from 'styled-components';
14-
import styles from './TableBox.less';
1513
import { ThemeType } from '@/constants';
1614
import i18n from '@/i18n';
1715
import { compareStrings } from '@/utils/sort';
18-
import MyPagination from './Pagination';
16+
import MyPagination from '../Pagination';
17+
import styles from './index.less';
1918

2019
interface ITableProps {
2120
className?: string;
@@ -189,6 +188,16 @@ export default function TableBox(props: ITableProps) {
189188
onClickTotalBtn={onClickTotalBtn}
190189
/>
191190
</div>
191+
{/* <div className={styles.toolBarItem}>
192+
<Button
193+
type='text'
194+
onClick={() => {
195+
console.log('config', config);
196+
}}
197+
>
198+
导出Excel
199+
</Button>
200+
</div> */}
192201
</div>
193202
<DarkSupportBaseTable
194203
className={classnames({ dark: isDarkTheme }, props.className, styles.table)}

‎chat2db-client/src/components/SearchResult/index.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import React, { memo, useEffect, useState, useRef, useMemo, Fragment } from 'react';
1+
import React, { memo, useEffect, useState, useMemo, Fragment } from 'react';
22
import classnames from 'classnames';
33
import Tabs, { IOption } from '@/components/Tabs';
44
import Iconfont from '@/components/Iconfont';
55
import StateIndicator from '@/components/StateIndicator';
66
import { Spin, Popover } from 'antd';
7-
import { StatusType } from '@/constants';
87
import { IManageResultData, IResultConfig } from '@/typings';
98
import i18n from '@/i18n';
109
import TableBox from './TableBox';

‎chat2db-client/src/service/sql.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import createRequest from './base';
22
import { IPageResponse, IPageParams, IUniversalTableParams, IManageResultData } from '@/typings';
33
import { DatabaseTypeCode } from '@/constants';
4+
import { ExportSizeEnum, ExportTypeEnum } from '@/typings/resultTable';
45

56
export interface IGetListParams extends IPageParams {
67
dataSourceId: number;
@@ -114,6 +115,16 @@ const deleteTablePin = createRequest<IUniversalTableParams, void>('/api/pin/tabl
114115
/** 获取当前执行SQL 所有行 */
115116
const getDMLCount = createRequest<IExecuteSqlParams, number>('/api/rdb/dml/count', { method: 'post' });
116117

118+
export interface IExportParams extends IExecuteSqlParams {
119+
originalSql: string;
120+
exportType: ExportTypeEnum;
121+
exportSize: ExportSizeEnum;
122+
}
123+
/**
124+
* 导出-表格
125+
*/
126+
const exportResultTable = createRequest<IExportParams, any>('/api/rdb/dml/export', { method: 'post' });
127+
117128
export default {
118129
getList,
119130
executeSql,
@@ -131,4 +142,5 @@ export default {
131142
addTablePin,
132143
deleteTablePin,
133144
getDMLCount,
145+
exportResultTable
134146
};

‎chat2db-client/src/typings/resultTable.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { IExecuteSqlParams } from '@/service/sql';
2+
3+
export enum ExportTypeEnum {
4+
CSV = 'CSV',
5+
INSERT = 'INSERT',
6+
}
7+
export enum ExportSizeEnum {
8+
CURRENT_PAGE = 'CURRENT_PAGE',
9+
ALL = 'ALL',
10+
}

0 commit comments

Comments
 (0)