diff --git a/webapp/packages/supersonic-fe/package.json b/webapp/packages/supersonic-fe/package.json index 2eb34d4d8..30a486685 100644 --- a/webapp/packages/supersonic-fe/package.json +++ b/webapp/packages/supersonic-fe/package.json @@ -57,9 +57,8 @@ "dependencies": { "@ant-design/icons": "^5.2.6", "@ant-design/pro-card": "^2.5.26", - "@ant-design/pro-components": "^2.6.41", + "@ant-design/pro-components": "2.7.0", "@ant-design/pro-layout": "^7.17.15", - "@ant-design/pro-table": "^3.13.9", "@antv/dom-util": "^2.0.4", "@antv/g6": "^4.8.23", "@antv/g6-core": "^0.8.23", diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/Market.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/Market.tsx index f52b38bc6..053ccf57f 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/Market.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/Market.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Space, Popconfirm } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx index c59afe0ec..3184483fb 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/ClassTagTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input, Select } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagObjectTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagObjectTable.tsx index 74b611ef7..5a80f6e05 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagObjectTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Insights/components/TagObjectTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input, Select } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Market.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Market.tsx index 322cb920b..71d58f636 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Market.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/Market.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Space, Popconfirm, Tag, Spin, Tooltip } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewTable.tsx index 7d930a661..cd254c903 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/View/components/ViewTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input, Tag } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import { StatusEnum } from '../../enum'; 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 8b2b0c964..32ce3279b 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input, Tag, Select } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; 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 44519d6d5..41a285967 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input, Select, Tag } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx index 5139a9752..b320e4f0c 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonEditTable.tsx @@ -1,9 +1,9 @@ -import type { ActionType } from '@ant-design/pro-table'; +import type { ActionType } from '@ant-design/pro-components'; import type { Ref, ReactNode } from 'react'; import { Space, message } from 'antd'; import React, { useRef, forwardRef, useImperativeHandle, useState, useEffect } from 'react'; -import { EditableProTable } from '@ant-design/pro-table'; +import { EditableProTable } from '@ant-design/pro-components'; type Props = { title?: string; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseTable.tsx index 312268231..ab2f48f37 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Database/DatabaseTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import DatabaseSettingModal from './DatabaseSettingModal'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx index 602a775fc..3d988ff7c 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricFieldFormTable.tsx @@ -1,6 +1,6 @@ import React, { useState, useRef, useEffect } from 'react'; import { Button, Tag, Space } from 'antd'; -import ProTable from '@ant-design/pro-table'; +import { ProTable } from '@ant-design/pro-components'; import ProCard from '@ant-design/pro-card'; import SqlEditor from '@/components/SqlEditor'; import styles from './style.less'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx index 97f28fb65..2b0f88ad4 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx @@ -1,6 +1,6 @@ import React, { useState, useRef, useEffect } from 'react'; import { Input, Space, Tag } from 'antd'; -import ProTable from '@ant-design/pro-table'; +import { ProTable } from '@ant-design/pro-components'; import ProCard from '@ant-design/pro-card'; import SqlEditor from '@/components/SqlEditor'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx index 66e79d561..2ade6f363 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMetricFormTable.tsx @@ -1,6 +1,6 @@ import React, { useState, useRef, useEffect } from 'react'; import { Tag, Space } from 'antd'; -import ProTable from '@ant-design/pro-table'; +import { ProTable } from '@ant-design/pro-components'; import ProCard from '@ant-design/pro-card'; import SqlEditor from '@/components/SqlEditor'; import FormLabelRequire from './FormLabelRequire'; 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 f1813443a..5d2cfdfaa 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Input } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import { StatusEnum } from '../enum'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionTable.tsx index a80886efe..f5d624935 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionTable.tsx @@ -1,5 +1,5 @@ -import type { ActionType, ProColumns } from '@ant-design/pro-table'; -import ProTable from '@ant-design/pro-table'; +import type { ActionType, ProColumns } from '@ant-design/pro-components'; +import { ProTable } from '@ant-design/pro-components'; import { message, Button, Space, Popconfirm, Tooltip } from 'antd'; import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx index 9fdbcfed3..ac2e4f6e2 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/TagDimensionFormTable.tsx @@ -1,6 +1,6 @@ import React, { useState, useRef, useEffect } from 'react'; import { Tag, Space } from 'antd'; -import ProTable from '@ant-design/pro-table'; +import { ProTable } from '@ant-design/pro-components'; import ProCard from '@ant-design/pro-card'; import SqlEditor from '@/components/SqlEditor'; import FormLabelRequire from './FormLabelRequire'; diff --git a/webapp/packages/supersonic-fe/src/utils/curd.ts b/webapp/packages/supersonic-fe/src/utils/curd.ts index d0ee8a079..fd1ef19c3 100644 --- a/webapp/packages/supersonic-fe/src/utils/curd.ts +++ b/webapp/packages/supersonic-fe/src/utils/curd.ts @@ -1,4 +1,4 @@ -import type { ColumnsState } from '@ant-design/pro-table'; +import type { ColumnsState } from '@ant-design/pro-components'; import { useCallback, useEffect, useState } from 'react'; import type { DependencyList } from 'react';