From 4bebd40ed2f40625307b5cb976bcce7da509fc52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=99=93=E4=BC=9F?= Date: Wed, 17 Jul 2024 09:00:01 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=98=BF=E9=87=8C?= =?UTF-8?q?=E4=BA=91=E9=95=9C=E5=83=8F=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E5=BF=AB=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eiam-console/pom.xml | 3 +++ eiam-portal/pom.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/eiam-console/pom.xml b/eiam-console/pom.xml index 4274fc16..918f275c 100644 --- a/eiam-console/pom.xml +++ b/eiam-console/pom.xml @@ -147,6 +147,7 @@ generate-resources + https://mirrors.aliyun.com/nodejs-release/ v20.10.0 v9.1.0 @@ -199,6 +200,7 @@ generate-resources + https://mirrors.aliyun.com/nodejs-release/ v20.10.0 v9.1.0 @@ -251,6 +253,7 @@ generate-resources + https://mirrors.aliyun.com/nodejs-release/ v20.10.0 v9.1.0 diff --git a/eiam-portal/pom.xml b/eiam-portal/pom.xml index fcd403e1..9acd559b 100644 --- a/eiam-portal/pom.xml +++ b/eiam-portal/pom.xml @@ -130,6 +130,7 @@ generate-resources + https://mirrors.aliyun.com/nodejs-release/ v20.10.0 v9.1.0 @@ -182,6 +183,7 @@ generate-resources + https://mirrors.aliyun.com/nodejs-release/ v20.10.0 v9.1.0 @@ -234,6 +236,7 @@ generate-resources + https://mirrors.aliyun.com/nodejs-release/ v20.10.0 v9.1.0 From 208ea9b8a5b5b26882105aec0ac00c10eb812e2d Mon Sep 17 00:00:00 2001 From: awenes <1121353141@qq.com> Date: Thu, 18 Jul 2024 22:35:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eiam-console/src/main/console-fe/package.json | 40 +++++++++---------- eiam-portal/src/main/portal-fe/package.json | 34 ++++++++-------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eiam-console/src/main/console-fe/package.json b/eiam-console/src/main/console-fe/package.json index bc362716..050ea68c 100644 --- a/eiam-console/src/main/console-fe/package.json +++ b/eiam-console/src/main/console-fe/package.json @@ -48,22 +48,22 @@ "@ant-design/charts": "^1.4.3", "@ant-design/icons": "^5.3.7", "@ant-design/maps": "^1.0.8", - "@ant-design/pro-components": "^2.7.1", + "@ant-design/pro-components": "^2.7.14", "@ant-design/pro-editor": "^1.2.1", - "ahooks": "^3.7.11", - "antd": "^5.17.0", - "antd-img-crop": "^4.21.0", + "ahooks": "^3.8.0", + "antd": "^5.19.2", + "antd-img-crop": "^4.22.0", "antd-style": "^3.6.2", "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", + "dayjs": "^1.11.12", + "echarts": "^5.5.1", "fetch-jsonp": "^1.3.0", - "form-render": "^2.4.4", - "google-libphonenumber": "^3.2.34", + "form-render": "^2.4.5", + "google-libphonenumber": "^3.2.37", "js-base64": "^3.7.7", "js-yaml": "^4.1.0", "jsencrypt": "^3.3.2", @@ -71,15 +71,15 @@ "moment": "^2.30.1", "numeral": "^2.0.6", "omit.js": "^2.0.2", - "qs": "^6.12.1", + "qs": "^6.12.3", "query-string": "^9.0.0", - "react": "18.2.0", + "react": "18.3.1", "react-codemirror2": "^8.0.0", - "react-dom": "18.2.0", - "react-fast-marquee": "^1.6.4", + "react-dom": "18.3.1", + "react-fast-marquee": "^1.6.5", "react-helmet-async": "^2.0.5", "react-sortable-hoc": "^2.0.0", - "yaml": "^2.4.2" + "yaml": "^2.4.5" }, "devDependencies": { "@ant-design/antd-theme-variable": "^1.0.0", @@ -88,20 +88,20 @@ "@types/google-libphonenumber": "^7.4.30", "@types/history": "^4.7.11", "@types/js-yaml": "^4.0.9", - "@types/lodash": "^4.17.1", + "@types/lodash": "^4.17.7", "@types/numeral": "^2.0.5", "@types/qs": "^6.9.15", - "@types/react": "^18.3.1", + "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@types/react-helmet": "^6.1.11", - "@umijs/lint": "^4.2.0", - "@umijs/max": "^4.2.0", + "@umijs/lint": "^4.3.6", + "@umijs/max": "^4.3.6", "cross-env": "^7.0.3", "cross-port-killer": "^1.4.0", "eslint": "^8.57.0", - "husky": "^9.0.11", - "lint-staged": "^15.2.2", - "prettier": "^3.2.5", + "husky": "^9.1.1", + "lint-staged": "^15.2.7", + "prettier": "^3.3.3", "typescript": "*", "umi-presets-pro": "^2.0.3" }, diff --git a/eiam-portal/src/main/portal-fe/package.json b/eiam-portal/src/main/portal-fe/package.json index a14d3a70..7f6e0966 100644 --- a/eiam-portal/src/main/portal-fe/package.json +++ b/eiam-portal/src/main/portal-fe/package.json @@ -48,17 +48,17 @@ "@ahooksjs/use-url-state": "^3.5.1", "@ant-design/icons": "^5.3.7", "@ant-design/maps": "^1.0.8", - "@ant-design/pro-components": "^2.7.1", - "ahooks": "^3.7.11", - "antd": "^5.17.0", - "antd-img-crop": "^4.21.0", + "@ant-design/pro-components": "^2.7.14", + "ahooks": "^3.8.0", + "antd": "^5.19.2", + "antd-img-crop": "^4.22.0", "antd-style": "^3.6.2", "classnames": "^2.5.1", "crypto-js": "^4.2.0", - "dayjs": "^1.11.11", + "dayjs": "^1.11.12", "fetch-jsonp": "^1.3.0", - "form-render": "^2.4.4", - "google-libphonenumber": "^3.2.34", + "form-render": "^2.4.5", + "google-libphonenumber": "^3.2.37", "js-base64": "^3.7.7", "js-yaml": "^4.1.0", "jsencrypt": "^3.3.2", @@ -67,13 +67,13 @@ "nanoid": "^5.0.7", "numeral": "^2.0.6", "omit.js": "^2.0.2", - "qs": "^6.12.1", + "qs": "^6.12.3", "query-string": "^9.0.0", "react": "18.3.1", "react-dom": "18.3.1", - "react-fast-marquee": "^1.6.4", + "react-fast-marquee": "^1.6.5", "react-helmet-async": "^2.0.5", - "yaml": "^2.4.2" + "yaml": "^2.4.5" }, "devDependencies": { "@ant-design/antd-theme-variable": "^1.0.0", @@ -82,20 +82,20 @@ "@types/google-libphonenumber": "^7.4.30", "@types/history": "^4.7.11", "@types/js-yaml": "^4.0.9", - "@types/lodash": "^4.17.1", + "@types/lodash": "^4.17.7", "@types/numeral": "^2.0.5", "@types/qs": "^6.9.15", - "@types/react": "^18.3.1", + "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@types/react-helmet": "^6.1.11", - "@umijs/lint": "^4.2.0", - "@umijs/max": "^4.2.0", + "@umijs/lint": "^4.3.6", + "@umijs/max": "^4.3.6", "cross-env": "^7.0.3", "cross-port-killer": "^1.4.0", "eslint": "^8.57.0", - "husky": "^9.0.11", - "lint-staged": "^15.2.2", - "prettier": "^3.2.5", + "husky": "^9.1.1", + "lint-staged": "^15.2.7", + "prettier": "^3.3.3", "typescript": "*", "umi-presets-pro": "^2.0.3" }, From 163a267a167d2ea4bbbfa32e9492eb108facd5cd Mon Sep 17 00:00:00 2001 From: awenes <1121353141@qq.com> Date: Thu, 18 Jul 2024 22:36:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms/template/sms-template_zh.properties | 2 +- .../components/BasicConfig/DingTalkConfig.tsx | 10 ++---- .../components/BasicConfig/FeiShuConfig.tsx | 10 ++---- .../src/pages/account/UserList/UserList.tsx | 21 +++++------- .../UserList/components/Organization/Tree.tsx | 4 +-- .../account/UserList/components/User/User.tsx | 6 ++-- .../OidcProtocolConfig/OidcProtocolConfig.tsx | 34 ++++++++++--------- 7 files changed, 38 insertions(+), 49 deletions(-) diff --git a/eiam-common/src/main/resources/sms/template/sms-template_zh.properties b/eiam-common/src/main/resources/sms/template/sms-template_zh.properties index 8693ba6e..7a227732 100644 --- a/eiam-common/src/main/resources/sms/template/sms-template_zh.properties +++ b/eiam-common/src/main/resources/sms/template/sms-template_zh.properties @@ -1,6 +1,6 @@ # # eiam-common - Employee Identity and Access Management -# Copyright \u00A9 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) +# Copyright © 2022-Present Jinan Yuanchuang Network Technology Co., Ltd. (support@topiam.cn) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/components/BasicConfig/DingTalkConfig.tsx b/eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/components/BasicConfig/DingTalkConfig.tsx index bb1f4a2f..a451a6f9 100644 --- a/eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/components/BasicConfig/DingTalkConfig.tsx +++ b/eiam-console/src/main/console-fe/src/pages/account/IdentitySourceDetail/components/BasicConfig/DingTalkConfig.tsx @@ -92,13 +92,9 @@ const DingTalkConfig = (props: DingTalkConfigProps) => { } }, [formRef, onConfigValidator]); - useImperativeHandle( - basicConfigRef, - () => { - return { configValidator: configValidator }; - }, - [configValidator], - ); + useImperativeHandle(basicConfigRef, () => { + return { configValidator: configValidator }; + }, [configValidator]); return ( <> { - return { configValidator: configValidator }; - }, - [configValidator], - ); + useImperativeHandle(basicConfigRef, () => { + return { configValidator: configValidator }; + }, [configValidator]); return ( <> 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 22c9fe82..ba45f515 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,10 +15,8 @@ * 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, Flex, Row } from 'antd'; +import { Col, Row } from 'antd'; import { useState } from 'react'; import OrgTree from './components/Organization'; import UserList from './components/User'; @@ -50,19 +48,16 @@ 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 fb75be27..afb95964 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 @@ -39,7 +39,6 @@ import { updateOrganization, } from '@/services/account'; import { useMount } from 'ahooks'; -import type { ItemType } from 'antd/es/menu/hooks/useItems'; import CreateOrganization from '../CreateOrganization'; import MoveOrganization from './MoveDrawer'; import SearchTree from './SearchTree'; @@ -47,6 +46,7 @@ import UpdateOrganization from '../UpdateOrganization'; import type { DataNode } from '@/utils/tree'; import { updateTreeData } from '@/utils/tree'; import { useIntl } from '@umijs/max'; +import { ItemType } from 'antd/es/menu/interface'; const prefixCls = 'account-organization'; @@ -318,7 +318,7 @@ export const OrganizationTree = (props: { return (
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 9a91e3dd..874acced 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 - 220px)', + height: 'calc(100vh - 200px)', overflow: 'auto', }} - cardProps={{ style: { minHeight: 'calc(100vh - 220px)' } }} + cardProps={{ style: { minHeight: 'calc(100vh - 200px)' } }} search={{ defaultCollapsed: true, }} diff --git a/eiam-console/src/main/console-fe/src/pages/app/AppDetail/components/AppProtocol/OidcProtocolConfig/OidcProtocolConfig.tsx b/eiam-console/src/main/console-fe/src/pages/app/AppDetail/components/AppProtocol/OidcProtocolConfig/OidcProtocolConfig.tsx index 48f68d17..ffd5fb22 100644 --- a/eiam-console/src/main/console-fe/src/pages/app/AppDetail/components/AppProtocol/OidcProtocolConfig/OidcProtocolConfig.tsx +++ b/eiam-console/src/main/console-fe/src/pages/app/AppDetail/components/AppProtocol/OidcProtocolConfig/OidcProtocolConfig.tsx @@ -290,16 +290,16 @@ export default (props: { app: GetApp | Record }) => { > {(fields, { add, remove }, { errors }) => ( <> - {fields.map((field, index) => ( + {fields.map(({ key, name, ...restField }, index) => ( @@ -311,7 +311,8 @@ export default (props: { app: GetApp | Record }) => { }} > }) => { })} /> - remove(field.name)} /> + remove(name)} />
))} @@ -345,8 +346,8 @@ export default (props: { app: GetApp | Record }) => { label={ fields.length === 0 ? intl.formatMessage({ - id: 'pages.app.config.detail.protocol_config.oidc.redirect_uris', - }) + id: 'pages.app.config.detail.protocol_config.oidc.redirect_uris', + }) : '' } extra={intl.formatMessage({ @@ -369,16 +370,16 @@ export default (props: { app: GetApp | Record }) => { {(fields, { add, remove }, {}) => ( <> - {fields.map((field, index) => { + {fields.map(({ key, name, ...restField }, index) => { return ( @@ -390,7 +391,8 @@ export default (props: { app: GetApp | Record }) => { }} > }) => { })} /> - remove(field.name)} /> + remove(name)} /> ); @@ -424,8 +426,8 @@ export default (props: { app: GetApp | Record }) => { label={ fields.length === 0 ? intl.formatMessage({ - id: 'pages.app.config.detail.protocol_config.oidc.post_logout_redirect_uris', - }) + id: 'pages.app.config.detail.protocol_config.oidc.post_logout_redirect_uris', + }) : '' } extra={intl.formatMessage({