diff --git a/frontend/packages/common/src/const/approval/const.tsx b/frontend/packages/common/src/const/approval/const.tsx index 905834d3..9642b9a6 100644 --- a/frontend/packages/common/src/const/approval/const.tsx +++ b/frontend/packages/common/src/const/approval/const.tsx @@ -343,11 +343,6 @@ export const PUBLISH_APPROVAL_RECORD_INNER_TABLE_COLUMN : PageProColumns((props,ref) => {

{$t('删除团队')}:{$t('删除操作不可恢复,请谨慎操作!')}

- +
diff --git a/frontend/packages/core/src/pages/team/TeamList.tsx b/frontend/packages/core/src/pages/team/TeamList.tsx index b7d87645..075d753d 100644 --- a/frontend/packages/core/src/pages/team/TeamList.tsx +++ b/frontend/packages/core/src/pages/team/TeamList.tsx @@ -1,16 +1,15 @@ -import PageList, { PageProColumns } from "@common/components/aoplatform/PageList.tsx" +import PageList from "@common/components/aoplatform/PageList.tsx" import {ActionType} from "@ant-design/pro-components"; import {FC, useEffect, useMemo, useRef, useState} from "react"; import {useLocation, useNavigate} from "react-router-dom"; import {useBreadcrumb} from "@common/contexts/BreadcrumbContext.tsx"; -import {App, Divider, Modal} from "antd"; -import {BasicResponse, COLUMNS_TITLE, DELETE_TIPS, RESPONSE_TIPS, STATUS_CODE} from "@common/const/const.tsx"; +import {App, Modal} from "antd"; +import {BasicResponse, DELETE_TIPS, RESPONSE_TIPS, STATUS_CODE} from "@common/const/const.tsx"; import { SimpleMemberItem } from "@common/const/type.ts"; import {useFetch} from "@common/hooks/http.ts"; import { TEAM_TABLE_COLUMNS } from "../../const/team/const.tsx"; import { TeamConfigFieldType, TeamConfigHandle, TeamTableListItem } from "../../const/team/type.ts"; -import TableBtnWithPermission from "@common/components/aoplatform/TableBtnWithPermission.tsx"; import { useGlobalContext } from "@common/contexts/GlobalStateContext.tsx"; import { checkAccess } from "@common/utils/permission.ts"; import TeamConfig from "./TeamConfig.tsx"; @@ -131,21 +130,6 @@ const TeamList:FC = ()=>{ }) } - const operation:PageProColumns[] =[ - { - title: COLUMNS_TITLE.operate, - key: 'option', - fixed:'right', - btnNums:2, - valueType: 'option', - render: (_: React.ReactNode, entity: TeamTableListItem) => [ - , - , - {openModal('delete',entity)}} btnTitle="删除"/>, - ], - } - ] - useEffect(() => { setBreadcrumb([ {title: $t('团队')} @@ -173,7 +157,7 @@ const TeamList:FC = ()=>{ id="global_team" className="pl-btnbase" ref={pageListRef} - columns = {[...columns,...operation]} + columns = {[...columns]} request = {()=>getTeamList()} showPagination={false} addNewBtnTitle={$t('添加团队')} @@ -207,7 +191,7 @@ const TeamList:FC = ()=>{ } return res})} > - + ) diff --git a/frontend/packages/dashboard/src/component/MonitorTotalPage.tsx b/frontend/packages/dashboard/src/component/MonitorTotalPage.tsx index 7d37c5d4..3f7c18a7 100644 --- a/frontend/packages/dashboard/src/component/MonitorTotalPage.tsx +++ b/frontend/packages/dashboard/src/component/MonitorTotalPage.tsx @@ -231,9 +231,9 @@ const MonitorTotalPage = (props:MonitorTotalPageProps) => { } return ( -
+
-
+
{
} spinning={queryBtnLoading}> {totalEmpty ?: -
+
{/* 图表区域 */}
{/* 请求统计饼图 */} diff --git a/frontend/packages/dashboard/src/pages/Dashboard.tsx b/frontend/packages/dashboard/src/pages/Dashboard.tsx index 410136fd..b916a4eb 100644 --- a/frontend/packages/dashboard/src/pages/Dashboard.tsx +++ b/frontend/packages/dashboard/src/pages/Dashboard.tsx @@ -47,7 +47,7 @@ export default function Dashboard(){ return ( <> - } spinning={loading}> + } spinning={loading}> { !loading && <> { diff --git a/frontend/packages/market/src/pages/serviceHub/management/ServiceHubManagement.tsx b/frontend/packages/market/src/pages/serviceHub/management/ServiceHubManagement.tsx index 38b25672..e4d939ee 100644 --- a/frontend/packages/market/src/pages/serviceHub/management/ServiceHubManagement.tsx +++ b/frontend/packages/market/src/pages/serviceHub/management/ServiceHubManagement.tsx @@ -76,9 +76,10 @@ const getServiceList = ()=>{ const getTeamsList = ()=>{ - console.log('GetTeamList', accessInit,getGlobalAccessData) if(!accessInit){ - getGlobalAccessData()?.then?.(()=>{getTeamsList()}) + setTimeout(()=>{ + getGlobalAccessData()?.then?.(()=>{getTeamsList()}) + },200) return } setPageLoading(true)