Commit 41a93931 authored by jaden's avatar jaden

improve: improve ui

parent 553a7038
...@@ -11,9 +11,24 @@ export type DBInfo = { ...@@ -11,9 +11,24 @@ export type DBInfo = {
password: string; password: string;
database: string; database: string;
client: 'mysql2'; client: 'mysql2';
name?: string name?: string;
}; };
export interface Query {
schemaId: string;
DbID: string;
name: string;
content: {
executions: {
content: string;
type: string;
};
params: Record<string, any>;
info: { queryDescription: string; queryName: string };
functions?: string;
};
}
export default class ConnectDb { export default class ConnectDb {
static create(config: DBInfo) { static create(config: DBInfo) {
return backendApi.post('query/testConnectDb', config); return backendApi.post('query/testConnectDb', config);
...@@ -21,41 +36,30 @@ export default class ConnectDb { ...@@ -21,41 +36,30 @@ export default class ConnectDb {
static getDbDBML(config: DBInfo) { static getDbDBML(config: DBInfo) {
return backendApi.post('query/getDbDBML', config); return backendApi.post('query/getDbDBML', config);
} }
static addDbForSchema(params: { static addDbForSchema(params: { config: DBInfo; schemaId: string; name: string }) {
'config': DBInfo, return backendApi.post('query/createDbConnect', params);
'schemaId':string,
'name':string
}) {
return backendApi.post('query/createDbConnect',params);
} }
static getAllForSchema(schemaId:string) { static getAllForSchema(schemaId: string) {
return backendApi.get(`query/${schemaId}/DbConnect`); return backendApi.get(`query/${schemaId}/DbConnect`);
} }
static removeDbForSchema(DbID:string) { static removeDbForSchema(DbID: string) {
return backendApi.delete(`query/DbConnect/${DbID}`); return backendApi.delete(`query/DbConnect/${DbID}`);
} }
static addQuery(query: { static addQuery(query: Query) {
schemaId:string, return backendApi.post('query/add', query);
DbID:string, }
name:string, static deleteQuery(queryId: string) {
content: { return backendApi.delete(`/query/${queryId}`);
executions:{
content: string;
type: string
},
params:Record<string,any>
info: { queryDescription:string,queryName:string}
}
}) {
return backendApi.post("query/add",query)
}
static deleteQuery(queryId:string) {
return backendApi.delete(`/query/${queryId}`)
} }
static getQueries(schemaId: string) { static getQueries(schemaId: string) {
return backendApi.get(`query/${schemaId}/queries`) return backendApi.get(`query/${schemaId}/queries`);
}
static runQuery(queryId: string, params: Record<string, any>) {
return backendApi.post(`query/run/${queryId}`, { params });
} }
static runQuery(queryId: string,params:Record<string, any>) { static updateQuery(queryId: string, functions: string) {
return backendApi.post(`query/run/${queryId}`,{params}) return backendApi.put(`/query/${queryId}`, {
functions,
});
} }
} }
This diff is collapsed.
...@@ -38,7 +38,7 @@ const { ...@@ -38,7 +38,7 @@ const {
const FormItem = Form.Item; const FormItem = Form.Item;
export const DataTable = ({ data: preViewDataArr, loading }: any) => { export const DataTable = ({ data: preViewDataArr, loading, id, content, functions }: any) => {
const { t } = useTranslation('queriesList'); const { t } = useTranslation('queriesList');
return ( return (
<div> <div>
...@@ -52,7 +52,10 @@ export const DataTable = ({ data: preViewDataArr, loading }: any) => { ...@@ -52,7 +52,10 @@ export const DataTable = ({ data: preViewDataArr, loading }: any) => {
<div> <div>
<div> <div>
<ChatView <ChatView
content={content}
id={id}
props={data[0]} props={data[0]}
functions={functions}
defaultNode={ defaultNode={
<Table <Table
loading={loading} loading={loading}
...@@ -101,6 +104,7 @@ function Item({ ...@@ -101,6 +104,7 @@ function Item({
id, id,
getListFx, getListFx,
queryDescription, queryDescription,
functions,
}: { }: {
name: string; name: string;
i: number; i: number;
...@@ -115,6 +119,7 @@ function Item({ ...@@ -115,6 +119,7 @@ function Item({
id: string; id: string;
getListFx: () => any; getListFx: () => any;
queryDescription: string; queryDescription: string;
functions: string;
}) { }) {
const [active, setActive] = useState(false); const [active, setActive] = useState(false);
const [formInstance] = Form.useForm(); const [formInstance] = Form.useForm();
...@@ -283,7 +288,13 @@ function Item({ ...@@ -283,7 +288,13 @@ function Item({
style={{ marginBottom: 20 }} style={{ marginBottom: 20 }}
labelStyle={{ paddingRight: 36 }} labelStyle={{ paddingRight: 36 }}
/> />
<DataTable data={previewData} loading={isRun} /> <DataTable
data={previewData}
loading={isRun}
id={id}
content={content}
functions={functions}
/>
</div> </div>
) : null} ) : null}
</Card> </Card>
...@@ -345,6 +356,7 @@ function QueriesRender({ modelId, refresh }: { modelId: string; refresh?: boolea ...@@ -345,6 +356,7 @@ function QueriesRender({ modelId, refresh }: { modelId: string; refresh?: boolea
i={index} i={index}
updatedAt={updatedAt} updatedAt={updatedAt}
content={get(content, 'executions', [])} content={get(content, 'executions', [])}
functions={get(content, 'functions', '')}
params={get(content, 'params', {})} params={get(content, 'params', {})}
queryDescription={get(content, 'info.queryDescription')} queryDescription={get(content, 'info.queryDescription')}
id={id} id={id}
......
...@@ -35,6 +35,9 @@ dependencies: ...@@ -35,6 +35,9 @@ dependencies:
'@types/react-dom': '@types/react-dom':
specifier: 18.0.10 specifier: 18.0.10
version: 18.0.10 version: 18.0.10
acorn:
specifier: ^8.10.0
version: 8.10.0
autoprefixer: autoprefixer:
specifier: ^10.4.13 specifier: ^10.4.13
version: 10.4.13(postcss@8.4.14) version: 10.4.13(postcss@8.4.14)
...@@ -131,6 +134,9 @@ dependencies: ...@@ -131,6 +134,9 @@ dependencies:
styled-components: styled-components:
specifier: 6.0.0-rc.3 specifier: 6.0.0-rc.3
version: 6.0.0-rc.3(react-dom@18.2.0)(react@18.2.0) version: 6.0.0-rc.3(react-dom@18.2.0)(react@18.2.0)
sucrase:
specifier: ^3.32.0
version: 3.32.0
swr: swr:
specifier: ^2.0.3 specifier: ^2.0.3
version: 2.0.3(react@18.2.0) version: 2.0.3(react@18.2.0)
...@@ -2503,12 +2509,12 @@ packages: ...@@ -2503,12 +2509,12 @@ packages:
eslint-visitor-keys: 3.3.0 eslint-visitor-keys: 3.3.0
dev: false dev: false
/acorn-jsx@5.3.2(acorn@8.8.2): /acorn-jsx@5.3.2(acorn@8.10.0):
resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
peerDependencies: peerDependencies:
acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
dependencies: dependencies:
acorn: 8.8.2 acorn: 8.10.0
dev: false dev: false
/acorn-node@1.8.2: /acorn-node@1.8.2:
...@@ -2530,8 +2536,8 @@ packages: ...@@ -2530,8 +2536,8 @@ packages:
hasBin: true hasBin: true
dev: false dev: false
/acorn@8.8.2: /acorn@8.10.0:
resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==} resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
engines: {node: '>=0.4.0'} engines: {node: '>=0.4.0'}
hasBin: true hasBin: true
dev: false dev: false
...@@ -3594,8 +3600,8 @@ packages: ...@@ -3594,8 +3600,8 @@ packages:
resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==} resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
dependencies: dependencies:
acorn: 8.8.2 acorn: 8.10.0
acorn-jsx: 5.3.2(acorn@8.8.2) acorn-jsx: 5.3.2(acorn@8.10.0)
eslint-visitor-keys: 3.3.0 eslint-visitor-keys: 3.3.0
dev: false dev: false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment