diff --git a/eiam-console/src/main/console-fe/package.json b/eiam-console/src/main/console-fe/package.json index 5bf71537..bc362716 100644 --- a/eiam-console/src/main/console-fe/package.json +++ b/eiam-console/src/main/console-fe/package.json @@ -49,6 +49,7 @@ "@ant-design/icons": "^5.3.7", "@ant-design/maps": "^1.0.8", "@ant-design/pro-components": "^2.7.1", + "@ant-design/pro-editor": "^1.2.1", "ahooks": "^3.7.11", "antd": "^5.17.0", "antd-img-crop": "^4.21.0", @@ -56,13 +57,13 @@ "classnames": "^2.5.1", "codemirror": "^5.65.5", "content-security-policy-parser": "^0.6.0", + "copy-to-clipboard": "^3.3.3", "crypto-js": "^4.2.0", "dayjs": "^1.11.11", "echarts": "^5.5.0", "fetch-jsonp": "^1.3.0", "form-render": "^2.4.4", "google-libphonenumber": "^3.2.34", - "copy-to-clipboard": "^3.3.3", "js-base64": "^3.7.7", "js-yaml": "^4.1.0", "jsencrypt": "^3.3.2", diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/UserList.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/UserList.tsx index ba45f515..22c9fe82 100644 --- a/eiam-console/src/main/console-fe/src/pages/account/UserList/UserList.tsx +++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/UserList.tsx @@ -15,8 +15,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ + +import { DraggablePanel } from '@ant-design/pro-editor'; import { PageContainer } from '@ant-design/pro-components'; -import { Col, Row } from 'antd'; +import { Col, Flex, Row } from 'antd'; import { useState } from 'react'; import OrgTree from './components/Organization'; import UserList from './components/User'; @@ -48,16 +50,19 @@ export const User = () => { return ( - +
{/* 左侧 */} - + - + +
{/* 表格 */} - - - - + +
); }; diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx index 2a6fa794..28e0a56c 100644 --- a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx +++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/Organization/Tree.tsx @@ -318,7 +318,7 @@ export const OrganizationTree = (props: { return (
@@ -420,7 +420,7 @@ export const OrganizationTree = (props: { await getRootOrganizationData(); return Promise.resolve(true); } - return Promise.resolve(false); + return Promise.resolvyarne(false); }} id={currentSelectedNode.id} visible={moveNodeVisible} diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx index 874acced..9a91e3dd 100644 --- a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx +++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx @@ -387,7 +387,7 @@ export default (props: UserListProps) => { return ( <> {!organization ? ( - + ) : ( @@ -396,10 +396,10 @@ export default (props: UserListProps) => { scroll={{ x: 1200 }} params={{ organizationId: organization?.id, inclSubOrganization }} style={{ - height: 'calc(100vh - 200px)', + height: 'calc(100vh - 220px)', overflow: 'auto', }} - cardProps={{ style: { minHeight: 'calc(100vh - 200px)' } }} + cardProps={{ style: { minHeight: 'calc(100vh - 220px)' } }} search={{ defaultCollapsed: true, }}