diff --git a/webapp/packages/supersonic-fe/config/proxy.ts b/webapp/packages/supersonic-fe/config/proxy.ts index 7d956b9a4..166919713 100644 --- a/webapp/packages/supersonic-fe/config/proxy.ts +++ b/webapp/packages/supersonic-fe/config/proxy.ts @@ -1,8 +1,7 @@ export default { dev: { '/api/': { - target: 'http://10.91.210.65:9080', - // target: 'http://s2.tmeoa.com', + target: 'http://localhost:9080', changeOrigin: true, }, }, diff --git a/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less b/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less new file mode 100644 index 000000000..57c672723 --- /dev/null +++ b/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.less @@ -0,0 +1,10 @@ +.tableHeaderTitle { + margin-left: 20px; + .headerTitleLabel { + color: #667085; + font-size: 14px; + font-weight: 400; + width: max-content; + display: flex; + } +} diff --git a/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.tsx b/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.tsx new file mode 100644 index 000000000..7df4c7820 --- /dev/null +++ b/webapp/packages/supersonic-fe/src/components/TableHeaderFilter/index.tsx @@ -0,0 +1,28 @@ +import { Space } from 'antd'; +import React, { ReactNode } from 'react'; + +import styles from './index.less'; + +type Props = { + components: { + label: string; + component: ReactNode; + }[]; +}; + +const TableHeaderFilter: React.FC = ({ components }) => { + return ( + <> + + {components.map(({ label, component }) => ( + + {label}: + {component} + + ))} + + + ); +}; + +export default TableHeaderFilter; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx index 805589098..4eb45e6b3 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx @@ -15,7 +15,7 @@ import { import DimensionInfoModal from './DimensionInfoModal'; import DimensionValueSettingModal from './DimensionValueSettingModal'; import { ISemantic, IDataSource } from '../data'; -import TableHeaderFilter from './TableHeaderFilter'; +import TableHeaderFilter from '@/components/TableHeaderFilter'; import BatchCtrlDropDownButton from '@/components/BatchCtrlDropDownButton'; import { ColumnsConfig } from './TableColumnRender'; import BatchSensitiveLevelModal from '@/components/BatchCtrlDropDownButton/BatchSensitiveLevelModal'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx index 153ad7eca..e15d32046 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx @@ -17,7 +17,7 @@ import { import MetricInfoCreateForm from './MetricInfoCreateForm'; import BatchCtrlDropDownButton from '@/components/BatchCtrlDropDownButton'; import BatchSensitiveLevelModal from '@/components/BatchCtrlDropDownButton/BatchSensitiveLevelModal'; -import TableHeaderFilter from './TableHeaderFilter'; +import TableHeaderFilter from '@/components/TableHeaderFilter'; import styles from './style.less'; import { ISemantic } from '../data'; import { ColumnsConfig } from './TableColumnRender'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx index c87a97553..1ecd296da 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx @@ -7,7 +7,7 @@ import { useModel } from '@umijs/max'; import { deleteModel, batchUpdateModelStatus } from '../service'; import ClassModelTypeModal from './ClassModelTypeModal'; import { ColumnsConfig } from './TableColumnRender'; -import TableHeaderFilter from './TableHeaderFilter'; +import TableHeaderFilter from '@/components/TableHeaderFilter'; import moment from 'moment'; import styles from './style.less'; import { ISemantic } from '../data'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx index be0c0a2cb..6ed97b7e2 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx @@ -1,6 +1,6 @@ import type { ActionType, ProColumns } from '@ant-design/pro-components'; import { ProTable } from '@ant-design/pro-components'; -import { message, Button, Space, Popconfirm, Typography } from 'antd'; +import { message, Button, Space, Popconfirm, Typography, Input } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import { useModel } from '@umijs/max'; import { getTermList, saveOrUpdate, deleteTerm } from '../../service'; @@ -8,6 +8,8 @@ import dayjs from 'dayjs'; import styles from '../style.less'; import { ISemantic } from '../../data'; import TermCreateForm from './TermCreateForm'; +import { isArrayOfValues } from '@/utils/utils'; +import TableHeaderFilter from '@/components/TableHeaderFilter'; const { Paragraph } = Typography; @@ -21,16 +23,19 @@ const TermTable: React.FC = ({}) => { const [tableData, setTableData] = useState([]); const [loading, setLoading] = useState(false); - + const [selectedRowKeys, setSelectedRowKeys] = useState([]); const actionRef = useRef(); useEffect(() => { queryTermList(); }, [selectDomainId]); - const queryTermList = async () => { + const queryTermList = async (queryKey?: string) => { setLoading(true); - const { code, data, msg } = await getTermList(selectDomainId); + const { code, data, msg } = await getTermList({ + domainId: selectDomainId, + queryKey, + }); setLoading(false); if (code === 200) { setTableData(data || []); @@ -53,10 +58,11 @@ const TermTable: React.FC = ({}) => { } }; - const deleteTermConfig = async (termItem: ISemantic.ITermItem) => { - const { code, msg } = await deleteTerm(termItem.id); + const deleteTermConfig = async (ids: number[]) => { + const { code, msg } = await deleteTerm({ ids }); if (code === 200) { queryTermList(); + setSelectedRowKeys([]); } else { message.error(msg); } @@ -125,7 +131,7 @@ const TermTable: React.FC = ({}) => { okText="是" cancelText="否" onConfirm={() => { - deleteTermConfig(record); + deleteTermConfig([record.id]); }} > , + , ]} /> {createModalVisible && ( diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts b/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts index 46c831a43..9b772227a 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts @@ -760,12 +760,10 @@ export function batchUpdateMetricSensitiveLevel(data: any): Promise { }); } -export function getTermList(domainId: number): Promise { +export function getTermList(data: any): Promise { return request(`${process.env.API_BASE_URL}term`, { method: 'GET', - params: { - domainId, - }, + params: data, }); } @@ -776,8 +774,9 @@ export function saveOrUpdate(data: any): Promise { }); } -export function deleteTerm(id: number): Promise { - return request(`${process.env.API_BASE_URL}term/${id}`, { - method: 'DELETE', +export function deleteTerm(data: any): Promise { + return request(`${process.env.API_BASE_URL}term/deleteBatch`, { + method: 'POST', + data: { ...data }, }); }