From 5718471e547a09d375f7eff4a5c9b2b143e34f28 Mon Sep 17 00:00:00 2001
From: RickCole21 <rickcole21@outlook.com>
Date: Fri, 30 Oct 2020 16:46:06 +0800
Subject: [PATCH 1/3] update doc

---
 docs/components/form/file.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/components/form/file.md b/docs/components/form/file.md
index 2c17da5c3..b62a7af82 100755
--- a/docs/components/form/file.md
+++ b/docs/components/form/file.md
@@ -28,6 +28,20 @@ order: 21
 }
 ```
 
+### 接口返回格式
+
+```json
+{
+  "status": 0,
+  "msg": "",
+  "data": {
+    "value": "xxxx"
+  }
+}
+```
+
+- value：必须返回该字段用作回显，一般是文件资源地址
+
 ## 限制文件类型
 
 可以配置`accept`来限制可选择的文件类型，格式是文件后缀名`.xxx`

From ecb5ee007b8a21af8577f0d67ba17f60bbdee2b1 Mon Sep 17 00:00:00 2001
From: RickCole21 <rickcole21@outlook.com>
Date: Fri, 30 Oct 2020 17:26:24 +0800
Subject: [PATCH 2/3] 1.0.18

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d37c8b495..46cfd5550 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amis",
-  "version": "1.0.18-beta.15",
+  "version": "1.0.18",
   "description": "一种MIS页面生成工具",
   "main": "lib/index.js",
   "scripts": {

From 8e29abe0f95cec6dbe8ae5536f7eed6e5d0ec2eb Mon Sep 17 00:00:00 2001
From: 2betop <2betop.cn@gmail.com>
Date: Fri, 30 Oct 2020 17:37:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20remark=20=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=85=8D=E7=BD=AE=20tootipClassName=20=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I87b0b9128d80174ade965a94d7f26d46b9a66a05
---
 src/renderers/Remark.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/renderers/Remark.tsx b/src/renderers/Remark.tsx
index 298fac61e..b7dac1272 100644
--- a/src/renderers/Remark.tsx
+++ b/src/renderers/Remark.tsx
@@ -103,7 +103,8 @@ class Remark extends React.Component<RemarkProps> {
       classnames: cx,
       content,
       data,
-      env
+      env,
+      tooltipClassName
     } = this.props;
 
     const finalIcon = tooltip?.icon ?? icon;
@@ -114,7 +115,9 @@ class Remark extends React.Component<RemarkProps> {
         classPrefix={ns}
         classnames={cx}
         tooltip={filterContents(tooltip || content, data)}
-        tooltipClassName={tooltip && tooltip.tooltipClassName}
+        tooltipClassName={
+          (tooltip && tooltip.tooltipClassName) || tooltipClassName
+        }
         placement={(tooltip && tooltip.placement) || placement}
         rootClose={(tooltip && tooltip.rootClose) || rootClose}
         trigger={(tooltip && tooltip.trigger) || trigger}