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/api/plugins/customFeedback/v2/index.ts

@@ -3,17 +3,25 @@ import type { HttpBodyType } from '@fastgpt/global/core/workflow/api.d';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { addCustomFeedbacks } from '@fastgpt/service/core/chat/controller';
 import { authRequestFromLocal } from '@fastgpt/service/support/permission/auth/common';
-import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { SystemVariablesType } from '@fastgpt/global/core/workflow/runtime/type';
+import { replaceVariable } from '@fastgpt/global/common/string/tools';
 
-type Props = HttpBodyType<{
-  customFeedback: string;
-}>;
+type Props = HttpBodyType<
+  SystemVariablesType & {
+    customFeedback: string;
+    customInputs: Record<string, any>;
+  }
+>;
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
     const {
       customFeedback,
-      [NodeInputKeyEnum.addInputParam]: { appId, chatId, responseChatItemId: chatItemId }
+      appId,
+      chatId,
+      responseChatItemId: chatItemId,
+      customInputs
     } = req.body as Props;
 
     await authRequestFromLocal({ req });
@@ -22,25 +30,27 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       return res.json({});
     }
 
+    const feedbackText = replaceVariable(customFeedback, customInputs);
+
     // wait the chat finish
     setTimeout(() => {
       addCustomFeedbacks({
         appId,
         chatId,
         chatItemId,
-        feedbacks: [customFeedback]
+        feedbacks: [feedbackText]
       });
     }, 60000);
 
     if (!chatId || !chatItemId) {
       return res.json({
-        [NodeOutputKeyEnum.answerText]: `\\n\\n**自动反馈调试**: "${customFeedback}"\\n\\n`,
-        text: customFeedback
+        [NodeOutputKeyEnum.answerText]: `\\n\\n**自动反馈调试**: "${feedbackText}"\\n\\n`,
+        text: feedbackText
       });
     }
 
     res.json({
-      text: customFeedback
+      text: feedbackText
     });
   } catch (err) {
     console.log(err);

projects/app/src/pages/api/plugins/textEditor/v2/index.ts

@@ -1,18 +1,18 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
+import type { NextApiResponse } from 'next';
 import type { HttpBodyType } from '@fastgpt/global/core/workflow/api.d';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 import { replaceVariable } from '@fastgpt/global/common/string/tools';
 import { authRequestFromLocal } from '@fastgpt/service/support/permission/auth/common';
-import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
+import { ApiRequestProps } from '@fastgpt/service/type/next';
 
 type Props = HttpBodyType<{
   text: string;
-  [key: string]: any;
+  customInputs: Record<string, any>;
 }>;
 
-export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+export default async function handler(req: ApiRequestProps<Props>, res: NextApiResponse<any>) {
   try {
-    const { text, [NodeInputKeyEnum.addInputParam]: obj } = req.body as Props;
+    const { text, customInputs: obj = {} } = req.body;
 
     await authRequestFromLocal({ req });