diff --git a/webapp/packages/supersonic-fe/package.json b/webapp/packages/supersonic-fe/package.json index 297647140..595f77a3a 100644 --- a/webapp/packages/supersonic-fe/package.json +++ b/webapp/packages/supersonic-fe/package.json @@ -11,9 +11,9 @@ "build:inner": "cross-env REACT_APP_ENV=prod APP_TARGET=inner umi build", "build:test": "cross-env REACT_APP_ENV=test umi build", "deploy": "npm run site && npm run gh-pages", - "dev": "npm run start:osdev", - "dev:os": "npm run start:osdev", - "dev:inner": "npm run start:dev", + "dev": "NODE_OPTIONS=--openssl-legacy-provider npm run start:osdev", + "dev:os": "NODE_OPTIONS=--openssl-legacy-provider npm run start:osdev", + "dev:inner": "NODE_OPTIONS=--openssl-legacy-provider npm run start:dev", "gh-pages": "gh-pages -d dist", "i18n-remove": "pro i18n-remove --locale=zh-CN --write", "postinstall": "umi g tmp", diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/index.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/index.tsx index e0f1e08bb..1a7a6602f 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/index.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/index.tsx @@ -64,17 +64,21 @@ const ClassMetricTable: React.FC = ({ domainManger, dispatch }) => { ...pagination, ...params, createdBy: params.onlyShowMe ? currentUser.name : null, - pageSize: params.showType ? 100 : defaultPagination.pageSize, + pageSize: params.showType ? 100 : params.pageSize || pagination.pageSize, }); setLoading(false); - const { list, pageSize, current, total } = data || {}; + const { list, pageSize, total } = data || {}; let resData: any = {}; if (code === 200) { - setPagination({ - pageSize: Math.min(pageSize, 100), - current, - total, - }); + if (!params.showType) { + setPagination({ + ...pagination, + pageSize: Math.min(pageSize, 100), + // current, + total, + }); + } + setDataSource(list); resData = { data: list || [], @@ -128,15 +132,6 @@ const ClassMetricTable: React.FC = ({ domainManger, dispatch }) => { ); }, }, - // { - // dataIndex: 'alias', - // title: '别名', - // search: false, - // }, - // { - // dataIndex: 'bizName', - // title: '字段名称', - // }, { dataIndex: 'modelName', title: '所属模型', 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 31d85333c..91c3706bf 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx @@ -42,12 +42,12 @@ const ClassDimensionTable: React.FC = ({ domainManger, dispatch }) => { ...pagination, modelId, }); - const { list, pageSize, current, total } = data || {}; + const { list, pageSize, total } = data || {}; let resData: any = {}; if (code === 200) { setPagination({ + ...pagination, pageSize: Math.min(pageSize, 100), - current, total, }); @@ -101,7 +101,7 @@ const ClassDimensionTable: React.FC = ({ domainManger, dispatch }) => { { dataIndex: 'alias', title: '别名', - width: 300, + width: 150, ellipsis: true, search: false, }, 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 65a447aca..47ec0fea2 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx @@ -1,7 +1,7 @@ import type { ActionType, ProColumns } from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table'; import { message, Button, Space, Popconfirm, Input, Tag } from 'antd'; -import React, { useRef, useState } from 'react'; +import React, { useRef, useState, useEffect } from 'react'; import type { Dispatch } from 'umi'; import { connect } from 'umi'; import type { StateType } from '../model'; @@ -25,7 +25,7 @@ const ClassMetricTable: React.FC = ({ domainManger, dispatch }) => { const [metricItem, setMetricItem] = useState(); const [pagination, setPagination] = useState({ current: 1, - pageSize: 20, + pageSize: 2, total: 0, }); const actionRef = useRef(); @@ -36,12 +36,12 @@ const ClassMetricTable: React.FC = ({ domainManger, dispatch }) => { ...pagination, modelId, }); - const { list, pageSize, current, total } = data || {}; + const { list, pageSize, total } = data || {}; let resData: any = {}; if (code === 200) { setPagination({ + ...pagination, pageSize: Math.min(pageSize, 100), - current, total, }); @@ -81,7 +81,7 @@ const ClassMetricTable: React.FC = ({ domainManger, dispatch }) => { { dataIndex: 'alias', title: '别名', - width: 300, + width: 150, ellipsis: true, search: false, }, diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionMetricVisibleTransfer.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionMetricVisibleTransfer.tsx index dea1eb576..2b7bdaf5f 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionMetricVisibleTransfer.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionMetricVisibleTransfer.tsx @@ -15,7 +15,8 @@ type Props = { titles?: string[]; onKnowledgeInfosMapChange?: (knowledgeInfosMap: IChatConfig.IKnowledgeInfosItemMap) => void; onChange?: (params?: any) => void; - transferProps?: Record; + // transferProps?: Record; + [key: string]: any; }; const DimensionMetricVisibleTransfer: React.FC = ({ @@ -24,8 +25,8 @@ const DimensionMetricVisibleTransfer: React.FC = ({ sourceList = [], targetList = [], titles, - transferProps = {}, onChange, + ...rest }) => { const [transferData, setTransferData] = useState([]); const [targetKeys, setTargetKeys] = useState(targetList); @@ -74,7 +75,7 @@ const DimensionMetricVisibleTransfer: React.FC = ({ }} targetKeys={targetKeys} onChange={handleChange} - {...transferProps} + {...rest} /> ); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx index 445cc726b..0909f57a8 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx @@ -395,7 +395,7 @@ const MetricInfoCreateForm: React.FC = ({ label={ 2.12${ + subTitle={`对小数位数进行设置,如保留两位,0.021252 -> 0.02${ isPercentState ? '%' : '' }`} /> 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 385dadc5f..23b5dec05 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricMeasuresFormTable.tsx @@ -45,33 +45,6 @@ const MetricMeasuresFormTable: React.FC = ({ dataIndex: 'bizName', title: '度量名称', }, - // { - // dataIndex: 'alias', - // title: '别名', - // render: (_: any, record: any) => { - // const { alias, name } = record; - // const { measures } = measuresParams; - // return ( - // { - // const { value } = event.target; - // const list = measures.map((item: any) => { - // if (item.name === name) { - // return { - // ...item, - // alias: value, - // }; - // } - // return item; - // }); - // onFieldChange?.(list); - // }} - // /> - // ); - // }, - // }, { dataIndex: 'constraint', title: '限定条件', diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionCreateDrawer.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionCreateDrawer.tsx index 917e46b79..02faf11aa 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionCreateDrawer.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionCreateDrawer.tsx @@ -140,6 +140,10 @@ const PermissionCreateDrawer: React.FC = ({ {