fix: loal file api error (#3637)

* update doc * fix: loal file api error * fix: number input import * feat: icon load
labring · Jan 21, 2025 · 946bd20 · 946bd20
1 parent 3c97757
commit 946bd20
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 94 deletions.
diff --git a/docSite/content/zh-cn/docs/development/faq.md b/docSite/content/zh-cn/docs/development/faq.md
@@ -26,45 +26,16 @@ images: []
 ### sealos怎么挂载 小程序配置文件
 
 新增配置文件：/app/projects/app/public/xxxx.txt
-如图
+
+如图:
+
 ![](/imgs/faq2.png)
 
 ### 数据库3306端口被占用了，启动服务失败
-![](/imgs/faq3.png)
 
-mysql 只有 oneAPI 用到，外面一般不需要调用，所以可以
-- 把 3306:3306 的映射去掉/或者直接改一个映射。
-
-```yaml
-# 在 docker-compose.yaml 文件内
-# ...
- mysql:
-  image: mysql:8.0.36
-     ports:
-       - 3306:3306 # 这个端口被占用了！
-       # - 3307:3306 # 直接改一个。。和外面的不冲突
-       # *empty* 或者直接删了，反正外面用不到
- oneapi:
-  container_name: oneapi
-  image: ghcr.io/songquanpeng/one-api:latest
-  environment:
-    - SQL_DSN=root:oneapimmysql@tcp(mysql:3306)/oneapi # 这不用改，容器内外网络是隔离的
-```
-- 另一种做法是可以直接连现有的 mysql， 要改 oneAPI 的环境变量。
-```yaml
-# 在 docker-compose.yaml 文件内
-# ...
-# mysql: # 要连外面的，这个玩意用不到了
-#  image: mysql:8.0.36
-#     ports:
-#       - 3306:3306 # 这个端口被占用了！
-oneapi:
-  container_name: oneapi
-  image: ghcr.io/songquanpeng/one-api:latest
-  environment:
-    - SQL_DSN=root:oneapimmysql@tcp(mysql:3306)/oneapi # 改成外面的链接字符串
-```
+![](/imgs/faq3.png)
 
+把端口映射改成 3307 之类的，例如 3307:3306。
 
 ### 本地部署的限制
 

diff --git a/docSite/content/zh-cn/docs/development/upgrading/4819.md b/docSite/content/zh-cn/docs/development/upgrading/4819.md
@@ -19,4 +19,6 @@ weight: 806
 7. 修复 - 语雀文件库导入时，嵌套文件内容无法展开的问题。
 8. 修复 - 工作流编排中，LLM 参数无法关闭问题。
 9. 修复 - 工作流编排中，代码运行节点还原模板问题。
-10. 修复 - HTTP 接口适配对象字符串解析。
+10. 修复 - HTTP 接口适配对象字符串解析。
+11. 修复 - 通过 API 上传文件（localFile）接口，图片过期标记未清除。
+12. 修复 - 工作流导入编排时，number input 类型无法覆盖。
diff --git a/docSite/content/zh-cn/docs/faq/other.md b/docSite/content/zh-cn/docs/faq/other.md
@@ -10,12 +10,6 @@ weight: 918
 
 只有开源的 README，没官网，GitHub: https://github.com/songquanpeng/one-api
 
-## 想做多用户和多chat key
+## 想做多用户
 
-![](/imgs/other1.png)
-![](/imgs/other2.png)
-
-多用户问题：只能采取二开或者商业版
-
-多chat key问题：1. 私有化部署情况下，oneapi解决。2. Saas或者商业版中，可以为每个团队设置单独的key。
-![](/imgs/other3.png)
+开源版未支持多用户，仅商业版支持。
diff --git a/packages/web/components/common/Icon/index.tsx b/packages/web/components/common/Icon/index.tsx
@@ -4,13 +4,23 @@ import { Box, Icon } from '@chakra-ui/react';
 import { iconPaths } from './constants';
 import type { IconNameType } from './type.d';
 
+const iconCache: Record<string, any> = {};
+
 const MyIcon = ({ name, w = 'auto', h = 'auto', ...props }: { name: IconNameType } & IconProps) => {
   const [IconComponent, setIconComponent] = useState<any>(null);
 
   useEffect(() => {
+    if (iconCache[name]) {
+      setIconComponent(iconCache[name]);
+      return;
+    }
+
     iconPaths[name]?.()
       .then((icon) => {
-        setIconComponent({ as: icon.default });
+        const component = { as: icon.default };
+        // Store in cache
+        iconCache[name] = component;
+        setIconComponent(component);
       })
       .catch((error) => console.log(error));
   }, [name]);
@@ -30,4 +40,4 @@ const MyIcon = ({ name, w = 'auto', h = 'auto', ...props }: { name: IconNameType
   );
 };
 
-export default React.memo(MyIcon);
+export default MyIcon;
diff --git a/projects/app/src/components/core/ai/ModelTable/index.tsx b/projects/app/src/components/core/ai/ModelTable/index.tsx
@@ -25,7 +25,6 @@ import SearchInput from '@fastgpt/web/components/common/Input/SearchInput';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import Avatar from '@fastgpt/web/components/common/Avatar';
 import MyTag from '@fastgpt/web/components/common/Tag/index';
-import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
 import dynamic from 'next/dynamic';
 
 const MyModal = dynamic(() => import('@fastgpt/web/components/common/MyModal'));
@@ -237,15 +236,13 @@ const ModelTable = () => {
             </Tr>
           </Thead>
           <Tbody>
-            {modelList.map((item) => (
-              <Tr key={item.name} _hover={{ bg: 'myGray.50' }}>
+            {modelList.map((item, index) => (
+              <Tr key={index} _hover={{ bg: 'myGray.50' }}>
                 <Td fontSize={'sm'}>
-                  <MyTooltip title={item.providerName}>
-                    <HStack>
-                      <Avatar src={item.avatar} w={'1.2rem'} />
-                      <Box color={'myGray.900'}>{item.name}</Box>
-                    </HStack>
-                  </MyTooltip>
+                  <HStack>
+                    <Avatar src={item.avatar} w={'1.2rem'} />
+                    <Box color={'myGray.900'}>{item.name}</Box>
+                  </HStack>
                 </Td>
                 <Td>
                   <MyTag colorSchema={item.tagColor as any}>{item.typeLabel}</MyTag>

diff --git a/projects/app/src/pages/api/core/dataset/collection/create/localFile.ts b/projects/app/src/pages/api/core/dataset/collection/create/localFile.ts
@@ -73,7 +73,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>): CreateCo
     const { collectionId, insertResults } = await createCollectionAndInsertData({
       dataset,
       rawText,
-      relatedId: fileId,
+      relatedId: relatedImgId,
       createCollectionParams: {
         ...collectionData,
         name: collectionName,

diff --git a/...ail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/NumberInput.tsx b/...ail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/NumberInput.tsx
@@ -1,23 +1,16 @@
 import React, { useMemo } from 'react';
 import type { RenderInputProps } from '../type';
-import {
-  NumberDecrementStepper,
-  NumberIncrementStepper,
-  NumberInput,
-  NumberInputField,
-  NumberInputStepper
-} from '@chakra-ui/react';
 import { useContextSelector } from 'use-context-selector';
 import { WorkflowContext } from '@/pages/app/detail/components/WorkflowComponents/context';
-import MyIcon from '@fastgpt/web/components/common/Icon';
+import MyNumberInput from '@fastgpt/web/components/common/Input/NumberInput';
 
 const NumberInputRender = ({ item, nodeId }: RenderInputProps) => {
   const onChangeNode = useContextSelector(WorkflowContext, (v) => v.onChangeNode);
 
   const Render = useMemo(() => {
     return (
-      <NumberInput
-        defaultValue={item.value}
+      <MyNumberInput
+        value={item.value}
         min={item.min}
         max={item.max}
         bg={'white'}
@@ -29,38 +22,11 @@ const NumberInputRender = ({ item, nodeId }: RenderInputProps) => {
             key: item.key,
             value: {
               ...item,
-              value: Number(e)
+              value: e
             }
           });
         }}
-      >
-        <NumberInputField
-          bg={'white'}
-          px={3}
-          rounded={'md'}
-          _hover={{
-            borderColor: 'primary.500'
-          }}
-        />
-        <NumberInputStepper roundedTopRight={'none'}>
-          <NumberIncrementStepper
-            borderTopRightRadius={'sm !important'}
-            _hover={{
-              bg: 'myGray.100'
-            }}
-          >
-            <MyIcon name={'core/chat/chevronUp'} width={'12px'} />
-          </NumberIncrementStepper>
-          <NumberDecrementStepper
-            borderBottomRightRadius={'sm !important'}
-            _hover={{
-              bg: 'myGray.100'
-            }}
-          >
-            <MyIcon name={'core/chat/chevronDown'} width={'12px'} />
-          </NumberDecrementStepper>
-        </NumberInputStepper>
-      </NumberInput>
+      />
     );
   }, [item, nodeId, onChangeNode]);