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>
2024-07-04 17:42:09 +08:00
parent babf03c218
commit a9cdece341
303 changed files with 18883 additions and 13149 deletions
--- a/projects/app/src/components/support/permission/ResumeInheritText/index.tsx
+++ b/projects/app/src/components/support/permission/ResumeInheritText/index.tsx
@@ -0,0 +1,47 @@
+import { useI18n } from '@/web/context/I18n';
+import { Box, BoxProps } from '@chakra-ui/react';
+import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
+import { useToast } from '@fastgpt/web/hooks/useToast';
+import React from 'react';
+
+const ResumeInherit = ({
+  onResume,
+  ...props
+}: BoxProps & {
+  onResume?: () => Promise<any> | any;
+}) => {
+  const { commonT } = useI18n();
+  const { toast } = useToast();
+  const { ConfirmModal: CommonConfirmModal, openConfirm: openCommonConfirm } = useConfirm({});
+
+  return onResume ? (
+    <Box display={'inline'} fontSize={'sm'} {...props}>
+      {commonT('permission.No InheritPermission')}
+      <Box
+        display={'inline'}
+        textDecoration={'underline'}
+        cursor={'pointer'}
+        _hover={{ color: 'primary.600' }}
+        onClick={() => {
+          openCommonConfirm(
+            () =>
+              onResume()?.then(() => {
+                toast({
+                  title: commonT('permission.Resume InheritPermission Success'),
+                  status: 'success'
+                });
+              }),
+            undefined,
+            commonT('permission.Resume InheritPermission Confirm')
+          )();
+        }}
+      >
+        {commonT('Click to resume')}
+      </Box>
+
+      <CommonConfirmModal />
+    </Box>
+  ) : null;
+};
+
+export default ResumeInherit;