diff --git a/src/compenents/permission-button/index.tsx b/src/compenents/permission-button/index.tsx index 0633c587a0451cb60aaaa17f9e6219b9e68e2a49..4d86eb99734adb1bd52967274392a7abba8c041b 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 e64210156b21cef5e3407c8f463e05e94d4e3851..5f4dc060d1b504955fd4f808ac67e53853b19c6b 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/course/compenents/create.tsx b/src/pages/course/compenents/create.tsx index c0d1dce2377ca95c532419e673803b4d825271c2..87330f62f592645ae3d2f1742ccb27e260ac5cea 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([]); } }; diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx index 5684213e4f40b2dcd9939c8e4108c0848f0ddcbd..f9b393dcf4703e7a099a67391faf3befd44aea3b 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} /> diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx index 4145c822d803f32fcb2377b83fa956f00051ffb6..c7a8616333c79953d5001c68aa3209b6eb89817c 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, - }); } } }); @@ -731,7 +727,7 @@ const SystemConfigPage = () => { />
- (LDAP的对外服务地址。例如:ldap.example.com) + (LDAP的对外服务地址。例如:ldap://ldap.example.com:389)
@@ -765,21 +761,7 @@ const SystemConfigPage = () => { placeholder="请填写基本DN" /> -
(从LDAP根节点搜索用户)
- - - - - - - -
- (搜索用户时,基于基础DN的搜索范围限制) -
+
(从此节点搜索用户)