perf: load members；perf: yuque load；fix: workflow llm params cannot close (#3594)

* chat openapi doc

* feat: dataset openapi doc

* perf: load members

* perf: member load code

* perf: yuque load

* fix: workflow llm params cannot close

docSite/content/zh-cn/docs/development/openapi/chat.md

@@ -686,7 +686,7 @@ curl --location --request POST 'http://localhost:3000/api/core/chat/getHistories
 - appId - 应用 Id
 - offset - 偏移量，即从第几条数据开始取
 - pageSize - 记录数量
-- source - 对话源
+- source - 对话源。source=api，表示获取通过 API 创建的对话（不会获取到页面上的对话记录）
 {{% /alert %}}
 
 {{< /markdownify >}}

docSite/content/zh-cn/docs/development/openapi/dataset.md

@@ -733,6 +733,21 @@ data 为集合的 ID。
 {{< tab tabName="请求示例" >}}
 {{< markdownify >}}
 
+**4.8.19+**
+```bash
+curl --location --request POST 'http://localhost:3000/api/core/dataset/collection/listv2' \
+--header 'Authorization: Bearer {{authorization}}' \
+--header 'Content-Type: application/json' \
+--data-raw '{
+    "offset":0,
+    "pageSize": 10,
+    "datasetId":"6593e137231a2be9c5603ba7",
+    "parentId": null,
+    "searchText":""
+}'
+```
+
+**4.8.19-(不再维护)**
 ```bash
 curl --location --request POST 'http://localhost:3000/api/core/dataset/collection/list' \
 --header 'Authorization: Bearer {{authorization}}' \
@@ -753,7 +768,7 @@ curl --location --request POST 'http://localhost:3000/api/core/dataset/collectio
 {{< markdownify >}}
 
 {{% alert icon=" " context="success" %}}
-- pageNum: 页码（选填）
+- offset: 偏移量
 - pageSize: 每页数量，最大30（选填）
 - datasetId: 知识库的ID(必填)
 - parentId: 父级Id（选填）
@@ -773,9 +788,7 @@ curl --location --request POST 'http://localhost:3000/api/core/dataset/collectio
     "statusText": "",
     "message": "",
     "data": {
-        "pageNum": 1,
+        "list": [
-        "pageSize": 10,
-        "data": [
             {
                 "_id": "6593e137231a2be9c5603ba9",
                 "parentId": null,

docSite/content/zh-cn/docs/development/upgrading/4819.md

@@ -10,4 +10,8 @@ weight: 806
 
 ## 完整更新内容
 
-1. 新增 - 工作流知识库检索支持按知识库权限进行过滤
+1. 新增 - 工作流知识库检索支持按知识库权限进行过滤。
+2. 优化 - 成员列表分页加载。
+3. 优化 - 统一分页加载代码。
+4. 修复 - 语雀文件库导入时，嵌套文件内容无法展开的问题。
+5. 修复 - 工作流编排中，LLM 参数无法关闭问题。

packages/global/core/dataset/apiDataset.d.ts

@@ -5,7 +5,7 @@ export type APIFileItem = {
   type: 'file' | 'folder';
   updateTime: Date;
   createTime: Date;
-  canEnter?: boolean;
+  hasChild?: boolean;
 };
 
 export type APIFileServer = {

packages/global/support/user/team/org/type.d.ts

@@ -13,6 +13,7 @@ type OrgSchemaType = {
 };
 
 type OrgMemberSchemaType = {
+  _id: string;
   teamId: string;
   orgId: string;
   tmbId: string;
@@ -20,6 +21,6 @@ type OrgMemberSchemaType = {
 
 type OrgType = Omit<OrgSchemaType, 'avatar'> & {
   avatar: string;
-  members: OrgMemberSchemaType[];
   permission: TeamPermission;
+  members: OrgMemberSchemaType[];
 };

packages/service/core/dataset/apiDataset/api.ts

@@ -102,7 +102,7 @@ export const useApiDatasetRequest = ({ apiServer }: { apiServer: APIFileServer }
 
     const formattedFiles = files.map((file) => ({
       ...file,
-      canEnter: file.type === 'folder'
+      hasChild: file.type === 'folder'
     }));
 
     return formattedFiles;

packages/service/support/permission/org/orgSchema.ts

@@ -47,14 +47,11 @@ export const OrgSchema = new Schema(
 OrgSchema.virtual('members', {
   ref: OrgMemberCollectionName,
   localField: '_id',
-  foreignField: 'orgId'
+  foreignField: 'orgId',
+  match: function (this: OrgSchemaType) {
+    return { teamId: this.teamId };
+  }
 });
-// OrgSchema.virtual('permission', {
-//   ref: ResourcePermissionCollectionName,
-//   localField: '_id',
-//   foreignField: 'orgId',
-//   justOne: true
-// });
 
 try {
   OrgSchema.index({

packages/web/components/common/Avatar/AvatarGroup.tsx

@@ -23,7 +23,7 @@ function AvatarGroup({
     <Flex position="relative">
       {avatars.slice(0, max).map((avatar, index) => (
         <Avatar
-          key={avatar + groupId}
+          key={index}
           src={avatar}
           position={index > 0 ? 'absolute' : 'relative'}
           left={index > 0 ? `${index * 15}px` : 0}

packages/web/hooks/useScrollPagination.tsx

@@ -16,7 +16,7 @@ import MyBox from '../components/common/MyBox';
 import { useTranslation } from 'next-i18next';
 
 type ItemHeight<T> = (index: number, data: T) => number;
-const thresholdVal = 200;
+const thresholdVal = 100;
 
 export type ScrollListType = ({
   children,

projects/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "4.8.18",
+  "version": "4.8.19",
   "private": false,
   "scripts": {
     "dev": "next dev",

projects/app/src/components/support/permission/MemberManager/MemberModal.tsx

@@ -237,6 +237,7 @@ function MemberModal({
             />
 
             <Flex flexDirection="column" mt="3" overflow={'auto'} flex={'1 0 0'} h={0}>
+              {/* Entry */}
               {!searchText && !filterClass && (
                 <>
                   {entryList.current.map((item) => {
@@ -299,133 +300,135 @@ function MemberModal({
                 </Box>
               )}
 
-              <ScrollData
+              {filterClass && (
-                flexDirection={'column'}
+                <ScrollData
-                gap={1}
+                  flexDirection={'column'}
-                userSelect={'none'}
+                  gap={1}
-                height={'fit-content'}
+                  userSelect={'none'}
-              >
+                  height={'fit-content'}
-                {filterMembers.map((member) => {
+                >
-                  const onChange = () => {
+                  {filterOrgs.map((org) => {
-                    setSelectedMembers((state) => {
+                    const onChange = () => {
-                      if (state.includes(member.tmbId)) {
+                      setSelectedOrgIdList((state) => {
-                        return state.filter((v) => v !== member.tmbId);
+                        if (state.includes(org._id)) {
-                      }
+                          return state.filter((v) => v !== org._id);
-                      return [...state, member.tmbId];
+                        }
-                    });
+                        return [...state, org._id];
-                  };
+                      });
-                  const collaborator = collaboratorList?.find((v) => v.tmbId === member.tmbId);
+                    };
-                  return (
+                    const collaborator = collaboratorList?.find((v) => v.orgId === org._id);
-                    <HStack
+                    return (
-                      justifyContent="space-between"
+                      <HStack
-                      key={member.tmbId}
+                        justifyContent="space-between"
-                      py="2"
+                        key={org._id}
-                      px="3"
+                        py="2"
-                      borderRadius="sm"
+                        px="3"
-                      alignItems="center"
+                        borderRadius="sm"
-                      _hover={HoverBoxStyle}
+                        alignItems="center"
-                      onClick={onChange}
+                        _hover={HoverBoxStyle}
-                    >
+                        onClick={onChange}
-                      <Checkbox
+                      >
-                        isChecked={selectedMemberIdList.includes(member.tmbId)}
+                        <Checkbox
-                        pointerEvents="none"
+                          isChecked={selectedOrgIdList.includes(org._id)}
-                      />
+                          pointerEvents="none"
-                      <MyAvatar src={member.avatar} w="1.5rem" borderRadius={'50%'} />
+                        />
-                      <Box w="full" ml="2">
+                        <MyAvatar src={org.avatar} w="1.5rem" borderRadius={'50%'} />
-                        {member.memberName}
+                        <HStack ml="2" w="full" gap="5px">
-                      </Box>
+                          <Text>{org.name}</Text>
-                      <PermissionTags permission={collaborator?.permission.value} />
+                          {org.count && (
-                    </HStack>
+                            <>
-                  );
+                              <Tag size="sm" my="auto">
-                })}
+                                {org.count}
-                {filterOrgs.map((org) => {
+                              </Tag>
-                  const onChange = () => {
+                            </>
-                    setSelectedOrgIdList((state) => {
+                          )}
-                      if (state.includes(org._id)) {
+                        </HStack>
-                        return state.filter((v) => v !== org._id);
+                        <PermissionTags permission={collaborator?.permission.value} />
-                      }
-                      return [...state, org._id];
-                    });
-                  };
-                  const collaborator = collaboratorList?.find((v) => v.orgId === org._id);
-                  return (
-                    <HStack
-                      justifyContent="space-between"
-                      key={org._id}
-                      py="2"
-                      px="3"
-                      borderRadius="sm"
-                      alignItems="center"
-                      _hover={HoverBoxStyle}
-                      onClick={onChange}
-                    >
-                      <Checkbox
-                        isChecked={selectedOrgIdList.includes(org._id)}
-                        pointerEvents="none"
-                      />
-                      <MyAvatar src={org.avatar} w="1.5rem" borderRadius={'50%'} />
-                      <HStack ml="2" w="full" gap="5px">
-                        <Text>{org.name}</Text>
                         {org.count && (
-                          <>
+                          <MyIcon
-                            <Tag size="sm" my="auto">
+                            name="core/chat/chevronRight"
-                              {org.count}
+                            w="16px"
-                            </Tag>
+                            p="4px"
-                          </>
+                            rounded={'6px'}
+                            _hover={{
+                              bgColor: 'myGray.200'
+                            }}
+                            onClick={() => {
+                              setParentPath(getOrgChildrenPath(org));
+                            }}
+                          />
                         )}
                       </HStack>
-                      <PermissionTags permission={collaborator?.permission.value} />
+                    );
-                      {org.count && (
+                  })}
-                        <MyIcon
+                  {filterMembers.map((member) => {
-                          name="core/chat/chevronRight"
+                    const onChange = () => {
-                          w="16px"
+                      setSelectedMembers((state) => {
-                          p="4px"
+                        if (state.includes(member.tmbId)) {
-                          rounded={'6px'}
+                          return state.filter((v) => v !== member.tmbId);
-                          _hover={{
+                        }
-                            bgColor: 'myGray.200'
+                        return [...state, member.tmbId];
-                          }}
+                      });
-                          onClick={() => {
+                    };
-                            setParentPath(getOrgChildrenPath(org));
+                    const collaborator = collaboratorList?.find((v) => v.tmbId === member.tmbId);
-                          }}
+                    return (
+                      <HStack
+                        justifyContent="space-between"
+                        key={member.tmbId}
+                        py="2"
+                        px="3"
+                        borderRadius="sm"
+                        alignItems="center"
+                        _hover={HoverBoxStyle}
+                        onClick={onChange}
+                      >
+                        <Checkbox
+                          isChecked={selectedMemberIdList.includes(member.tmbId)}
+                          pointerEvents="none"
                         />
-                      )}
+                        <MyAvatar src={member.avatar} w="1.5rem" borderRadius={'50%'} />
-                    </HStack>
+                        <Box w="full" ml="2">
-                  );
+                          {member.memberName}
-                })}
+                        </Box>
-                {filterGroups.map((group) => {
+                        <PermissionTags permission={collaborator?.permission.value} />
-                  const onChange = () => {
+                      </HStack>
-                    setSelectedGroupIdList((state) => {
+                    );
-                      if (state.includes(group._id)) {
+                  })}
-                        return state.filter((v) => v !== group._id);
+                  {filterGroups.map((group) => {
-                      }
+                    const onChange = () => {
-                      return [...state, group._id];
+                      setSelectedGroupIdList((state) => {
-                    });
+                        if (state.includes(group._id)) {
-                  };
+                          return state.filter((v) => v !== group._id);
-                  const collaborator = collaboratorList?.find((v) => v.groupId === group._id);
+                        }
-                  return (
+                        return [...state, group._id];
-                    <HStack
+                      });
-                      justifyContent="space-between"
+                    };
-                      key={group._id}
+                    const collaborator = collaboratorList?.find((v) => v.groupId === group._id);
-                      py="2"
+                    return (
-                      px="3"
+                      <HStack
-                      borderRadius="sm"
+                        justifyContent="space-between"
-                      alignItems="center"
+                        key={group._id}
-                      _hover={HoverBoxStyle}
+                        py="2"
-                      onClick={onChange}
+                        px="3"
-                    >
+                        borderRadius="sm"
-                      <Checkbox
+                        alignItems="center"
-                        isChecked={selectedGroupIdList.includes(group._id)}
+                        _hover={HoverBoxStyle}
-                        pointerEvents="none"
+                        onClick={onChange}
-                      />
+                      >
-                      <MyAvatar src={group.avatar} w="1.5rem" borderRadius={'50%'} />
+                        <Checkbox
-                      <Box ml="2" w="full">
+                          isChecked={selectedGroupIdList.includes(group._id)}
-                        {group.name === DefaultGroupName ? userInfo?.team.teamName : group.name}
+                          pointerEvents="none"
-                      </Box>
+                        />
-                      <PermissionTags permission={collaborator?.permission.value} />
+                        <MyAvatar src={group.avatar} w="1.5rem" borderRadius={'50%'} />
-                    </HStack>
+                        <Box ml="2" w="full">
-                  );
+                          {group.name === DefaultGroupName ? userInfo?.team.teamName : group.name}
-                })}
+                        </Box>
-              </ScrollData>
+                        <PermissionTags permission={collaborator?.permission.value} />
+                      </HStack>
+                    );
+                  })}
+                </ScrollData>
+              )}
             </Flex>
           </Flex>
 

projects/app/src/pageComponents/account/team/GroupManage/GroupInfoModal.tsx

@@ -55,7 +55,7 @@ function GroupInfoModal({ onClose, editGroupId }: { onClose: () => void; editGro
     }
   );
 
-  const { run: onCreate, loading: isLoadingCreate } = useRequest2(
+  const { runAsync: onCreate, loading: isLoadingCreate } = useRequest2(
     (data: GroupFormType) => {
       return postCreateGroup({
         name: data.name,
@@ -67,7 +67,7 @@ function GroupInfoModal({ onClose, editGroupId }: { onClose: () => void; editGro
     }
   );
 
-  const { run: onUpdate, loading: isLoadingUpdate } = useRequest2(
+  const { runAsync: onUpdate, loading: isLoadingUpdate } = useRequest2(
     async (data: GroupFormType) => {
       if (!editGroupId) return;
       return putUpdateGroup({

projects/app/src/pageComponents/account/team/GroupManage/GroupManageMember.tsx

@@ -32,27 +32,26 @@ export type GroupFormType = {
   }[];
 };
 
+// 1. Owner can not be deleted, toast
+// 2. Owner/Admin can manage members
+// 3. Owner can add/remove admins
 function GroupEditModal({ onClose, editGroupId }: { onClose: () => void; editGroupId?: string }) {
-  // 1. Owner can not be deleted, toast
-  // 2. Owner/Admin can manage members
-  // 3. Owner can add/remove admins
   const { t } = useTranslation();
   const { userInfo } = useUserStore();
   const { toast } = useToast();
-  const [hoveredMemberId, setHoveredMemberId] = useState<string | undefined>(undefined);
-  const {
-    members: allMembers,
-    refetchGroups,
-    groups,
-    refetchMembers,
-    MemberScrollData
-  } = useContextSelector(TeamContext, (v) => v);
 
+  const groups = useContextSelector(TeamContext, (v) => v.groups);
+  const refetchGroups = useContextSelector(TeamContext, (v) => v.refetchGroups);
   const group = useMemo(() => {
     return groups.find((item) => item._id === editGroupId);
   }, [editGroupId, groups]);
 
+  const allMembers = useContextSelector(TeamContext, (v) => v.members);
+  const refetchMembers = useContextSelector(TeamContext, (v) => v.refetchMembers);
+  const MemberScrollData = useContextSelector(TeamContext, (v) => v.MemberScrollData);
+  const [hoveredMemberId, setHoveredMemberId] = useState<string>();
   const [members, setMembers] = useState(group?.members || []);
+
   const [searchKey, setSearchKey] = useState('');
   const filtered = useMemo(() => {
     return [
@@ -63,7 +62,7 @@ function GroupEditModal({ onClose, editGroupId }: { onClose: () => void; editGro
     ];
   }, [searchKey, allMembers]);
 
-  const { run: onUpdate, loading: isLoadingUpdate } = useRequest2(
+  const { runAsync: onUpdate, loading: isLoadingUpdate } = useRequest2(
     async () => {
       if (!editGroupId || !members.length) return;
       return putUpdateGroup({
@@ -156,39 +155,37 @@ function GroupEditModal({ onClose, editGroupId }: { onClose: () => void; editGro
                 setSearchKey(e.target.value);
               }}
             />
-            <Flex flexDirection="column" mt={3} flexGrow="1" overflow={'auto'} maxH={'400px'}>
+            <MemberScrollData mt={3} flex={'1 0 0'} h={0}>
-              <MemberScrollData>
+              {filtered.map((member) => {
-                {filtered.map((member) => {
+                return (
-                  return (
+                  <HStack
-                    <HStack
+                    py="2"
-                      py="2"
+                    px={3}
-                      px={3}
+                    borderRadius={'md'}
-                      borderRadius={'md'}
+                    alignItems="center"
-                      alignItems="center"
+                    key={member.tmbId}
-                      key={member.tmbId}
+                    cursor={'pointer'}
-                      cursor={'pointer'}
+                    _hover={{
-                      _hover={{
+                      bg: 'myGray.50',
-                        bg: 'myGray.50',
+                      ...(!isSelected(member.tmbId) ? { svg: { color: 'myGray.50' } } : {})
-                        ...(!isSelected(member.tmbId) ? { svg: { color: 'myGray.50' } } : {})
+                    }}
-                      }}
+                    _notLast={{ mb: 2 }}
-                      _notLast={{ mb: 2 }}
+                    onClick={() => handleToggleSelect(member.tmbId)}
-                      onClick={() => handleToggleSelect(member.tmbId)}
+                  >
-                    >
+                    <Checkbox
-                      <Checkbox
+                      isChecked={!!isSelected(member.tmbId)}
-                        isChecked={!!isSelected(member.tmbId)}
+                      icon={<MyIcon name={'common/check'} w={'12px'} />}
-                        icon={<MyIcon name={'common/check'} w={'12px'} />}
+                    />
-                      />
+                    <Avatar src={member.avatar} w="1.5rem" borderRadius={'50%'} />
-                      <Avatar src={member.avatar} w="1.5rem" borderRadius={'50%'} />
+                    <Box>{member.memberName}</Box>
-                      <Box>{member.memberName}</Box>
+                  </HStack>
-                    </HStack>
+                );
-                  );
+              })}
-                })}
+            </MemberScrollData>
-              </MemberScrollData>
-            </Flex>
           </Flex>
           <Flex borderLeft="1px" borderColor="myGray.200" flexDirection="column" p="4" h={'100%'}>
             <Box mt={2}>{t('common:chosen') + ': ' + members.length}</Box>
-            <Flex mt={3} flexDirection="column" flexGrow="1" overflow={'auto'} maxH={'400px'}>
+            <MemberScrollData mt={3} flex={'1 0 0'} h={0}>
               {members.map((member) => {
                 return (
                   <HStack
@@ -265,11 +262,14 @@ function GroupEditModal({ onClose, editGroupId }: { onClose: () => void; editGro
                   </HStack>
                 );
               })}
-            </Flex>
+            </MemberScrollData>
           </Flex>
         </Grid>
       </ModalBody>
-      <ModalFooter alignItems="flex-end">
+      <ModalFooter>
+        <Button variant={'whiteBase'} mr={3} onClick={onClose}>
+          {t('common:common.Close')}
+        </Button>
         <Button isLoading={isLoading} onClick={onUpdate}>
           {t('common:common.Save')}
         </Button>

projects/app/src/pageComponents/account/team/GroupManage/index.tsx

@@ -24,50 +24,43 @@ import { useUserStore } from '@/web/support/user/useUserStore';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
 import { deleteGroup } from '@/web/support/user/team/group/api';
 import { DefaultGroupName } from '@fastgpt/global/support/user/team/group/constant';
-import MemberTag from '../../../../../components/support/user/team/Info/MemberTag';
+import MemberTag from '../../../../components/support/user/team/Info/MemberTag';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
 import dynamic from 'next/dynamic';
 import { useState } from 'react';
 import IconButton from '../OrgManage/IconButton';
+import { MemberGroupType } from '@fastgpt/global/support/permission/memberGroup/type';
 
 const ChangeOwnerModal = dynamic(() => import('./GroupTransferOwnerModal'));
 const GroupInfoModal = dynamic(() => import('./GroupInfoModal'));
-const ManageGroupMemberModal = dynamic(() => import('./GroupManageMember'));
+const GroupManageMember = dynamic(() => import('./GroupManageMember'));
 
 function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
   const { t } = useTranslation();
   const { userInfo } = useUserStore();
 
-  const [editGroupId, setEditGroupId] = useState<string>();
+  const { groups, refetchGroups, members, refetchMembers } = useContextSelector(
+    TeamContext,
+    (v) => v
+  );
+
+  const [editGroup, setEditGroup] = useState<MemberGroupType>();
   const {
     isOpen: isOpenGroupInfo,
     onOpen: onOpenGroupInfo,
     onClose: onCloseGroupInfo
   } = useDisclosure();
-  const {
+
-    isOpen: isOpenManageGroupMember,
+  const onEditGroupInfo = (e: MemberGroupType) => {
-    onOpen: onOpenManageGroupMember,
+    setEditGroup(e);
-    onClose: onCloseManageGroupMember
-  } = useDisclosure();
-  const onEditGroup = (groupId: string) => {
-    setEditGroupId(groupId);
     onOpenGroupInfo();
   };
-  const onManageMember = (groupId: string) => {
-    setEditGroupId(groupId);
-    onOpenManageGroupMember();
-  };
 
   const { ConfirmModal: ConfirmDeleteGroupModal, openConfirm: openDeleteGroupModal } = useConfirm({
     type: 'delete',
     content: t('account_team:confirm_delete_group')
   });
 
-  const { groups, refetchGroups, members, refetchMembers } = useContextSelector(
-    TeamContext,
-    (v) => v
-  );
-
   const { runAsync: delDeleteGroup } = useRequest2(deleteGroup, {
     onSuccess: () => {
       refetchGroups();
@@ -75,12 +68,21 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
     }
   });
 
+  const {
+    isOpen: isOpenManageGroupMember,
+    onOpen: onOpenManageGroupMember,
+    onClose: onCloseManageGroupMember
+  } = useDisclosure();
+  const onManageMember = (e: MemberGroupType) => {
+    setEditGroup(e);
+    onOpenManageGroupMember();
+  };
+
   const hasGroupManagePer = (group: (typeof groups)[0]) =>
     userInfo?.team.permission.hasManagePer ||
     ['admin', 'owner'].includes(
       group.members.find((item) => item.tmbId === userInfo?.team.tmbId)?.role ?? ''
     );
-
   const isGroupOwner = (group: (typeof groups)[0]) =>
     userInfo?.team.permission.hasManagePer ||
     group.members.find((item) => item.role === 'owner')?.tmbId === userInfo?.team.tmbId;
@@ -90,8 +92,8 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
     onOpen: onOpenChangeOwner,
     onClose: onCloseChangeOwner
   } = useDisclosure();
-  const onChangeOwner = (groupId: string) => {
+  const onChangeOwner = (e: MemberGroupType) => {
-    setEditGroupId(groupId);
+    setEditGroup(e);
     onOpenChangeOwner();
   };
 
@@ -173,7 +175,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
                       <AvatarGroup avatars={members.map((v) => v.avatar)} groupId={group._id} />
                     ) : hasGroupManagePer(group) ? (
                       <MyTooltip label={t('account_team:manage_member')}>
-                        <Box cursor="pointer" onClick={() => onManageMember(group._id)}>
+                        <Box cursor="pointer" onClick={() => onManageMember(group)}>
                           <AvatarGroup
                             avatars={group.members.map(
                               (v) => members.find((m) => m.tmbId === v.tmbId)?.avatar ?? ''
@@ -202,14 +204,14 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
                                 label: t('account_team:edit_info'),
                                 icon: 'edit',
                                 onClick: () => {
-                                  onEditGroup(group._id);
+                                  onEditGroupInfo(group);
                                 }
                               },
                               {
                                 label: t('account_team:manage_member'),
                                 icon: 'support/team/group',
                                 onClick: () => {
-                                  onManageMember(group._id);
+                                  onManageMember(group);
                                 }
                               },
                               ...(isGroupOwner(group)
@@ -218,7 +220,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
                                       label: t('account_team:transfer_ownership'),
                                       icon: 'modal/changePer',
                                       onClick: () => {
-                                        onChangeOwner(group._id);
+                                        onChangeOwner(group);
                                       },
                                       type: 'primary' as MenuItemType
                                     },
@@ -246,25 +248,25 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
       </MyBox>
 
       <ConfirmDeleteGroupModal />
-      {isOpenChangeOwner && editGroupId && (
+      {isOpenChangeOwner && editGroup && (
-        <ChangeOwnerModal groupId={editGroupId} onClose={onCloseChangeOwner} />
+        <ChangeOwnerModal groupId={editGroup._id} onClose={onCloseChangeOwner} />
       )}
       {isOpenGroupInfo && (
         <GroupInfoModal
           onClose={() => {
             onCloseGroupInfo();
-            setEditGroupId(undefined);
+            setEditGroup(undefined);
           }}
-          editGroupId={editGroupId}
+          editGroupId={editGroup?._id}
         />
       )}
-      {isOpenManageGroupMember && (
+      {isOpenManageGroupMember && editGroup && (
-        <ManageGroupMemberModal
+        <GroupManageMember
           onClose={() => {
             onCloseManageGroupMember();
-            setEditGroupId(undefined);
+            setEditGroup(undefined);
           }}
-          editGroupId={editGroupId}
+          editGroupId={editGroup._id}
         />
       )}
     </>

projects/app/src/pageComponents/account/team/OrgManage/OrgMemberManageModal.tsx

@@ -97,7 +97,6 @@ function OrgMemberManageModal({
 
   return (
     <MyModal
-      onClose={onClose}
       isOpen
       title={t('user:team.group.manage_member')}
       iconSrc={currentOrg?.avatar}
@@ -186,7 +185,10 @@ function OrgMemberManageModal({
           </Flex>
         </Grid>
       </ModalBody>
-      <ModalFooter alignItems="flex-end">
+      <ModalFooter>
+        <Button variant={'whiteBase'} mr={3} onClick={onClose}>
+          {t('common:common.Close')}
+        </Button>
         <Button isLoading={isLoading} onClick={onUpdate}>
           {t('common:common.Save')}
         </Button>

projects/app/src/pageComponents/account/team/OrgManage/index.tsx

@@ -75,7 +75,7 @@ function OrgTable({ Tabs }: { Tabs: React.ReactNode }) {
   const { t } = useTranslation();
   const { userInfo, isTeamAdmin } = useUserStore();
 
-  const { members } = useContextSelector(TeamContext, (v) => v);
+  const { members, MemberScrollData } = useContextSelector(TeamContext, (v) => v);
   const { feConfigs } = useSystemStore();
 
   const isSyncMember = feConfigs.register_method?.includes('sync');
@@ -174,109 +174,112 @@ function OrgTable({ Tabs }: { Tabs: React.ReactNode }) {
           <Path paths={paths} rootName={userInfo?.team?.teamName} onClick={setParentPath} />
         </Box>
         <Flex flex={'1 0 0'} h={0} w={'100%'} gap={'4'}>
-          {/* Table */}
+          <MemberScrollData h={'100%'} fontSize={'sm'} flexGrow={1}>
-          <TableContainer h={'100%'} overflowY={'auto'} fontSize={'sm'} flexGrow={1}>
+            {/* Table */}
-            <Table>
+            <TableContainer>
-              <Thead>
+              <Table>
-                <Tr bg={'white !important'}>
+                <Thead>
-                  <Th bg="myGray.100" borderLeftRadius="6px">
+                  <Tr bg={'white !important'}>
-                    {t('common:Name')}
+                    <Th bg="myGray.100" borderLeftRadius="6px">
-                  </Th>
+                      {t('common:Name')}
-                  {!isSyncMember && (
-                    <Th bg="myGray.100" borderRightRadius="6px">
-                      {t('common:common.Action')}
                     </Th>
-                  )}
+                    {!isSyncMember && (
-                </Tr>
+                      <Th bg="myGray.100" borderRightRadius="6px">
-              </Thead>
+                        {t('common:common.Action')}
-              <Tbody>
+                      </Th>
-                {currentOrgs.map((org) => (
-                  <Tr key={org._id} overflow={'unset'}>
-                    <Td>
-                      <HStack
-                        cursor={'pointer'}
-                        onClick={() => setParentPath(getOrgChildrenPath(org))}
-                      >
-                        <MemberTag name={org.name} avatar={org.avatar} />
-                        <Tag size="sm">{org.count}</Tag>
-                        <MyIcon
-                          name="core/chat/chevronRight"
-                          w={'1rem'}
-                          h={'1rem'}
-                          color={'myGray.500'}
-                        />
-                      </HStack>
-                    </Td>
-                    {isTeamAdmin && !isSyncMember && (
-                      <Td w={'6rem'}>
-                        <MyMenu
-                          trigger="hover"
-                          Button={<IconButton name="more" />}
-                          menuList={[
-                            {
-                              children: [
-                                {
-                                  icon: 'edit',
-                                  label: t('account_team:edit_info'),
-                                  onClick: () => setEditOrg(org)
-                                },
-                                {
-                                  icon: 'common/file/move',
-                                  label: t('common:Move'),
-                                  onClick: () => setMovingOrg(org)
-                                },
-                                {
-                                  icon: 'delete',
-                                  label: t('account_team:delete'),
-                                  type: 'danger',
-                                  onClick: () => deleteOrgHandler(org._id)
-                                }
-                              ]
-                            }
-                          ]}
-                        />
-                      </Td>
                     )}
                   </Tr>
-                ))}
+                </Thead>
-                {currentOrg?.members.map((member) => {
+                <Tbody>
-                  const memberInfo = members.find((m) => m.tmbId === member.tmbId);
+                  {currentOrgs.map((org) => (
-                  if (!memberInfo) return null;
+                    <Tr key={org._id} overflow={'unset'}>
-
-                  return (
-                    <Tr key={member.tmbId}>
                       <Td>
-                        <MemberTag name={memberInfo.memberName} avatar={memberInfo.avatar} />
+                        <HStack
+                          cursor={'pointer'}
+                          onClick={() => setParentPath(getOrgChildrenPath(org))}
+                        >
+                          <MemberTag name={org.name} avatar={org.avatar} />
+                          <Tag size="sm">{org.count}</Tag>
+                          <MyIcon
+                            name="core/chat/chevronRight"
+                            w={'1rem'}
+                            h={'1rem'}
+                            color={'myGray.500'}
+                          />
+                        </HStack>
                       </Td>
-                      <Td w={'6rem'}>
+                      {isTeamAdmin && !isSyncMember && (
-                        {isTeamAdmin && !isSyncMember && (
+                        <Td w={'6rem'}>
                           <MyMenu
-                            trigger={'hover'}
+                            trigger="hover"
                             Button={<IconButton name="more" />}
                             menuList={[
                               {
                                 children: [
+                                  {
+                                    icon: 'edit',
+                                    label: t('account_team:edit_info'),
+                                    onClick: () => setEditOrg(org)
+                                  },
+                                  {
+                                    icon: 'common/file/move',
+                                    label: t('common:Move'),
+                                    onClick: () => setMovingOrg(org)
+                                  },
                                   {
                                     icon: 'delete',
                                     label: t('account_team:delete'),
                                     type: 'danger',
-                                    onClick: () =>
+                                    onClick: () => deleteOrgHandler(org._id)
-                                      openDeleteMemberModal(() =>
-                                        deleteMemberReq(currentOrg._id, member.tmbId)
-                                      )()
                                   }
                                 ]
                               }
                             ]}
                           />
-                        )}
+                        </Td>
-                      </Td>
+                      )}
                     </Tr>
-                  );
+                  ))}
-                })}
+                  {currentOrg?.members.map((member) => {
-              </Tbody>
+                    const memberInfo = members.find((m) => m.tmbId === member.tmbId);
-            </Table>
+                    if (!memberInfo) return null;
-          </TableContainer>
+
+                    return (
+                      <Tr key={member.tmbId}>
+                        <Td>
+                          <MemberTag name={memberInfo.memberName} avatar={memberInfo.avatar} />
+                        </Td>
+                        <Td w={'6rem'}>
+                          {isTeamAdmin && !isSyncMember && (
+                            <MyMenu
+                              trigger={'hover'}
+                              Button={<IconButton name="more" />}
+                              menuList={[
+                                {
+                                  children: [
+                                    {
+                                      icon: 'delete',
+                                      label: t('account_team:delete'),
+                                      type: 'danger',
+                                      onClick: () =>
+                                        openDeleteMemberModal(() =>
+                                          deleteMemberReq(currentOrg._id, member.tmbId)
+                                        )()
+                                    }
+                                  ]
+                                }
+                              ]}
+                            />
+                          )}
+                        </Td>
+                      </Tr>
+                    );
+                  })}
+                </Tbody>
+              </Table>
+            </TableContainer>
+          </MemberScrollData>
+
           {/* Slider */}
           {!isSyncMember && (
             <VStack w={'180px'} alignItems={'start'}>

projects/app/src/pageComponents/account/team/PermissionManage/index.tsx

@@ -24,7 +24,7 @@ import {
 import { useUserStore } from '@/web/support/user/useUserStore';
 import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
 import Avatar from '@fastgpt/web/components/common/Avatar';
-import MemberTag from '../../../../../components/support/user/team/Info/MemberTag';
+import MemberTag from '../../../../components/support/user/team/Info/MemberTag';
 import { DefaultGroupName } from '@fastgpt/global/support/user/team/group/constant';
 import {
   TeamManagePermissionVal,

projects/app/src/pages/account/team/index.tsx

@@ -11,13 +11,15 @@ import { useRouter } from 'next/router';
 import FillRowTabs from '@fastgpt/web/components/common/Tabs/FillRowTabs';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { TeamMemberRoleEnum } from '@fastgpt/global/support/user/team/constant';
-import { TeamContext, TeamModalContextProvider } from './components/context';
+import { TeamContext, TeamModalContextProvider } from '@/pageComponents/account/team/context';
 import dynamic from 'next/dynamic';
 
-const MemberTable = dynamic(() => import('./components/MemberTable'));
+const MemberTable = dynamic(() => import('@/pageComponents/account/team/MemberTable'));
-const PermissionManage = dynamic(() => import('./components/PermissionManage/index'));
+const PermissionManage = dynamic(
-const GroupManage = dynamic(() => import('./components/GroupManage/index'));
+  () => import('@/pageComponents/account/team/PermissionManage/index')
-const OrgManage = dynamic(() => import('./components/OrgManage/index'));
+);
+const GroupManage = dynamic(() => import('@/pageComponents/account/team/GroupManage/index'));
+const OrgManage = dynamic(() => import('@/pageComponents/account/team/OrgManage/index'));
 
 export enum TeamTabEnum {
   member = 'member',

projects/app/src/pages/api/common/system/getInitData.ts

@@ -8,7 +8,8 @@ async function handler(req: ApiRequestProps<{}, { bufferId?: string }>, res: Nex
   // If bufferId is the same as the current bufferId, return directly
   if (bufferId && global.systemInitBufferId && global.systemInitBufferId === bufferId) {
     return {
-      bufferId: global.systemInitBufferId
+      bufferId: global.systemInitBufferId,
+      systemVersion: global.systemVersion || '0.0.0'
     };
   }
 

projects/app/src/pages/dataset/detail/components/Import/diffSource/APIDataset.tsx

@@ -127,7 +127,7 @@ const CustomAPIFileInput = () => {
 
   const handleItemClick = useCallback(
     (item: APIFileItem) => {
-      if (item.canEnter) {
+      if (item.hasChild) {
         setPaths((state) => [...state, { parentId: item.id, parentName: item.name }]);
         return setParent({
           parentId: item.id,
@@ -250,7 +250,7 @@ const CustomAPIFileInput = () => {
                   <Box fontSize={'sm'} fontWeight={'medium'} color={'myGray.900'}>
                     {item.name}
                   </Box>
-                  {item.canEnter && <MyIcon name="core/chat/chevronRight" w={'18px'} ml={2} />}
+                  {item.hasChild && <MyIcon name="core/chat/chevronRight" w={'18px'} ml={2} />}
                 </Flex>
               );
             })}

projects/app/src/web/core/workflow/utils.ts

@@ -118,7 +118,7 @@ export const storeNode2FlowNode = ({
           toolDescription: t(templateInput.toolDescription ?? (storeInput.toolDescription as any)),
 
           selectedTypeIndex: storeInput.selectedTypeIndex ?? templateInput.selectedTypeIndex,
-          value: storeInput.value ?? templateInput.value,
+          value: storeInput.value,
           valueType: storeInput.valueType ?? templateInput.valueType,
           label: storeInput.label ?? templateInput.label
         };