diff --git a/src/compenents/tree-category/index.tsx b/src/compenents/tree-category/index.tsx index fdc9209..c5a3e32 100644 --- a/src/compenents/tree-category/index.tsx +++ b/src/compenents/tree-category/index.tsx @@ -67,6 +67,15 @@ export const TreeCategory = (props: PropInterface) => { setSelectKey(selectedKeys); }; + const onExpand = (selectedKeys: any, info: any) => { + let label = "全部" + props.text; + if (info) { + label = info.node.title; + } + props.onUpdate(selectedKeys, label); + setSelectKey(selectedKeys); + }; + return (
{ > 全部{props.text}
- +
); }; diff --git a/src/compenents/tree-department/index.tsx b/src/compenents/tree-department/index.tsx index 66600bd..c3093bb 100644 --- a/src/compenents/tree-department/index.tsx +++ b/src/compenents/tree-department/index.tsx @@ -68,6 +68,15 @@ export const TreeDepartment = (props: PropInterface) => { setSelectKey(selectedKeys); }; + const onExpand = (selectedKeys: any, info: any) => { + let label = "全部" + props.text; + if (info) { + label = info.node.title; + } + props.onUpdate(selectedKeys, label); + setSelectKey(selectedKeys); + }; + return (
{ > 全部{props.text}
- +
); }; diff --git a/src/index.less b/src/index.less index ee31df0..996ed82 100644 --- a/src/index.less +++ b/src/index.less @@ -430,6 +430,10 @@ textarea.ant-input { left: 0; bottom: 0; } +.ant-tree-switcher_open::after, +.ant-tree-switcher_close::after { + z-index: 0; +} .ant-modal-confirm-btns > .ant-btn-default:hover { color: #ff4d4f !important; diff --git a/src/pages/department/index.tsx b/src/pages/department/index.tsx index 017a2e0..8e914d3 100644 --- a/src/pages/department/index.tsx +++ b/src/pages/department/index.tsx @@ -37,9 +37,9 @@ export const DepartmentPage: React.FC = () => { const onSelect = (selectedKeys: any, info: any) => { setSelectKey(selectedKeys); - console.log(selectedKeys); }; + const through = (p: string) => { if (!permisssions) { return false;