@fe-free/core 3.0.46 → 3.0.48

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @fe-free/core
 
+## 3.0.48
+
+### Patch Changes
+
+- feat: upload
+  - @fe-free/icons@3.0.48
+  - @fe-free/tool@3.0.48
+
+## 3.0.47
+
+### Patch Changes
+
+- feat: markdown
+  - @fe-free/icons@3.0.47
+  - @fe-free/tool@3.0.47
+
 ## 3.0.46
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "3.0.46",
+  "version": "3.0.48",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -46,8 +46,8 @@
     "antd": "^5.27.1",
     "dayjs": "~1.11.10",
     "react": "^19.2.0",
-    "@fe-free/icons": "3.0.46",
-    "@fe-free/tool": "3.0.46"
+    "@fe-free/icons": "3.0.48",
+    "@fe-free/tool": "3.0.48"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/form/form.stories.tsx

@@ -267,6 +267,17 @@ export const ProFormUploadComponent: Story = {
         name="files"
         fieldProps={{ multiple: true, maxCount: 2, showCount: true, customRequest }}
       />
+      <ProFormUpload
+        label="files_custom"
+        name="files"
+        fieldProps={{
+          multiple: true,
+          maxCount: 2,
+          showCount: true,
+          customRequest,
+          children: <div>click me</div>,
+        }}
+      />
       <ProFormUpload
         label="files_picture"
         name="files_picture"

package/src/markdown/index.tsx

@@ -10,9 +10,10 @@ import './style.scss';
 
 interface MarkdownProps {
   children: string;
-  knowledgeRefs?: { id: string; title: string }[];
+  knowledgeRefs?: { id: string }[];
   onKnowledgeRef?: (id?: string) => void;
 }
+
 function Markdown(props: MarkdownProps) {
   const { children, knowledgeRefs, onKnowledgeRef } = props;
 

package/src/markdown/knowledge_ref.tsx

@@ -34,7 +34,7 @@ function KnowledgeRefBlock(props: any) {
   );
 }
 
-function processWithKnowledgeRef(text: string, knowledgeRefs?: { id: string; title: string }[]) {
+function processWithKnowledgeRef(text: string, knowledgeRefs?: { id: string }[]) {
   // 匹配 [^knowledge:X-Y] 格式
   const knowledgeRefRegex = /\[\^knowledge:(\d+-\d+)\]/g;
 
@@ -45,7 +45,7 @@ function processWithKnowledgeRef(text: string, knowledgeRefs?: { id: string; tit
   });
 
   if (count > 0 && knowledgeRefs && knowledgeRefs.length > 0) {
-    newText = `${newText}\n<knowledge-ref>来源&gt;&gt;</knowledge>`;
+    newText = `${newText}\n\n<knowledge-ref>来源&gt;&gt;</knowledge>`;
   }
 
   return newText;

package/src/upload/index.tsx

@@ -17,6 +17,7 @@ interface UploadBaseProps {
   listType?: AntdUploadProps['listType'];
   accept?: string;
   directory?: AntdUploadProps['directory'];
+  children?: ReactNode | ((props: { isDisabled: boolean }) => ReactNode);
 }
 
 interface UploadProps extends UploadBaseProps {
@@ -73,7 +74,7 @@ function useUpload(
 
       return true;
     },
-    [fileList, multiple, maxCount],
+    [multiple, maxCount, fileList.length, message],
   );
 
   // 多选情况下，超出则上传按钮 disabled
@@ -93,9 +94,39 @@ function useUpload(
   };
 }
 
+function defaultChildren(
+  props: ImageUploadProps,
+  otherProps: { fileList: UploadFile[]; isDisabled: boolean },
+) {
+  const { listType, showCount, multiple, maxCount } = props;
+  const { fileList, isDisabled } = otherProps;
+
+  if (listType === 'picture-card') {
+    return (
+      <button style={{ border: 0, background: 'none' }} type="button" disabled={isDisabled}>
+        <PlusOutlined />
+        <div style={{ marginTop: 8 }}>本地上传</div>
+      </button>
+    );
+  }
+  return (
+    <Button icon={<UploadOutlined />} disabled={isDisabled}>
+      本地上传{showCount && multiple ? `（${fileList.length}/${maxCount}）` : ''}
+    </Button>
+  );
+}
+
 function Upload(props: ImageUploadProps) {
-  const { multiple, maxCount, showCount, action, customRequest, listType, accept, directory } =
-    props;
+  const {
+    multiple,
+    maxCount,
+    action,
+    customRequest,
+    listType,
+    accept,
+    directory,
+    children = defaultChildren,
+  } = props;
   const { onChange, beforeUpload, isDisabled, fileList } = useUpload(props);
 
   return (
@@ -113,16 +144,7 @@ function Upload(props: ImageUploadProps) {
       // 不可，否则会没法删除
       // disabled={isDisabled}
     >
-      {listType === 'picture-card' ? (
-        <button style={{ border: 0, background: 'none' }} type="button" disabled={isDisabled}>
-          <PlusOutlined />
-          <div style={{ marginTop: 8 }}>本地上传</div>
-        </button>
-      ) : (
-        <Button icon={<UploadOutlined />} disabled={isDisabled}>
-          本地上传{showCount && multiple ? `（${fileList.length}/${maxCount}）` : ''}
-        </Button>
-      )}
+      {typeof children === 'function' ? children(props, { fileList, isDisabled }) : children}
     </AntdUpload>
   );
 }