+ = ({value = [{k
style={{ width: 162 }} />
{index !== value.length - 1 && (
<>
- removePair(index)}>
- removePair(index)} width="14" height="14"/>
+ ({
);
useEffect(() => {
- // let newValue =
- // if(extendsId && extendsId.length > 0 && value){
- // newValue = []
- // value.forEach((item:{[k:string]:unknown, _id:string}, index) => {
- // newValue.push(item);
- // const nextItem:{[k:string]:unknown, _id:string}= value[index + 1];
- // // 如果下一个元素不存在，或者当前元素的cluster与下一个元素的不同
- // if (!nextItem || (item[extendsId[0]] !== nextItem[extendsId[0]])) {
- // const tmpValue:{[k:string]:unknown, _id:string}= { _id:uuidv4()}
- // extendsId.forEach(field => {
- // tmpValue[field] = item[field];
- // });
- // newValue.push(tmpValue);
- // }
- // })
- // }
- // console.log(value,newValue, extendsId)
setConfigurations(value?.map((x)=>x._id ? x : {...x,_id:uuidv4()}) || [{_id:uuidv4()}]);
}, [value]);
diff --git a/frontend/packages/common/src/components/aoplatform/EditableTableWithModal.tsx b/frontend/packages/common/src/components/aoplatform/EditableTableWithModal.tsx
index a5985f9..734d2eb 100644
--- a/frontend/packages/common/src/components/aoplatform/EditableTableWithModal.tsx
+++ b/frontend/packages/common/src/components/aoplatform/EditableTableWithModal.tsx
@@ -95,7 +95,7 @@ const EditableTableWithModal = ({
width:117,
render: (_: unknown, record: T) => (
<>
-
+
+ {
+ return document.getElementById('test-pro-layout') || document.body;
+ }}
+ >
+ {
+ return (
+
+
+ );
+ },
+ }}
+ // actionsRender={(props) => {
+ // if (props.isMobile) return [];
+ // if (typeof window === 'undefined') return [];
+ // return [
+ //
+ // ];
+ // }}
+ headerTitleRender={() => (
+
navigator(mainPage)}
/>
- = ({ addrItem, onAddrItemChange, keyNa
{(localAddrItem[keyName] as string[]).join(',')}
{(localAddrItem[keyName] as string[]).length === 1 && (
-
diff --git a/frontend/packages/common/src/components/aoplatform/DatePicker.tsx b/frontend/packages/common/src/components/aoplatform/DatePicker.tsx
index 33a04a7..27b6111 100644
--- a/frontend/packages/common/src/components/aoplatform/DatePicker.tsx
+++ b/frontend/packages/common/src/components/aoplatform/DatePicker.tsx
@@ -1,9 +1,4 @@
-/*
- * @Date: 2024-02-19 18:11:15
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-05-29 18:38:11
- * @FilePath: \frontend\packages\common\src\components\aoplatform\DatePicker.tsx
- */
+
import { DatePicker } from 'antd';
import type { Moment } from 'moment';
import momentGenerateConfig from 'rc-picker/lib/generate/moment';
diff --git a/frontend/packages/common/src/components/aoplatform/DrawerWithFooter.tsx b/frontend/packages/common/src/components/aoplatform/DrawerWithFooter.tsx
index 4ce73a5..87531da 100644
--- a/frontend/packages/common/src/components/aoplatform/DrawerWithFooter.tsx
+++ b/frontend/packages/common/src/components/aoplatform/DrawerWithFooter.tsx
@@ -1,9 +1,4 @@
-/*
- * @Date: 2024-04-09 15:46:10
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-05-31 19:09:37
- * @FilePath: \frontend\packages\core\src\components\DrawerWithFooter.tsx
- */
+
import { Button, Drawer, DrawerProps, Space } from "antd";
import WithPermission from "./WithPermission";
import { useEffect, useState } from "react";
diff --git a/frontend/packages/common/src/components/aoplatform/DynamicKeyValueInput.tsx b/frontend/packages/common/src/components/aoplatform/DynamicKeyValueInput.tsx
index 418fe6b..e822a35 100644
--- a/frontend/packages/common/src/components/aoplatform/DynamicKeyValueInput.tsx
+++ b/frontend/packages/common/src/components/aoplatform/DynamicKeyValueInput.tsx
@@ -1,12 +1,7 @@
-/*
- * @Date: 2024-01-31 15:00:10
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-05-06 10:20:59
- * @FilePath: \frontend\packages\core\src\components\DynamicKeyValueInput.tsx
- */
import {FC } from 'react';
import { Input, Space } from 'antd';
+import { Icon } from '@iconify/react/dist/iconify.js';
type KeyValueInput = {
key: string;
@@ -85,8 +80,8 @@ export const DynamicKeyValueInput: FC{dom}
+
+
-
- {!isMng? undefined :
- }
-
-
-
-
-
-
+ )}
+ fixSiderbar={true}
+ layout='mix'
+ splitMenus={true}
+ collapsed={false}
+ collapsedButtonRender={false}
+ >
+
)
}
export default BasicLayout
\ No newline at end of file
diff --git a/frontend/packages/common/src/components/aoplatform/Breadcrumb.tsx b/frontend/packages/common/src/components/aoplatform/Breadcrumb.tsx
index 433ab90..a375cd4 100644
--- a/frontend/packages/common/src/components/aoplatform/Breadcrumb.tsx
+++ b/frontend/packages/common/src/components/aoplatform/Breadcrumb.tsx
@@ -1,9 +1,3 @@
-/*
- * @Date: 2023-11-28 11:41:17
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-05-29 18:30:51
- * @FilePath: \frontend\packages\common\src\components\aoplatform\Breadcrumb.tsx
- */
import { Breadcrumb } from "antd"
import { useBreadcrumb} from "@common/contexts/BreadcrumbContext.tsx";
import {FC,useEffect} from "react";
diff --git a/frontend/packages/common/src/components/aoplatform/CopyAddrList.tsx b/frontend/packages/common/src/components/aoplatform/CopyAddrList.tsx
index ff8ebbf..910b653 100644
--- a/frontend/packages/common/src/components/aoplatform/CopyAddrList.tsx
+++ b/frontend/packages/common/src/components/aoplatform/CopyAddrList.tsx
@@ -1,12 +1,8 @@
-/*
- * @Date: 2024-02-04 14:06:22
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 15:48:54
- * @FilePath: \frontend\packages\common\src\components\aoplatform\CopyAddrList.tsx
- */
+
import { useState,FC } from 'react';
import { Tooltip, Button } from 'antd';
import useCopyToClipboard from '@common/hooks/copy';
+import { Icon } from '@iconify/react/dist/iconify.js';
type AddressItem = {
expand?: boolean;
@@ -54,7 +50,7 @@ const CopyAddrList: FC
-
- {/* */}
-
-
- {
+ // 同级目录点击无效
+ if(item.key && routerKeyMap.get(item.key) && routerKeyMap.get(item.key).length > 0 && routerKeyMap.get(item.key)?.indexOf(pathname.split('/')[1]) !== -1){
+ return
+ }
+ if(item.key === pathname.split('/')[1]){
+ return
+ }
+
+ if(item.path){
+ navigator(item.path)
+ }
+ setPathname(item.path || '');
+ }}
+ >
+ {dom}
-
+
+
+
+
+
+
= ({showBanner=true,pageTitle,tagList,showB
//
{ showBanner &&
- {backUrl && }
+ {backUrl && }
{pageTitle}
diff --git a/frontend/packages/common/src/components/aoplatform/InsidePageForHub.tsx b/frontend/packages/common/src/components/aoplatform/InsidePageForHub.tsx
index a322d99..83a5559 100644
--- a/frontend/packages/common/src/components/aoplatform/InsidePageForHub.tsx
+++ b/frontend/packages/common/src/components/aoplatform/InsidePageForHub.tsx
@@ -1,10 +1,3 @@
-/*
- * @Date: 2023-11-28 11:54:17
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-02 09:38:42
- * @FilePath: \frontend\packages\core\src\components\InsidePageForHub.tsx
- * @Description:内页（带顶部导航与描述、tag、右侧按钮-可选）
- */
import { Button, Tag } from "antd"
import {useNavigate} from "react-router-dom";
@@ -29,29 +22,6 @@ const InsidePageForHub:FC = ({showBanner=true,pageTitle,tagList
const navigate = useNavigate();
const goBack = () => {
- // document.referrer 有误，隐藏此段逻辑
- // const currentPath = window.location.pathname; // 获取当前路径
- // // 注意：在使用 React Router 时，直接操作 window.location 可能不是最佳实践，但用于获取当前路径是可接受的
- // const referrerPath = document.referrer ? new URL(document.referrer).pathname : ''; // 获取上一步的路径
-
- // // 定义一个函数来提取路由的开始部分
- // const getRouteStart = (path:string) => {
- // const parts = path.split('/').filter(Boolean); // 分割路径，并移除空字符串
- // return parts.length > 0 ? parts[0] : null; // 返回路由的开始部分
- // };
-
- // const currentRouteStart = getRouteStart(currentPath);
- // const referrerRouteStart = getRouteStart(referrerPath);
- // // 比较当前路径和上一步路径的路由开始部分是否相同
- // // console.log(currentPath,document,document.referrer, referrerPath, currentRouteStart, referrerRouteStart)
- // if (currentRouteStart && referrerRouteStart && currentRouteStart === referrerRouteStart) {
- // // 如果相同，跳转到`${currentRouteStart}/list`
- // navigate(backUrl ?? `/${currentRouteStart}/list`);
- // } else {
- // // 如果不同，使用navigate实现返回上一步
- // navigate(-1);
- // }
-
navigate(backUrl);
};
return (
diff --git a/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx b/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx
index 1dc00bd..ee7e81e 100644
--- a/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx
+++ b/frontend/packages/common/src/components/aoplatform/MemberTransfer.tsx
@@ -1,9 +1,4 @@
-/*
- * @Date: 2024-05-16 15:38:43
- * @LastEditors: maggieyyy
- * @LastEditTime: 2024-06-05 18:55:12
- * @FilePath: \frontend\packages\common\src\components\aoplatform\MemberTransfer.tsx
- */
+
import { GetProp, TransferProps, TreeDataNode, theme, Transfer, Tree, Spin } from "antd";
import { DataNode, TreeProps } from "antd/es/tree";
import { Ref, forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
diff --git a/frontend/packages/common/src/components/aoplatform/Navigation.tsx b/frontend/packages/common/src/components/aoplatform/Navigation.tsx
index e7c952f..87d2ba6 100644
--- a/frontend/packages/common/src/components/aoplatform/Navigation.tsx
+++ b/frontend/packages/common/src/components/aoplatform/Navigation.tsx
@@ -1,85 +1,70 @@
+
import {FC, useEffect, useMemo, useState} from 'react';
import type { MenuProps } from 'antd';
import { Menu } from 'antd';
import { useLocation, useNavigate} from "react-router-dom";
-import { getItem } from '@common/utils/navigation';
+import { getNavItem } from '@common/utils/navigation';
import { PERMISSION_DEFINITION } from '@common/const/permissions';
import { useGlobalContext } from '@common/contexts/GlobalStateContext';
-import { DashboardOutlined, DeploymentUnitOutlined, HddOutlined, TeamOutlined } from '@ant-design/icons';
-
+import { ProjectFilled } from '@ant-design/icons';
+import { Icon } from '@iconify/react';
export type MenuItem = Required['items'][number];
-// type NavigationItemType = {
-// title: string,
-// iconType: string,
-// icon: string,
-// router: string,
-// access:string [],
-// children: NavigationItemType[]
-// }
const APP_MODE = import.meta.env.VITE_APP_MODE;
-const routerKeyMap = new Map([
- ['assets','/assets'],
- ['dashboard','/dashboard'],
- ['systemrunning','/systemrunning'],
- ['system','/system/list'],
- ['servicecategories','/servicecategories'],
- ['organization','/organization/list'],
- ['team','/team/list'],
- ['member','/member/list'],
- ['user','/user/list'],
- ['role','/role'],
- ['access','/access'],
- ['partition','/partition/list'],
- ['openapi','/openapi'],
- ['logsettings','/logsettings'],
- ['resourcesettings','/resourcesettings']])
+// avoid changing route within ths same category
+export const routerKeyMap = new Map([
+ ['workspace',['tenantManagement','service','team','serviceHub']],
+ ['my',['tenantManagement','service','team']],
+ ['mainPage',['dashboard','systemrunning']],
+ ['operationCenter',['member','user','role','servicecategories']],
+ ['organization',['member','user','role']],
+ ['serviceHubSetting',['servicecategories']],
+ ['maintenanceCenter',['partition','logsettings','resourcesettings','openapi']
+]])
-const TOTAL_MENU_ITEMS: MenuProps['items'] = [
- APP_MODE === 'pro' ? getItem('仪表盘', 'mainPage', ('')
const currentUrl = location.pathname
const navigateTo = useNavigate()
- // const {fetchData} = useFetch()
- // const [navigationItemList, setNavigationItemList] = useState([])
const { accessData,checkPermission} = useGlobalContext()
const onClick: MenuProps['onClick'] = (e) => {
@@ -88,59 +73,21 @@ const Navigation: FC = () => {
newUrl && navigateTo(newUrl)
};
- // useEffect(()=>{
- // const newUrl = routerKeyMap.get(selectedKeys)
- // console.log(newUrl)
- // newUrl && navigateTo(newUrl)
- // },[selectedKeys])
-
- // 插件相关，暂时隐藏
- // const getNavigationData = ()=>{
- // fetchData>('navigation',{method:'GET',eoApiPrefix:'_system/'},).then(response=>{
- // const {code,data,msg} = response
- // if(code === STATUS_CODE.SUCCESS){
- // setNavigationItemList(data.navigation)
- // }else{
- // message.error(msg || '操作失败')
- // }
- // })
- // }
-
- // const navigations = useMemo(()=>{
- // const getNavTitle = (data:NavigationItemType,root?:boolean)=>{
- // if(root){
- // return data.title
- // }
- // return {data.title}
- // }
-
- // const handleNavigationData:(data:NavigationItemType[],root?:boolean)=>MenuItem[] = (data:NavigationItemType[],root?:boolean)=>{
- // return data?.map(x=>getItem(
- // getNavTitle(x,root),
- // x.router.split('/')[0] === 'template' ? x.router.split('/')[1] : x.router.split('/')[0],
- // x.icon,
- // x.children && handleNavigationData(x.children)))
- // }
-
- // return handleNavigationData(navigationItemList,true)
- // },[navigationItemList])
-
-
const menuData = useMemo(()=>{
const filterMenu = (menu:Array<{[k:string]:unknown}>)=>{
return menu.filter(x=> x && (x.access ? checkPermission(x.access as keyof typeof PERMISSION_DEFINITION[0]): true))
}
- return TOTAL_MENU_ITEMS!.filter(x=>x).map((x)=> ( x.children ? {...x, children:filterMenu(x.children)} : x))?.filter(x=> x.key === 'system' || (x.children && x.children?.length > 0))
+ return TOTAL_MENU_ITEMS!.filter(x=>x).map((x)=> ( x.children ? {...x, children:filterMenu(x.children)} : x))?.filter(x=> x.key === 'service' || (x.children && x.children?.length > 0))
},[accessData])
useEffect(() => {
setSelectedKeys(currentUrl.split('/')[1] === 'template' ? currentUrl.split('/')[2] : currentUrl.split('/')[1])
- // getNavigationData()
}, [currentUrl]);
return (