fix: plugin input default value & validate (#2171)

* fix: plugin input default value & validate

* delete console

projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderInput.tsx

@@ -1,10 +1,11 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Controller } from 'react-hook-form';
 import RenderPluginInput from './renderPluginInput';
 import { Button, Flex } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import { useContextSelector } from 'use-context-selector';
 import { PluginRunContext } from '../context';
+import { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
 
 const RenderInput = () => {
   const { pluginInputs, variablesForm, histories, onStartChat, onNewChat, onSubmit, isChatting } =
@@ -14,8 +15,21 @@ const RenderInput = () => {
   const {
     control,
     handleSubmit,
+    reset,
     formState: { errors }
   } = variablesForm;
+
+  useEffect(() => {
+    reset(
+      pluginInputs.reduce(
+        (acc, input) => {
+          acc[input.key] = input.defaultValue;
+          return acc;
+        },
+        {} as Record<string, any>
+      )
+    );
+  }, [pluginInputs, histories]);
   const isDisabledInput = histories.length > 0;
 
   return (
@@ -26,7 +40,14 @@ const RenderInput = () => {
             key={input.key}
             control={control}
             name={input.key}
-            rules={{ required: input.required }}
+            rules={{
+              validate: (value) => {
+                if (input.valueType === WorkflowIOValueTypeEnum.boolean) {
+                  return value !== undefined;
+                }
+                return !!value;
+              }
+            }}
             render={({ field: { onChange, value } }) => {
               return (
                 <RenderPluginInput

projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/renderPluginInput.tsx

@@ -18,6 +18,7 @@ const JsonEditor = dynamic(() => import('@fastgpt/web/components/common/Textarea
 
 const RenderPluginInput = ({
   value,
+  defaultValue,
   onChange,
   label,
   description,
@@ -30,6 +31,7 @@ const RenderPluginInput = ({
   isInvalid
 }: {
   value: any;
+  defaultValue?: any;
   onChange: () => void;
   label: string;
   description?: string;
@@ -48,6 +50,7 @@ const RenderPluginInput = ({
       return (
         <Textarea
           value={value}
+          defaultValue={defaultValue}
           onChange={onChange}
           isDisabled={isDisabled}
           placeholder={t(placeholder as any)}
@@ -66,7 +69,7 @@ const RenderPluginInput = ({
           isDisabled={isDisabled}
           isInvalid={isInvalid}
         >
-          <NumberInputField value={value} onChange={onChange} />
+          <NumberInputField value={value} onChange={onChange} defaultValue={defaultValue} />
           <NumberInputStepper>
             <NumberIncrementStepper />
             <NumberDecrementStepper />
@@ -81,6 +84,7 @@ const RenderPluginInput = ({
           onChange={onChange}
           isDisabled={isDisabled}
           isInvalid={isInvalid}
+          defaultChecked={defaultValue}
         />
       );
     }
@@ -93,6 +97,7 @@ const RenderPluginInput = ({
         value={value}
         onChange={onChange}
         isInvalid={isInvalid}
+        defaultValue={defaultValue}
       />
     );
   })();

projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx

@@ -36,10 +36,7 @@ import {
   getSystemPluginPaths
 } from '@/web/core/app/api/plugin';
 import MyBox from '@fastgpt/web/components/common/MyBox';
-import { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
+import { Controller, useForm } from 'react-hook-form';
-import { useForm } from 'react-hook-form';
-import JsonEditor from '@fastgpt/web/components/common/Textarea/JsonEditor';
-import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
 import { getTeamPlugTemplates } from '@/web/core/app/api/plugin';
 import { ParentIdType } from '@fastgpt/global/common/parentFolder/type';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
@@ -48,6 +45,8 @@ import FolderPath from '@/components/common/folder/Path';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
 import CostTooltip from '@/components/core/app/plugin/CostTooltip';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
+import RenderPluginInput from '@/components/core/chat/ChatContainer/PluginRunBox/components/renderPluginInput';
+import { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
 
 type Props = {
   selectedTools: FlowNodeTemplateType[];
@@ -189,7 +188,25 @@ const RenderList = React.memo(function RenderList({
   const [configTool, setConfigTool] = useState<FlowNodeTemplateType>();
   const onCloseConfigTool = useCallback(() => setConfigTool(undefined), []);
 
-  const { register, getValues, setValue, handleSubmit, reset } = useForm<Record<string, any>>({});
+  const {
+    handleSubmit,
+    reset,
+    control,
+    formState: { errors }
+  } = useForm();
+
+  useEffect(() => {
+    if (configTool) {
+      const defaultValues = configTool.inputs.reduce(
+        (acc, input) => {
+          acc[input.key] = input.defaultValue;
+          return acc;
+        },
+        {} as Record<string, any>
+      );
+      reset(defaultValues);
+    }
+  }, [configTool, reset]);
 
   const { mutate: onClickAdd, isLoading } = useRequest({
     mutationFn: async (template: FlowNodeTemplateType) => {
@@ -314,66 +331,37 @@ const RenderList = React.memo(function RenderList({
             {configTool.inputs
               .filter((item) => !item.toolDescription)
               .map((input) => {
-                const required = input.required || false;
-
                 return (
-                  <Box key={input.key} _notLast={{ mb: 4 }} px={1}>
+                  <Controller
-                    <Flex position={'relative'} mb={1} alignItems={'center'}>
+                    key={input.key}
-                      {t(input.debugLabel || (input.label as any))}
+                    control={control}
-                      {input.description && <QuestionTip label={input.description} ml={1} />}
+                    name={input.key}
-                    </Flex>
+                    rules={{
-                    {(() => {
+                      validate: (value) => {
-                      if (input.valueType === WorkflowIOValueTypeEnum.string) {
+                        if (input.valueType === WorkflowIOValueTypeEnum.boolean) {
-                        return (
+                          return value !== undefined;
-                          <Textarea
-                            {...register(input.key, {
-                              required
-                            })}
-                            placeholder={t(input.placeholder || ('' as any))}
-                            bg={'myGray.50'}
-                          />
-                        );
                         }
-                      if (input.valueType === WorkflowIOValueTypeEnum.number) {
+                        return !!value;
+                      }
+                    }}
+                    render={({ field: { onChange, value } }) => {
                       return (
-                          <NumberInput
+                        <RenderPluginInput
-                            step={input.step}
+                          value={value}
+                          onChange={onChange}
+                          label={input.label}
+                          description={input.description}
+                          valueType={input.valueType}
+                          placeholder={input.placeholder}
+                          required={input.required}
                           min={input.min}
                           max={input.max}
-                            bg={'myGray.50'}
+                          isInvalid={errors && Object.keys(errors).includes(input.key)}
-                          >
-                            <NumberInputField
-                              {...register(input.key, {
-                                required: input.required,
-                                min: input.min,
-                                max: input.max,
-                                valueAsNumber: true
-                              })}
                         />
-                            <NumberInputStepper>
-                              <NumberIncrementStepper />
-                              <NumberDecrementStepper />
-                            </NumberInputStepper>
-                          </NumberInput>
                       );
-                      }
-                      if (input.valueType === WorkflowIOValueTypeEnum.boolean) {
-                        return <Switch {...register(input.key, { required })} />;
-                      }
-                      return (
-                        <JsonEditor
-                          bg={'myGray.50'}
-                          placeholder={t(input.placeholder || ('' as any))}
-                          resize
-                          value={getValues(input.key)}
-                          onChange={(e) => {
-                            setValue(input.key, e);
                     }}
                   />
                 );
-                    })()}
-                  </Box>
-                );
               })}
           </ModalBody>
           <ModalFooter gap={6}>