4.8.19-feature (#3636)

* feat: sync org from wecom, pref: member list pagination (#3549) * feat: sync org * chore: fe * chore: loading * chore: type * pref: team member list change to pagination. Edit a sort of list apis. * feat: member update avatar * chore: user avatar move to tmb * chore: init scripts move user avatar * chore: sourceMember * fix: list api sourceMember * fix: member sync * fix: pagination * chore: adjust code * chore: move changeOwner to pro * chore: init v4819 script * chore: adjust code * chore: UserBox * perf: scroll page code * perf: list data * docs:更新用户答疑 (#3576) * docs: add custom uid docs (#3572) * fix: pagination bug (#3577) * 4.8.19 test (#3584) * faet: dataset search filter * fix: scroll page * fix: collection list api old version (#3591) * fix: collection list api format * fix: type error of addSourceMemeber * fix: scroll fetch (#3592) * fix: yuque dataset file folder can enter (#3593) * 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 * fix: api dataset reference tag preview (#3600) * perf: doc * feat: chat page config * fix: http parse (#3634) * update doc * fix: http parse * fix code run node reset template (#3633) Co-authored-by: Archer <545436317@qq.com> * docs:faq (#3627) * docs:faq * docsFix * perf: sleep plugin * fix: selector --------- Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: Jiangween <145003935+Jiangween@users.noreply.github.com> Co-authored-by: heheer <heheer@sealos.io>
2025-07-23 05:12:39 +00:00 · 2025-01-20 19:42:33 +08:00
parent 9f33729ca9
commit 3c97757e4d
170 changed files with 2317 additions and 1615 deletions
--- a/packages/web/common/fetch/type.d.ts
+++ b/packages/web/common/fetch/type.d.ts
@@ -1,8 +1,13 @@
-export type PaginationProps<T = {}> = T & {
-  offset: number;
-  pageSize: number;
-};
-export type PaginationResponse<T = any> = {
+import { RequireOnlyOne } from '@fastgpt/global/common/type/utils';
+
+type PaginationProps<T = {}> = T & {
+  pageSize: number | string;
+} & RequireOnlyOne<{
+    offset: number | string;
+    pageNum: number | string;
+  }>;
+
+type PaginationResponse<T = {}> = {
  total: number;
  list: T[];
 };
--- a/packages/web/components/common/Avatar/AvatarGroup.tsx
+++ b/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}
--- a/packages/web/components/common/MySelect/index.tsx
+++ b/packages/web/components/common/MySelect/index.tsx
@@ -21,7 +21,15 @@ import type { ButtonProps, MenuItemProps } from '@chakra-ui/react';
 import MyIcon from '../Icon';
 import { useRequest2 } from '../../../hooks/useRequest';
 import MyDivider from '../MyDivider';
+import { useScrollPagination } from '../../../hooks/useScrollPagination';

+/** 选择组件 Props 类型
+ * value: 选中的值
+ * placeholder: 占位符
+ * list: 列表数据
+ * isLoading: 是否加载中
+ * ScrollData: 分页滚动数据控制器 [useScrollPagination] 的返回值
+ * */
 export type SelectProps<T = any> = ButtonProps & {
  value?: T;
  placeholder?: string;
@@ -34,6 +42,7 @@ export type SelectProps<T = any> = ButtonProps & {
  }[];
  isLoading?: boolean;
  onchange?: (val: T) => any | Promise<any>;
+  ScrollData?: ReturnType<typeof useScrollPagination>['ScrollData'];
 };

 const MySelect = <T = any,>(
@@ -44,6 +53,7 @@ const MySelect = <T = any,>(
    list = [],
    onchange,
    isLoading = false,
+    ScrollData,
    ...props
  }: SelectProps<T>,
  ref: ForwardedRef<{
@@ -87,6 +97,46 @@ const MySelect = <T = any,>(

  const isSelecting = loading || isLoading;

+  const ListRender = useMemo(() => {
+    return (
+      <>
+        {list.map((item, i) => (
+          <Box key={i}>
+            <MenuItem
+              {...menuItemStyles}
+              {...(value === item.value
+                ? {
+                    ref: SelectedItemRef,
+                    color: 'primary.700',
+                    bg: 'myGray.100',
+                    fontWeight: '600'
+                  }
+                : {
+                    color: 'myGray.900'
+                  })}
+              onClick={() => {
+                if (onChange && value !== item.value) {
+                  onChange(item.value);
+                }
+              }}
+              whiteSpace={'pre-wrap'}
+              fontSize={'sm'}
+              display={'block'}
+            >
+              <Box>{item.label}</Box>
+              {item.description && (
+                <Box color={'myGray.500'} fontSize={'xs'}>
+                  {item.description}
+                </Box>
+              )}
+            </MenuItem>
+            {item.showBorder && <MyDivider my={2} />}
+          </Box>
+        ))}
+      </>
+    );
+  }, [list, value]);
+
  return (
    <Box
      css={css({
@@ -154,39 +204,7 @@ const MySelect = <T = any,>(
          maxH={'40vh'}
          overflowY={'auto'}
        >
-          {list.map((item, i) => (
-            <Box key={i}>
-              <MenuItem
-                {...menuItemStyles}
-                {...(value === item.value
-                  ? {
-                      ref: SelectedItemRef,
-                      color: 'primary.700',
-                      bg: 'myGray.100',
-                      fontWeight: '600'
-                    }
-                  : {
-                      color: 'myGray.900'
-                    })}
-                onClick={() => {
-                  if (onChange && value !== item.value) {
-                    onChange(item.value);
-                  }
-                }}
-                whiteSpace={'pre-wrap'}
-                fontSize={'sm'}
-                display={'block'}
-              >
-                <Box>{item.label}</Box>
-                {item.description && (
-                  <Box color={'myGray.500'} fontSize={'xs'}>
-                    {item.description}
-                  </Box>
-                )}
-              </MenuItem>
-              {item.showBorder && <MyDivider my={2} />}
-            </Box>
-          ))}
+          {ScrollData ? <ScrollData>{ListRender}</ScrollData> : ListRender}
        </MenuList>
      </Menu>
    </Box>
--- a/packages/web/components/common/UserBox/index.tsx
+++ b/packages/web/components/common/UserBox/index.tsx
@@ -0,0 +1,23 @@
+import { Box, HStack, type StackProps } from '@chakra-ui/react';
+import { SourceMemberType } from '@fastgpt/global/support/user/type';
+import React from 'react';
+import Avatar from '../Avatar';
+import { useTranslation } from 'next-i18next';
+import Tag from '../Tag';
+
+export type UserBoxProps = {
+  sourceMember: SourceMemberType;
+  avatarSize?: string;
+} & StackProps;
+function UserBox({ sourceMember, avatarSize = '1.25rem', ...props }: UserBoxProps) {
+  const { t } = useTranslation();
+  return (
+    <HStack space="1" {...props}>
+      <Avatar src={sourceMember.avatar} w={avatarSize} />
+      <Box>{sourceMember.name}</Box>
+      {sourceMember.status === 'leave' && <Tag color="gray">{t('common:user_leaved')}</Tag>}
+    </HStack>
+  );
+}
+
+export default React.memo(UserBox);
--- a/packages/web/hooks/usePagination.tsx
+++ b/packages/web/hooks/usePagination.tsx
@@ -4,7 +4,6 @@ import { ArrowBackIcon, ArrowForwardIcon } from '@chakra-ui/icons';
 import { useTranslation } from 'next-i18next';
 import { useToast } from './useToast';
 import { getErrText } from '@fastgpt/global/common/error/utils';
-
 import {
  useBoolean,
  useLockFn,
@@ -14,37 +13,33 @@ import {
  useThrottleEffect
 } from 'ahooks';

+import { PaginationProps, PaginationResponse } from '../common/fetch/type';
+
 const thresholdVal = 200;

-type PagingData<T> = {
-  pageNum: number;
-  pageSize: number;
-  data: T[];
-  total?: number;
-};
-
-export function usePagination<ResT = any>({
-  api,
-  pageSize = 10,
-  params = {},
-  defaultRequest = true,
-  type = 'button',
-  onChange,
-  refreshDeps,
-  scrollLoadType = 'bottom',
-  EmptyTip
-}: {
-  api: (data: any) => Promise<PagingData<ResT>>;
-  pageSize?: number;
-  params?: Record<string, any>;
-  defaultRequest?: boolean;
-  type?: 'button' | 'scroll';
-  onChange?: (pageNum: number) => void;
-  refreshDeps?: any[];
-  throttleWait?: number;
-  scrollLoadType?: 'top' | 'bottom';
-  EmptyTip?: React.JSX.Element;
-}) {
+export function usePagination<DataT, ResT = {}>(
+  api: (data: PaginationProps<DataT>) => Promise<PaginationResponse<ResT>>,
+  {
+    pageSize = 10,
+    params,
+    defaultRequest = true,
+    type = 'button',
+    onChange,
+    refreshDeps,
+    scrollLoadType = 'bottom',
+    EmptyTip
+  }: {
+    pageSize?: number;
+    params?: DataT;
+    defaultRequest?: boolean;
+    type?: 'button' | 'scroll';
+    onChange?: (pageNum: number) => void;
+    refreshDeps?: any[];
+    throttleWait?: number;
+    scrollLoadType?: 'top' | 'bottom';
+    EmptyTip?: React.JSX.Element;
+  }
+) {
  const { toast } = useToast();
  const { t } = useTranslation();

@@ -64,7 +59,7 @@ export function usePagination<ResT = any>({
      setTrue();

      try {
-        const res: PagingData<ResT> = await api({
+        const res = await api({
          pageNum: num,
          pageSize,
          ...params
@@ -93,13 +88,13 @@ export function usePagination<ResT = any>({
              );
            }

-            setData((prevData) => (num === 1 ? res.data : [...res.data, ...prevData]));
+            setData((prevData) => (num === 1 ? res.list : [...res.list, ...prevData]));
            adjustScrollPosition();
          } else {
-            setData((prevData) => (num === 1 ? res.data : [...prevData, ...res.data]));
+            setData((prevData) => (num === 1 ? res.list : [...prevData, ...res.list]));
          }
        } else {
-          setData(res.data);
+          setData(res.list);
        }

        onChange?.(num);
--- a/packages/web/hooks/useScrollPagination.tsx
+++ b/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,
@@ -269,8 +269,10 @@ export function useScrollPagination<
    ({
      children,
      ScrollContainerRef,
+      isLoading,
      ...props
    }: {
+      isLoading?: boolean;
      children: ReactNode;
      ScrollContainerRef?: RefObject<HTMLDivElement>;
    } & BoxProps) => {
@@ -302,7 +304,7 @@ export function useScrollPagination<
      );

      return (
-        <Box {...props} ref={ref} overflow={'overlay'}>
+        <MyBox {...props} ref={ref} overflow={'overlay'} isLoading={isLoading}>
          {scrollLoadType === 'top' && total > 0 && isLoading && (
            <Box mt={2} fontSize={'xs'} color={'blackAlpha.500'} textAlign={'center'}>
              {t('common:common.is_requesting')}
@@ -325,7 +327,7 @@ export function useScrollPagination<
            </Box>
          )}
          {isEmpty && EmptyTip}
-        </Box>
+        </MyBox>
      );
    }
  );
--- a/packages/web/i18n/en/common.json
+++ b/packages/web/i18n/en/common.json
@@ -39,6 +39,7 @@
  "classification": "Classification",
  "click_to_resume": "Click to Resume",
  "code_editor": "Code Editor",
+  "code_error.account_error": "Incorrect account name or password",
  "code_error.app_error.invalid_app_type": "Invalid Application Type",
  "code_error.app_error.invalid_owner": "Unauthorized Application Owner",
  "code_error.app_error.not_exist": "Application Does Not Exist",
@@ -95,7 +96,6 @@
  "code_error.team_error.website_sync_not_enough": "Unauthorized to Use Website Sync",
  "code_error.token_error_code.403": "Invalid Login Status, Please Re-login",
  "code_error.user_error.balance_not_enough": "Insufficient Account Balance",
-  "code_error.account_error": "Incorrect account name or password",
  "code_error.user_error.bin_visitor_guest": "You Are Currently a Guest, Unauthorized to Operate",
  "code_error.user_error.un_auth_user": "User Not Found",
  "common.Action": "Action",
@@ -1273,6 +1273,7 @@
  "user.team.role.Visitor": "visitor",
  "user.team.role.writer": "writable member",
  "user.type": "Type",
+  "user_leaved": "Leaved",
  "verification": "Verification",
  "workflow.template.communication": "Communication",
  "xx_search_result": "{{key}} Search Results",
--- a/packages/web/i18n/en/workflow.json
+++ b/packages/web/i18n/en/workflow.json
@@ -13,6 +13,8 @@
  "append_application_reply_to_history_as_new_context": "Append the application's reply to the history as new context",
  "application_call": "Application Call",
  "assigned_reply": "Assigned Reply",
+  "auth_tmb_id": "Auth member",
+  "auth_tmb_id_tip": "After it is turned on, when the application is released to the outside world, the knowledge base will be filtered based on whether the user has permission to the knowledge base.\n\nIf it is not enabled, the configured knowledge base will be searched directly without permission filtering.",
  "can_not_loop": "This node can't loop.",
  "choose_another_application_to_call": "Select another application to call",
  "classification_result": "Classification Result",
--- a/packages/web/i18n/zh-CN/account_team.json
+++ b/packages/web/i18n/zh-CN/account_team.json
@@ -35,5 +35,8 @@
  "user_team_invite_member": "邀请成员",
  "user_team_leave_team": "离开团队",
  "user_team_leave_team_failed": "离开团队失败",
-  "waiting": "待接受"
+  "waiting": "待接受",
+  "sync_immediately": "立即同步",
+  "sync_member_failed": "同步成员失败",
+  "sync_member_success": "同步成员成功"
 }
--- a/packages/web/i18n/zh-CN/common.json
+++ b/packages/web/i18n/zh-CN/common.json
@@ -43,6 +43,7 @@
  "classification": "分类",
  "click_to_resume": "点击恢复",
  "code_editor": "代码编辑",
+  "code_error.account_error": "账号名或密码错误",
  "code_error.app_error.invalid_app_type": "错误的应用类型",
  "code_error.app_error.invalid_owner": "非法的应用所有者",
  "code_error.app_error.not_exist": "应用不存在",
@@ -99,7 +100,6 @@
  "code_error.team_error.website_sync_not_enough": "无权使用Web站点同步~",
  "code_error.token_error_code.403": "登录状态无效，请重新登录",
  "code_error.user_error.balance_not_enough": "账号余额不足~",
-  "code_error.account_error": "账号名或密码错误",
  "code_error.user_error.bin_visitor_guest": "您当前身份为游客，无权操作",
  "code_error.user_error.un_auth_user": "找不到该用户",
  "common.Action": "操作",
@@ -1268,6 +1268,7 @@
  "user.team.role.Visitor": "访客",
  "user.team.role.writer": "可写成员",
  "user.type": "类型",
+  "user_leaved": "已离开",
  "verification": "验证",
  "workflow.template.communication": "通信",
  "xx_search_result": "{{key}} 的搜索结果",
--- a/packages/web/i18n/zh-CN/workflow.json
+++ b/packages/web/i18n/zh-CN/workflow.json
@@ -13,6 +13,8 @@
  "append_application_reply_to_history_as_new_context": "将该应用回复内容拼接到历史记录中，作为新的上下文返回",
  "application_call": "应用调用",
  "assigned_reply": "指定回复",
+  "auth_tmb_id": "使用者鉴权",
+  "auth_tmb_id_tip": "开启后，对外发布该应用时，还会根据用户是否有该知识库权限进行知识库过滤。\n若未开启，则直接按配置的知识库进行检索，不进行权限过滤。",
  "can_not_loop": "该节点不支持循环嵌套",
  "choose_another_application_to_call": "选择一个其他应用进行调用",
  "classification_result": "分类结果",
--- a/packages/web/i18n/zh-Hant/common.json
+++ b/packages/web/i18n/zh-Hant/common.json
@@ -39,6 +39,7 @@
  "classification": "分類",
  "click_to_resume": "點選繼續",
  "code_editor": "程式碼編輯器",
+  "code_error.account_error": "帳號名稱或密碼錯誤",
  "code_error.app_error.invalid_app_type": "無效的應用程式類型",
  "code_error.app_error.invalid_owner": "非法的應用程式擁有者",
  "code_error.app_error.not_exist": "應用程式不存在",
@@ -95,7 +96,6 @@
  "code_error.team_error.website_sync_not_enough": "無權使用網站同步",
  "code_error.token_error_code.403": "登入狀態無效，請重新登入",
  "code_error.user_error.balance_not_enough": "帳戶餘額不足",
-  "code_error.account_error": "帳號名稱或密碼錯誤",
  "code_error.user_error.bin_visitor_guest": "您目前身份為訪客，無權操作",
  "code_error.user_error.un_auth_user": "找不到此使用者",
  "common.Action": "操作",
@@ -1273,6 +1273,7 @@
  "user.team.role.Visitor": "訪客",
  "user.team.role.writer": "可寫入成員",
  "user.type": "類型",
+  "user_leaved": "已離開",
  "verification": "驗證",
  "workflow.template.communication": "通訊",
  "xx_search_result": "{{key}} 的搜尋結果",
--- a/packages/web/i18n/zh-Hant/workflow.json
+++ b/packages/web/i18n/zh-Hant/workflow.json
@@ -13,6 +13,8 @@
  "append_application_reply_to_history_as_new_context": "將應用程式的回覆附加到歷史紀錄中，作為新的脈絡",
  "application_call": "應用程式呼叫",
  "assigned_reply": "指定回覆",
+  "auth_tmb_id": "使用者鑑權",
+  "auth_tmb_id_tip": "開啟後，對外發布應用程式時，也會根據使用者是否有該知識庫權限進行知識庫過濾。\n\n若未開啟，則直接按配置的知識庫進行檢索，不進行權限過濾。",
  "can_not_loop": "這個節點不能迴圈。",
  "choose_another_application_to_call": "選擇另一個應用程式來呼叫",
  "classification_result": "分類結果",