From 052ee5f9f80ce37060cd83d1b06176b37032069a Mon Sep 17 00:00:00 2001 From: xxx Date: Sun, 24 Sep 2023 10:14:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fixed:=20=E5=AD=A6=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E9=83=A8=E9=97=A8=E5=B1=95=E5=BC=80=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E9=83=A8=E9=97=A8=E8=BF=9B=E5=BA=A6=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/compenents/permission-button/index.tsx | 2 +- src/compenents/tree-department/index.tsx | 12 ++++++++---- src/pages/member/index.tsx | 1 - 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/compenents/permission-button/index.tsx b/src/compenents/permission-button/index.tsx index 0633c58..4d86eb9 100644 --- a/src/compenents/permission-button/index.tsx +++ b/src/compenents/permission-button/index.tsx @@ -6,7 +6,7 @@ interface PropInterface { text: string; p: string; class: string; - icon: any; + icon?: any; onClick?: () => void; disabled: any; } diff --git a/src/compenents/tree-department/index.tsx b/src/compenents/tree-department/index.tsx index e642101..5f4dc06 100644 --- a/src/compenents/tree-department/index.tsx +++ b/src/compenents/tree-department/index.tsx @@ -129,8 +129,10 @@ export const TreeDepartment = (props: PropInterface) => { if (info) { label = info.node.title.props.children; } - props.onUpdate(selectedKeys, label); - setSelectKey(selectedKeys); + if (selectedKeys.length <= 1) { + props.onUpdate(selectedKeys, label); + setSelectKey(selectedKeys); + } }; const onExpand = (selectedKeys: any, info: any) => { @@ -138,8 +140,10 @@ export const TreeDepartment = (props: PropInterface) => { if (info) { label = info.node.title.props.children; } - props.onUpdate(selectedKeys, label); - setSelectKey(selectedKeys); + if (selectedKeys.length <= 1) { + props.onUpdate(selectedKeys, label); + setSelectKey(selectedKeys); + } }; return ( diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx index 5684213..f9b393d 100644 --- a/src/pages/member/index.tsx +++ b/src/pages/member/index.tsx @@ -396,7 +396,6 @@ const MemberPage = () => { type="default" text="部门学员进度" class="mr-16" - icon={null} p="department-user-learn" disabled={null} /> From b2820232b915cd39e44aa82f702778c60a5e873f Mon Sep 17 00:00:00 2001 From: xxx Date: Sun, 24 Sep 2023 16:00:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4ldap-=E9=99=84=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7dn=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/system/config/index.tsx | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx index 4145c82..b641126 100644 --- a/src/pages/system/config/index.tsx +++ b/src/pages/system/config/index.tsx @@ -170,10 +170,6 @@ const SystemConfigPage = () => { form.setFieldsValue({ "ldap.base_dn": configData[i].key_value, }); - } else if (configData[i].key_name === "ldap.user_dn_prefix") { - form.setFieldsValue({ - "ldap.user_dn_prefix": configData[i].key_value, - }); } } }); @@ -768,20 +764,6 @@ const SystemConfigPage = () => {
(从LDAP根节点搜索用户)
- - - - - -
- (搜索用户时,基于基础DN的搜索范围限制) -
-
-
Date: Sun, 24 Sep 2023 16:04:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?ldap=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/system/config/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx index b641126..c7a8616 100644 --- a/src/pages/system/config/index.tsx +++ b/src/pages/system/config/index.tsx @@ -727,7 +727,7 @@ const SystemConfigPage = () => { />
- (LDAP的对外服务地址。例如:ldap.example.com) + (LDAP的对外服务地址。例如:ldap://ldap.example.com:389)
@@ -761,7 +761,7 @@ const SystemConfigPage = () => { placeholder="请填写基本DN" /> -
(从LDAP根节点搜索用户)
+
(从此节点搜索用户)
Date: Mon, 25 Sep 2023 10:17:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=AF=BE=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/compenents/create.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/course/compenents/create.tsx b/src/pages/course/compenents/create.tsx index c0d1dce..87330f6 100644 --- a/src/pages/course/compenents/create.tsx +++ b/src/pages/course/compenents/create.tsx @@ -330,6 +330,10 @@ export const CourseCreate: React.FC = ({ }); } else { setChapterType(e.target.value); + setChapters([]); + setHours([]); + setChapterHours([]); + setTreeData([]); } };