V4.8.18 feature (#3565)

* feat: org CRUD (#3380)

* feat: add org schema

* feat: org manage UI

* feat: OrgInfoModal

* feat: org tree view

* feat: org management

* fix: init root org

* feat: org permission for app

* feat: org support for dataset

* fix: disable org role control

* styles: opt type signatures

* fix: remove unused permission

* feat: delete org collaborator

* perf: Team org ui (#3499)

* perf: org ui

* perf: org ui

* feat: org auth for app & dataset (#3498)

* feat: auth org resource permission

* feat: org auth support for app & dataset

* perf: org permission check (#3500)

* i18n (#3501)

* name

* i18n

* feat: support dataset changeOwner (#3483)

* feat: support dataset changeOwner

* chore: update dataset change owner api

* feat: permission manage UI for org (#3503)

* perf: password check;perf: image upload check;perf: sso login check (#3509)

* perf: password check

* perf: image upload check

* perf: sso login check

* force show update notification modal & fix login page text (#3512)

* fix login page English text

* update notification modal

* perf: notify account (#3515)

* perf(plugin): improve searXNG empty result handling and documentation (#3507)

* perf(plugin): improve searXNG empty result handling and documentation

* 修改了文档和代码部分无搜索的结果的反馈

* refactor: org pathId (#3516)

* optimize payment process (#3517)

* feat: support wecom sso (#3518)

* feat: support wecom sso

* chore: remove unused wecom js-sdk dependency

* fix qrcode script (#3520)

* fix qrcode script

* i18n

* perf: full text collection and search code;perf: rename function (#3519)

* perf: full text collection and search code

* perf: rename function

* perf: notify modal

* remove invalid code

* perf: sso login

* perf: pay process

* 4.8.18 test (#3524)

* perf: remove local token

* perf: index

* perf: file encoding;perf: leave team code;@c121914yu perf: full text search code (#3528)

* perf: text encoding

* perf: leave team code

* perf: full text search code

* fix: http status

* perf: embedding search and vector avatar

* perf: async read file (#3531)

* refactor: team permission  manager (#3535)

* perf: classify org, group and member

* refactor: team per manager

* fix: missing functions

* 4.8.18 test (#3543)

* perf: login check

* doc

* perf: llm model config

* perf: team clb config

* fix: MemberModal UI (#3553)

* fix: adapt MemberModal title and icon

* fix: adapt member modal

* fix: search input placeholder

* fix: add button text

* perf: org permission (#3556)

* docs:用户答疑的官方文档补充 (#3540)

* docs:用户答疑的官方文档补充

* 问题回答的内容修补

* share link random avatar (#3541)

* share link random avatar

* fix

* delete unused code

* share page avatar (#3558)

* feat: init 4818

* share page avatar

* feat: tmp upgrade code (#3559)

* feat: tmp upgrade code

* fulltext search test

* update action

* full text tmp code (#3561)

* full text tmp code

* fix: init

* fix: init

* remove tmp code

* remove tmp code

* 4818-alpha

* 4.8.18 test (#3562)

* full text tmp code

* fix: init

* upgrade code

* account log

* account log

* perf: dockerfile

* upgrade code

* chore: update docs app template submission (#3564)

---------

Co-authored-by: a.e. <49438478+I-Info@users.noreply.github.com>
Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com>
Co-authored-by: heheer <heheer@sealos.io>
Co-authored-by: Jiangween <145003935+Jiangween@users.noreply.github.com>

projects/app/src/pages/account/info/components/UpdateNotificationModal.tsx

@@ -1,111 +0,0 @@
-import React from 'react';
-import { ModalBody, Box, Flex, Input, ModalFooter, Button, HStack } from '@chakra-ui/react';
-import MyModal from '@fastgpt/web/components/common/MyModal';
-import { useTranslation } from 'next-i18next';
-import { useForm } from 'react-hook-form';
-import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
-import { updateNotificationAccount } from '@/web/support/user/api';
-import Icon from '@fastgpt/web/components/common/Icon';
-import { useSendCode } from '@/web/support/user/hooks/useSendCode';
-import { useUserStore } from '@/web/support/user/useUserStore';
-import { useSystemStore } from '@/web/common/system/useSystemStore';
-
-type FormType = {
-  account: string;
-  verifyCode: string;
-};
-
-const UpdateNotificationModal = ({ onClose }: { onClose: () => void }) => {
-  const { t } = useTranslation();
-  const { initUserInfo } = useUserStore();
-  const { feConfigs } = useSystemStore();
-
-  const { register, handleSubmit, watch } = useForm<FormType>({
-    defaultValues: {
-      account: '',
-      verifyCode: ''
-    }
-  });
-  const account = watch('account');
-  const verifyCode = watch('verifyCode');
-
-  const { runAsync: onSubmit, loading: isLoading } = useRequest2(
-    (data: FormType) => {
-      return updateNotificationAccount(data);
-    },
-    {
-      onSuccess() {
-        initUserInfo();
-        onClose();
-      },
-      successToast: t('account_info:bind_notification_success'),
-      errorToast: t('account_info:bind_notification_error')
-    }
-  );
-
-  const { SendCodeBox } = useSendCode({ type: 'bindNotification' });
-
-  const placeholder = feConfigs?.bind_notification_method
-    ?.map((item) => {
-      switch (item) {
-        case 'email':
-          return t('account_info:email_label');
-        case 'phone':
-          return t('account_info:phone_label');
-      }
-    })
-    .join('/');
-
-  return (
-    <>
-      <MyModal
-        isOpen
-        iconSrc="common/settingLight"
-        w={'32rem'}
-        title={t('account_info:notification_receiving_hint')}
-      >
-        <ModalBody px={10}>
-          <Flex flexDirection="column">
-            <HStack px="6" py="3" color="primary.600" bgColor="primary.50" borderRadius="md">
-              <Icon name="common/info" w="1rem" />
-              <Box fontSize={'sm'}>{t('account_info:bind_notification_hint')}</Box>
-            </HStack>
-            <Flex mt="4" alignItems="center">
-              <Box flex={'0 0 70px'}>{t('account_info:user_account')}</Box>
-              <Input
-                flex={1}
-                bg={'myGray.50'}
-                {...register('account', { required: true })}
-                placeholder={placeholder}
-              ></Input>
-            </Flex>
-            <Flex mt="6" alignItems="center" position={'relative'}>
-              <Box flex={'0 0 70px'}>{t('account_info:verification_code')}</Box>
-              <Input
-                flex={1}
-                bg={'myGray.50'}
-                {...register('verifyCode', { required: true })}
-                placeholder={t('account_info:code_required')}
-              ></Input>
-              <SendCodeBox username={account} />
-            </Flex>
-          </Flex>
-        </ModalBody>
-        <ModalFooter>
-          <Button mr={3} variant={'whiteBase'} onClick={onClose}>
-            {t('account_info:cancel')}
-          </Button>
-          <Button
-            isLoading={isLoading}
-            isDisabled={!account || !verifyCode}
-            onClick={handleSubmit((data) => onSubmit(data))}
-          >
-            {t('account_info:confirm')}
-          </Button>
-        </ModalFooter>
-      </MyModal>
-    </>
-  );
-};
-
-export default UpdateNotificationModal;

projects/app/src/pages/account/info/components/UpdatePswModal.tsx

@@ -3,8 +3,10 @@ import { ModalBody, Box, Flex, Input, ModalFooter, Button } from '@chakra-ui/rea
 import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useTranslation } from 'next-i18next';
 import { useForm } from 'react-hook-form';
-import { useRequest } from '@fastgpt/web/hooks/useRequest';
+import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
 import { updatePasswordByOld } from '@/web/support/user/api';
+import { PasswordRule } from '@/web/support/user/login/constants';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 
 type FormType = {
   oldPsw: string;
@@ -14,7 +16,9 @@ type FormType = {
 
 const UpdatePswModal = ({ onClose }: { onClose: () => void }) => {
   const { t } = useTranslation();
-  const { register, handleSubmit } = useForm<FormType>({
+  const { toast } = useToast();
+
+  const { register, handleSubmit, getValues } = useForm<FormType>({
     defaultValues: {
       oldPsw: '',
       newPsw: '',
@@ -22,19 +26,25 @@ const UpdatePswModal = ({ onClose }: { onClose: () => void }) => {
     }
   });
 
-  const { mutate: onSubmit, isLoading } = useRequest({
-    mutationFn: (data: FormType) => {
-      if (data.newPsw !== data.confirmPsw) {
-        return Promise.reject(t('account_info:password_mismatch'));
-      }
-      return updatePasswordByOld(data);
-    },
+  const { runAsync: onSubmit, loading: isLoading } = useRequest2(updatePasswordByOld, {
     onSuccess() {
       onClose();
     },
     successToast: t('account_info:password_update_success'),
     errorToast: t('account_info:password_update_error')
   });
+  const onSubmitErr = (err: Record<string, any>) => {
+    const val = Object.values(err)[0];
+    if (!val) return;
+    if (val.message) {
+      toast({
+        status: 'warning',
+        title: val.message,
+        duration: 3000,
+        isClosable: true
+      });
+    }
+  };
 
   return (
     <MyModal
@@ -45,34 +55,39 @@ const UpdatePswModal = ({ onClose }: { onClose: () => void }) => {
     >
       <ModalBody>
         <Flex alignItems={'center'}>
-          <Box flex={'0 0 70px'}>{t('account_info:old_password') + ':'}</Box>
+          <Box flex={'0 0 70px'} fontSize={'sm'}>
+            {t('account_info:old_password') + ':'}
+          </Box>
           <Input flex={1} type={'password'} {...register('oldPsw', { required: true })}></Input>
         </Flex>
         <Flex alignItems={'center'} mt={5}>
-          <Box flex={'0 0 70px'}>{t('account_info:new_password') + ':'}</Box>
+          <Box flex={'0 0 70px'} fontSize={'sm'}>
+            {t('account_info:new_password') + ':'}
+          </Box>
           <Input
             flex={1}
             type={'password'}
+            placeholder={t('account_info:password_tip')}
             {...register('newPsw', {
               required: true,
-              maxLength: {
-                value: 60,
-                message: t('account_info:password_length_error')
+              pattern: {
+                value: PasswordRule,
+                message: t('account_info:password_tip')
               }
             })}
           ></Input>
         </Flex>
         <Flex alignItems={'center'} mt={5}>
-          <Box flex={'0 0 70px'}>{t('account_info:confirm_password') + ':'}</Box>
+          <Box flex={'0 0 70px'} fontSize={'sm'}>
+            {t('account_info:confirm_password') + ':'}
+          </Box>
           <Input
             flex={1}
             type={'password'}
+            placeholder={t('user:password.confirm')}
             {...register('confirmPsw', {
               required: true,
-              maxLength: {
-                value: 60,
-                message: t('account_info:password_length_error')
-              }
+              validate: (val) => (getValues('newPsw') === val ? true : t('user:password.not_match'))
             })}
           ></Input>
         </Flex>
@@ -81,7 +96,7 @@ const UpdatePswModal = ({ onClose }: { onClose: () => void }) => {
         <Button mr={3} variant={'whiteBase'} onClick={onClose}>
           {t('account_info:cancel')}
         </Button>
-        <Button isLoading={isLoading} onClick={handleSubmit((data) => onSubmit(data))}>
+        <Button isLoading={isLoading} onClick={handleSubmit((data) => onSubmit(data), onSubmitErr)}>
           {t('account_info:confirm')}
         </Button>
       </ModalFooter>

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

@@ -9,8 +9,7 @@ import {
   Link,
   Progress,
   Grid,
-  BoxProps,
-  FlexProps
+  BoxProps
 } from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
 import { UserUpdateParams } from '@/types/user';
@@ -20,7 +19,6 @@ import type { UserType } from '@fastgpt/global/support/user/type.d';
 import { useQuery } from '@tanstack/react-query';
 import dynamic from 'next/dynamic';
 import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
-import { compressImgFileAndUpload } from '@/web/common/file/controller';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { useTranslation } from 'next-i18next';
 import Avatar from '@fastgpt/web/components/common/Avatar';
@@ -29,7 +27,6 @@ import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
 import { formatStorePrice2Read } from '@fastgpt/global/support/wallet/usage/tools';
 import { putUpdateMemberName } from '@/web/support/user/team/api';
 import { getDocPath } from '@/web/common/system/doc';
-import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants';
 import {
   StandardSubLevelEnum,
   standardSubLevelMap
@@ -49,7 +46,9 @@ import TeamSelector from '../components/TeamSelector';
 const StandDetailModal = dynamic(() => import('./components/standardDetailModal'), { ssr: false });
 const ConversionModal = dynamic(() => import('./components/ConversionModal'));
 const UpdatePswModal = dynamic(() => import('./components/UpdatePswModal'));
-const UpdateNotification = dynamic(() => import('./components/UpdateNotificationModal'));
+const UpdateNotification = dynamic(
+  () => import('@/components/support/user/inform/UpdateNotificationModal')
+);
 const CommunityModal = dynamic(() => import('@/components/CommunityModal'));
 
 const ModelPriceModal = dynamic(() =>
@@ -131,7 +130,11 @@ const MyInfo = ({ onOpenContact }: { onOpenContact: () => void }) => {
     onClose: onCloseUpdateNotification,
     onOpen: onOpenUpdateNotification
   } = useDisclosure();
-  const { File, onOpen: onOpenSelectFile } = useSelectFile({
+  const {
+    File,
+    onOpen: onOpenSelectFile,
+    onSelectImage
+  } = useSelectFile({
     fileType: '.jpg,.png',
     multiple: false
   });
@@ -151,32 +154,6 @@ const MyInfo = ({ onOpenContact }: { onOpenContact: () => void }) => {
     [reset, t, toast, updateUserInfo]
   );
 
-  const onSelectFile = useCallback(
-    async (e: File[]) => {
-      const file = e[0];
-      if (!file || !userInfo) return;
-      try {
-        const src = await compressImgFileAndUpload({
-          type: MongoImageTypeEnum.userAvatar,
-          file,
-          maxW: 300,
-          maxH: 300
-        });
-
-        onclickSave({
-          ...userInfo,
-          avatar: src
-        });
-      } catch (err: any) {
-        toast({
-          title: typeof err === 'string' ? err : t('account_info:avatar_selection_exception'),
-          status: 'warning'
-        });
-      }
-    },
-    [onclickSave, t, toast, userInfo]
-  );
-
   const labelStyles: BoxProps = {
     flex: '0 0 80px',
     fontSize: 'sm',
@@ -329,7 +306,21 @@ const MyInfo = ({ onOpenContact }: { onOpenContact: () => void }) => {
       )}
       {isOpenUpdatePsw && <UpdatePswModal onClose={onCloseUpdatePsw} />}
       {isOpenUpdateNotification && <UpdateNotification onClose={onCloseUpdateNotification} />}
-      <File onSelect={onSelectFile} />
+      <File
+        onSelect={(e) =>
+          onSelectImage(e, {
+            maxW: 300,
+            maxH: 300,
+            callback: (src) => {
+              if (!userInfo) return;
+              onclickSave({
+                ...userInfo,
+                avatar: src
+              });
+            }
+          })
+        }
+      />
     </Box>
   );
 };