From b1c730dde8a17f7f043d8d9c1a67e65a4f8e4063 Mon Sep 17 00:00:00 2001
From: Ah jung <735878602@qq.com>
Date: Mon, 12 Jul 2021 16:36:07 +0800
Subject: [PATCH] =?UTF-8?q?1.0=E5=8F=91=E5=B8=83=EF=BC=8CFixes=20Bug?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=96=B0=E5=A2=9E=20ProTable?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         | 3 ++-
 README.md                            | 5 +++++
 src/components/ProTable/src/props.ts | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1af3356..218beb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@
 - 1.0骨架发布 
 - Naive UI 升级至2.15.4  
 - 菜单新增排序字段  
-- 新增 `ProTable` 组件，封装了常用的分页列配置等逻辑，可查看组件示例页面
+- 新增 `ProTable` 组件，封装了常用的分页列配置等逻辑
+- 新增 `ProTable` 组件示例页面 
 - 持续更新中...
 
 
diff --git a/README.md b/README.md
index 7cd1b44..be70a90 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,11 @@ Naive Ui Admin 是一个免费开源的中后台模版，使用了最新的`vue3
 - [ ] 监控页
 - [x] 工作台
 
+### 页面组件
+#### ProTable
+- [x] 表格
+- 持续开发中...
+
 ## 在线预览
 - [naive-ui-admin](https://jekip.github.io)
 
diff --git a/src/components/ProTable/src/props.ts b/src/components/ProTable/src/props.ts
index 8582244..9055655 100644
--- a/src/components/ProTable/src/props.ts
+++ b/src/components/ProTable/src/props.ts
@@ -31,7 +31,7 @@ export const basicProps = {
     required: true
   },
   rowKey: {
-    type: [String, Function] as PropType<string | ((record: Recordable) => string)>,
+    type: [String, Function] as PropType<string | ((record) => string)>,
     default: undefined,
   },
   pagination: {