ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into merge_from_upstream

Browse Source
This commit is contained in:
sealday 2024-03-22 03:20:18 +08:00
commit b04d475085
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/plugins/@nocobase/plugin-acl/src/client/RolesMenu.tsx
View File

@ -18,20 +18,32 @@ export const RolesMenu: React.FC & {
Item: React.FC<{ item: any; onEdit: () => void }>; Item: React.FC<{ item: any; onEdit: () => void }>;
} = () => { } = () => {
const { t } = useACLTranslation(); const { t } = useACLTranslation();
const { data, run, loading } = useResourceActionContext(); const { data, mutate } = useResourceActionContext();
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
const [record, setRecord] = useState(null); const [record, setRecord] = useState(null);
const { role, setRole } = useContext(RolesManagerContext); const { role, setRole } = useContext(RolesManagerContext);
const [roles, setRoles] = useState([]); const [roles, setRoles] = useState([]);
const [loading, setLoading] = useState(false);
const api = useAPIClient();
const loadMore = useCallback(() => { const loadMore = useCallback(async () => {
const meta = data?.meta; const meta = data?.meta;
if (!meta || meta.page >= meta.totalPage) { if (!meta || meta.page >= meta.totalPage) {
return; return;
} }
run({ setLoading(true);
const res = await api.resource('roles').list({
page: meta.page + 1, page: meta.page + 1,
pageSize: meta.pageSize,
filter: {
'name.$ne': 'root',
},
showAnonymous: true,
sort: ['createdAt'],
appends: [],
}); });
mutate(res?.data || {});
setLoading(false);
}, [data]); }, [data]);
const { lastItem, setLastItem } = useLoadMoreObserver({ loadMore }); const { lastItem, setLastItem } = useLoadMoreObserver({ loadMore });
@ -54,7 +66,11 @@ export const RolesMenu: React.FC & {
const ref = React.createRef<any>(); const ref = React.createRef<any>();
setLastItem(ref); setLastItem(ref);
setRoles((prev) => prev.concat(data.data)); if (data.meta?.page > 1) {
setRoles((prev) => prev.concat(data.data));
} else {
setRoles(data.data);
}
}, [data, setLastItem]); }, [data, setLastItem]);
const items = useMemo( const items = useMemo(
@ -88,15 +104,12 @@ export const RolesMenu: React.FC & {
return ( return (
<> <>
{roles.length ? ( {roles.length ? (
<> <Menu
<Menu style={{ border: 'none', maxHeight: '65vh', overflowY: 'auto' }}
style={{ border: 'none', maxHeight: '65vh', overflowY: 'auto' }} items={[...items, ...(loading ? [{ key: 'loading', label: <Spin /> }] : [])]}
items={items} selectedKeys={[role?.name]}
selectedKeys={[role?.name]} onSelect={handleSelect}
onSelect={handleSelect} />
/>
{loading && <Spin />}
</>
) : ( ) : (
<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} /> <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
)} )}

2
packages/plugins/@nocobase/plugin-users/src/client/RoleUsersManager.tsx
View File

@ -93,7 +93,9 @@ export const RoleUsersManager: React.FC = () => {
const handleSelectRoleUsers = (_: number[], rows: any[]) => { const handleSelectRoleUsers = (_: number[], rows: any[]) => {
selectedRoleUsers.current = rows; selectedRoleUsers.current = rows;
}; };
const useAddRoleUsers = () => { const useAddRoleUsers = () => {
const { role } = useContext(RolesManagerContext);
const api = useAPIClient(); const api = useAPIClient();
const { setVisible } = useActionContext(); const { setVisible } = useActionContext();
const { refresh } = useResourceActionContext(); const { refresh } = useResourceActionContext();