Merge pull request #25270 from ant-design/master

chore: merge master into feature
ant-design · Jun 29, 2020 · 1f2e50d · 1f2e50d
2 parents 63f4ec4 + ab56668
commit 1f2e50d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -69,6 +69,7 @@ module.exports = {
     'react/display-name': 0,
     'react/static-property-placement': 0,
     'react/no-find-dom-node': 0,
+    'react/no-unused-prop-types': 0,
     'react-hooks/rules-of-hooks': 2, // Checks rules of Hooks
 
     'import/extensions': 0,

diff --git a/components/drawer/index.en-US.md b/components/drawer/index.en-US.md
@@ -44,9 +44,3 @@ A Drawer is a panel that is typically overlaid on top of a page and slides in fr
 | keyboard | Whether support press esc to close | boolean | true |
 | footer | The footer for Drawer. | ReactNode | - |
 | footerStyle | Style of the drawer footer part. | CSSProperties | - |
-
-<style>
-#_hj_feedback_container {
-  display: none;
-}
-</style>
diff --git a/components/drawer/index.zh-CN.md b/components/drawer/index.zh-CN.md
@@ -43,9 +43,3 @@ cover: https://gw.alipayobjects.com/zos/alicdn/7z8NJQhFb/Drawer.svg
 | keyboard | 是否支持键盘 esc 关闭 | boolean | true |
 | footer | 抽屉的页脚 | ReactNode | - |
 | footerStyle | 抽屉页脚部件的样式 | CSSProperties | - |
-
-<style>
-#_hj_feedback_container {
-  display: none;
-}
-</style>
diff --git a/components/table/index.zh-CN.md b/components/table/index.zh-CN.md
@@ -61,6 +61,8 @@ const columns = [
 
 ## API
 
+另外我们封装了 [ProTable](https://protable.ant.design/)，在 `antd` Table 之上扩展了更多便捷易用的功能，内置搜索、筛选、刷新等常用表格行为，并为多种类型数据展示提供了内置格式化，欢迎尝试使用。
+
 ### Table
 
 | 参数 | 说明 | 类型 | 默认值 |