From c41def5fbb580cdfece4b26063bb180c01cd8cdf Mon Sep 17 00:00:00 2001
From: Archer <545436317@qq.com>
Date: Fri, 13 Dec 2024 08:28:33 +0800
Subject: [PATCH] Fix input (#3385)

* doc

* fix: inputs

* fix: inputs

* fix: inputs

* fix: inputs
---
 .../content/zh-cn/docs/development/upgrading/4815.md  |  2 +-
 files/docker/docker-compose-milvus.yml                |  4 ++--
 files/docker/docker-compose-pgvector.yml              |  4 ++--
 files/docker/docker-compose-zilliz.yml                |  4 ++--
 .../Flow/nodes/render/RenderInput/index.tsx           | 11 ++++++++---
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/docSite/content/zh-cn/docs/development/upgrading/4815.md b/docSite/content/zh-cn/docs/development/upgrading/4815.md
index 4779c4ef7..842cc222a 100644
--- a/docSite/content/zh-cn/docs/development/upgrading/4815.md
+++ b/docSite/content/zh-cn/docs/development/upgrading/4815.md
@@ -23,7 +23,7 @@ weight: 809
 
 ## 升级指南
 
-- 更新 fastgpt 镜像 tag: v4.8.15-fix
+- 更新 fastgpt 镜像 tag: v4.8.15-fix2
 - 更新 fastgpt-pro 商业版镜像 tag: v4.8.15
 - Sandbox 镜像，可以不更新
 
diff --git a/files/docker/docker-compose-milvus.yml b/files/docker/docker-compose-milvus.yml
index a1e1377c2..0c1719604 100644
--- a/files/docker/docker-compose-milvus.yml
+++ b/files/docker/docker-compose-milvus.yml
@@ -121,8 +121,8 @@ services:
     restart: always
   fastgpt:
     container_name: fastgpt
-    image: ghcr.io/labring/fastgpt:v4.8.15-fix # git
-    # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix # 阿里云
+    image: ghcr.io/labring/fastgpt:v4.8.15-fix2 # git
+    # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix2 # 阿里云
     ports:
       - 3000:3000
     networks:
diff --git a/files/docker/docker-compose-pgvector.yml b/files/docker/docker-compose-pgvector.yml
index 7e967fde4..4d41451f4 100644
--- a/files/docker/docker-compose-pgvector.yml
+++ b/files/docker/docker-compose-pgvector.yml
@@ -79,8 +79,8 @@ services:
     restart: always
   fastgpt:
     container_name: fastgpt
-    image: ghcr.io/labring/fastgpt:v4.8.15-fix # git
-    # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix # 阿里云
+    image: ghcr.io/labring/fastgpt:v4.8.15-fix2 # git
+    # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix2 # 阿里云
     ports:
       - 3000:3000
     networks:
diff --git a/files/docker/docker-compose-zilliz.yml b/files/docker/docker-compose-zilliz.yml
index 137197187..7a1b37783 100644
--- a/files/docker/docker-compose-zilliz.yml
+++ b/files/docker/docker-compose-zilliz.yml
@@ -60,8 +60,8 @@ services:
     restart: always
   fastgpt:
     container_name: fastgpt
-    image: ghcr.io/labring/fastgpt:v4.8.15-fix # git
-    # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix # 阿里云
+    image: ghcr.io/labring/fastgpt:v4.8.15-fix2 # git
+    # image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix2 # 阿里云
     ports:
       - 3000:3000
     networks:
diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/index.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/index.tsx
index 9a9b24c47..f798ff805 100644
--- a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/index.tsx
+++ b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/index.tsx
@@ -85,14 +85,19 @@ type Props = {
 const RenderInput = ({ flowInputList, nodeId, CustomComponent, mb = 5 }: Props) => {
   const { feConfigs } = useSystemStore();
 
-  const filterInputs = useMemo(() => {
+  const filterProInputs = useMemo(() => {
     return flowInputList.filter((input) => {
       if (input.isPro && !feConfigs?.isPlus) return false;
+      return true;
+    });
+  }, [feConfigs?.isPlus, flowInputList]);
 
+  const filterInputs = useMemo(() => {
+    return filterProInputs.filter((input) => {
       const renderType = input.renderTypeList?.[input.selectedTypeIndex || 0];
       const isDynamic = !!input.canEdit;
 
-      if (renderType === FlowNodeInputTypeEnum.hidden && !isDynamic) return false;
+      if (renderType === FlowNodeInputTypeEnum.hidden || isDynamic) return false;
 
       return true;
     });
@@ -111,7 +116,7 @@ const RenderInput = ({ flowInputList, nodeId, CustomComponent, mb = 5 }: Props)
           const Component = RenderList.find((item) => item.types.includes(renderType))?.Component;
 
           if (!Component) return null;
-          return <Component inputs={filterInputs} item={input} nodeId={nodeId} />;
+          return <Component inputs={filterProInputs} item={input} nodeId={nodeId} />;
         })();
 
         return (