4.8.6 merge (#1943)

* Dataset collection forbid (#1885)

* perf: tool call support same id

* feat: collection forbid

* feat: collection forbid

* Inheritance Permission for apps (#1897)

* feat: app schema define

chore: references of authapp

* feat: authApp method inheritance

* feat: create and update api

* feat: update

* feat: inheritance Permission controller for app.

* feat: abstract version of inheritPermission

* feat: ancestorId for apps

* chore: update app

* fix: inheritPermission abstract version

* feat: update folder defaultPermission

* feat: app update api

* chore: inheritance frontend

* chore: app list api

* feat: update defaultPermission in app deatil

* feat: backend api finished

* feat: app inheritance permission fe

* fix: app update defaultpermission causes collaborator miss

* fix: ts error

* chore: adjust the codes

* chore: i18n

chore: i18n

* chore: fe adjust and i18n

* chore: adjust the code

* feat: resume api;
chore: rewrite update api and inheritPermission methods

* chore: something

* chore: fe code adjusting

* feat: frontend adjusting

* chore: fe code adjusting

* chore: adjusting the code

* perf: fe loading

* format

* Inheritance fix (#1908)

* fix: SlideCard

* fix: authapp did not return parent app for inheritance app

* fix: fe adjusting

* feat: fe adjusing

* perf: inherit per ux

* doc

* fix: ts errors (#1916)

* perf: inherit permission

* fix: permission inherit

* Workflow type (#1938)

* perf: workflow type

tmp workflow

perf: workflow type

feat: custom field config

* perf: dynamic input

* perf: node classify

* perf: node classify

* perf: node classify

* perf: node classify

* fix: workflow custom input

* feat: text editor and customFeedback move to basic nodes

* feat: community system plugin

* fix: ts

* feat: exprEval plugin

* perf: workflow type

* perf: plugin important

* fix: default templates

* perf: markdown hr css

* lock

* perf: fetch url

* perf: new plugin version

* fix: chat histories update

* fix: collection paths invalid

* perf: app card ui

---------

Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com>

projects/app/src/pages/account/components/BillTable.tsx

@@ -37,17 +37,21 @@ import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
 const BillTable = () => {
   const { t } = useTranslation();
   const { toast } = useToast();
-  const [billType, setBillType] = useState<`${BillTypeEnum}` | ''>('');
+  const [billType, setBillType] = useState<BillTypeEnum | ''>('');
   const [billDetail, setBillDetail] = useState<BillSchemaType>();
 
   const billTypeList = useMemo(
-    () => [
-      { label: t('common.All'), value: '' },
-      ...Object.entries(billTypeMap).map(([key, value]) => ({
-        label: t(value.label),
-        value: key
-      }))
-    ],
+    () =>
+      [
+        { label: t('common.All'), value: '' },
+        ...Object.entries(billTypeMap).map(([key, value]) => ({
+          label: t(value.label),
+          value: key
+        }))
+      ] as {
+        label: string;
+        value: BillTypeEnum | '';
+      }[],
     [t]
   );
 
@@ -106,7 +110,7 @@ const BillTable = () => {
             <Tr>
               <Th>#</Th>
               <Th>
-                <MySelect
+                <MySelect<BillTypeEnum | ''>
                   list={billTypeList}
                   value={billType}
                   size={'sm'}

projects/app/src/pages/account/components/Info.tsx

@@ -661,7 +661,7 @@ const Other = () => {
             h={'48px'}
             fontSize={'sm'}
           >
-            联系我们
+            {t('system.Concat us')}
           </Button>
         )}
       </Grid>

projects/app/src/pages/account/components/UsageTable.tsx

@@ -40,19 +40,23 @@ const UsageTable = () => {
     from: addDays(new Date(), -7),
     to: new Date()
   });
-  const [usageSource, setUsageSource] = useState<`${UsageSourceEnum}` | ''>('');
+  const [usageSource, setUsageSource] = useState<UsageSourceEnum | ''>('');
   const { isPc } = useSystemStore();
   const { userInfo } = useUserStore();
   const [usageDetail, setUsageDetail] = useState<UsageItemType>();
 
   const sourceList = useMemo(
-    () => [
-      { label: t('common.All'), value: '' },
-      ...Object.entries(UsageSourceMap).map(([key, value]) => ({
-        label: t(value.label),
-        value: key
-      }))
-    ],
+    () =>
+      [
+        { label: t('common.All'), value: '' },
+        ...Object.entries(UsageSourceMap).map(([key, value]) => ({
+          label: t(value.label),
+          value: key
+        }))
+      ] as {
+        label: never;
+        value: UsageSourceEnum | '';
+      }[],
     [t]
   );
 
@@ -144,7 +148,7 @@ const UsageTable = () => {
               {/* <Th>{t('user.team.Member Name')}</Th> */}
               <Th>{t('user.Time')}</Th>
               <Th>
-                <MySelect
+                <MySelect<UsageSourceEnum | ''>
                   list={sourceList}
                   value={usageSource}
                   size={'sm'}