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>

packages/global/core/workflow/node/constant.ts

@@ -1,8 +1,11 @@
+import { WorkflowIOValueTypeEnum } from '../constants';
+
 export enum FlowNodeInputTypeEnum { // render ui
   reference = 'reference', // reference to other node output
   input = 'input', // one line input
   numberInput = 'numberInput',
   switch = 'switch', // true/false
+  select = 'select',
 
   // editor
   textarea = 'textarea',
@@ -22,8 +25,6 @@ export enum FlowNodeInputTypeEnum { // render ui
   selectDatasetParamsModal = 'selectDatasetParamsModal',
   settingDatasetQuotePrompt = 'settingDatasetQuotePrompt',
 
-  select = 'select',
-
   hidden = 'hidden',
   custom = 'custom'
 }
@@ -114,8 +115,97 @@ export enum FlowNodeTypeEnum {
   lafModule = 'lafModule',
   ifElseNode = 'ifElseNode',
   variableUpdate = 'variableUpdate',
-  code = 'code'
+  code = 'code',
+  textEditor = 'textEditor',
+  customFeedback = 'customFeedback'
 }
 
+// node IO value type
+export const FlowValueTypeMap = {
+  [WorkflowIOValueTypeEnum.string]: {
+    label: 'string',
+    value: WorkflowIOValueTypeEnum.string,
+    description: ''
+  },
+  [WorkflowIOValueTypeEnum.number]: {
+    label: 'number',
+    value: WorkflowIOValueTypeEnum.number,
+    description: ''
+  },
+  [WorkflowIOValueTypeEnum.boolean]: {
+    label: 'boolean',
+    value: WorkflowIOValueTypeEnum.boolean,
+    description: ''
+  },
+  [WorkflowIOValueTypeEnum.object]: {
+    label: 'object',
+    value: WorkflowIOValueTypeEnum.object,
+    description: ''
+  },
+  [WorkflowIOValueTypeEnum.arrayString]: {
+    label: 'array<string>',
+    value: WorkflowIOValueTypeEnum.arrayString,
+    description: ''
+  },
+  [WorkflowIOValueTypeEnum.arrayNumber]: {
+    label: 'array<number>',
+    value: WorkflowIOValueTypeEnum.arrayNumber,
+    description: ''
+  },
+  [WorkflowIOValueTypeEnum.arrayBoolean]: {
+    label: 'array<boolean>',
+    value: WorkflowIOValueTypeEnum.arrayBoolean,
+    description: ''
+  },
+  [WorkflowIOValueTypeEnum.arrayObject]: {
+    label: 'array<object>',
+    value: WorkflowIOValueTypeEnum.arrayObject,
+    description: ''
+  },
+  [WorkflowIOValueTypeEnum.any]: {
+    label: 'any',
+    value: WorkflowIOValueTypeEnum.any,
+    description: ''
+  },
+  [WorkflowIOValueTypeEnum.chatHistory]: {
+    label: '历史记录',
+    value: WorkflowIOValueTypeEnum.chatHistory,
+    description: `{
+  obj: System | Human | AI;
+  value: string;
+}[]`
+  },
+  [WorkflowIOValueTypeEnum.datasetQuote]: {
+    label: '知识库引用',
+    value: WorkflowIOValueTypeEnum.datasetQuote,
+    description: `{
+  id: string;
+  datasetId: string;
+  collectionId: string;
+  sourceName: string;
+  sourceId?: string;
+  q: string;
+  a: string
+}[]`
+  },
+  [WorkflowIOValueTypeEnum.selectApp]: {
+    label: '选择应用',
+    value: WorkflowIOValueTypeEnum.selectApp,
+    description: ''
+  },
+  [WorkflowIOValueTypeEnum.selectDataset]: {
+    label: '选择知识库',
+    value: WorkflowIOValueTypeEnum.selectDataset,
+    description: `{
+  datasetId: string;
+}`
+  },
+  [WorkflowIOValueTypeEnum.dynamic]: {
+    label: '动态输入',
+    value: WorkflowIOValueTypeEnum.dynamic,
+    description: ''
+  }
+};
+
 export const EDGE_TYPE = 'default';
 export const defaultNodeVersion = '481';

packages/global/core/workflow/node/io/utils.ts

@@ -0,0 +1,17 @@
+import { FlowNodeInputItemType } from '../../type/io';
+
+export const getInputComponentProps = (input: FlowNodeInputItemType) => {
+  return {
+    referencePlaceholder: input.referencePlaceholder,
+    placeholder: input.placeholder,
+    maxLength: input.maxLength,
+    list: input.list,
+    markList: input.markList,
+    step: input.step,
+    max: input.max,
+    min: input.min,
+    defaultValue: input.defaultValue,
+    llmModelType: input.llmModelType,
+    customInputConfig: input.customInputConfig
+  };
+};

packages/global/core/workflow/node/type.d.ts

@@ -1,39 +0,0 @@
-/* 
-  react flow type
-*/
-import { FlowNodeInputTypeEnum, FlowNodeOutputTypeEnum, FlowNodeTypeEnum } from './constant';
-import { WorkflowIOValueTypeEnum, NodeInputKeyEnum, NodeOutputKeyEnum } from '../constants';
-import { SelectedDatasetType } from '../api';
-import { LLMModelTypeEnum } from '../../ai/constants';
-
-/* --------------- edit field ------------------- */
-export type EditInputFieldMapType = EditOutputFieldMapType & {
-  inputType?: boolean;
-};
-export type EditOutputFieldMapType = {
-  key?: boolean;
-  description?: boolean;
-  valueType?: boolean; // output
-  required?: boolean;
-  defaultValue?: boolean;
-};
-export type EditNodeFieldType = {
-  inputType?: FlowNodeInputTypeEnum; // input type
-  valueType?: WorkflowIOValueTypeEnum;
-  required?: boolean;
-  key?: string;
-  label?: string;
-  description?: string;
-  isToolInput?: boolean;
-
-  defaultValue?: string;
-  maxLength?: number;
-  max?: number;
-  min?: number;
-  editField?: EditInputFieldMapType;
-  dynamicParamDefaultValue?: {
-    inputType?: FlowNodeInputTypeEnum; // input type
-    valueType?: WorkflowIOValueTypeEnum;
-    required?: boolean;
-  };
-};