From 1af1f4ac4f9f271c5267b3054801d92b3eb0c1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Wed, 29 Jan 2020 12:03:43 +0800
Subject: [PATCH] feat(Grid): column-num can be string

---
 src/grid/README.md       | 4 ++--
 src/grid/README.zh-CN.md | 4 ++--
 src/grid/index.js        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/grid/README.md b/src/grid/README.md
index 6144c3816..1008a055a 100644
--- a/src/grid/README.md
+++ b/src/grid/README.md
@@ -102,13 +102,13 @@ Vue.use(GridItem);
 
 | Attribute | Description | Type | Default |
 |------|------|------|------|
-| column-num `v2.0.4` | Column Num | *number* | `4` |
+| column-num `v2.0.4` | Column Num | *number \| string* | `4` |
+| icon-size `v2.2.6` | Icon size | *number \| string* | `28px` |
 | gutter | Gutter | *number \| string* | `0` |
 | border | Whether to show border | *boolean* | `true` |
 | center | Whether to center content | *boolean* | `true` |
 | square | Whether to be square shape | *boolean* | `false` |
 | clickable | Whether to show click feedback when clicked | *boolean* | `false` |
-| icon-size `v2.2.6` | Icon size | *number \| string* | `28px` |
 
 ### GridItem Props
 
diff --git a/src/grid/README.zh-CN.md b/src/grid/README.zh-CN.md
index e90464e59..072f14c91 100644
--- a/src/grid/README.zh-CN.md
+++ b/src/grid/README.zh-CN.md
@@ -120,13 +120,13 @@ Vue.use(GridItem);
 
 | 参数 | 说明 | 类型 | 默认值 |
 |------|------|------|------|
-| column-num `v2.0.4` | 列数 | *number* | `4` |
+| column-num `v2.0.4` | 列数 | *number \| string* | `4` |
+| icon-size `v2.2.6` | 图标大小，默认单位为`px` | *number \| string* | `28px` |
 | gutter | 格子之间的间距，默认单位为`px` | *number \| string* | `0` |
 | border | 是否显示边框 | *boolean* | `true` |
 | center | 是否将格子内容居中显示 | *boolean* | `true` |
 | square | 是否将格子固定为正方形 | *boolean* | `false` |
 | clickable | 是否开启格子点击反馈 | *boolean* | `false` |
-| icon-size `v2.2.6` | 图标大小，默认单位为`px` | *number \| string* | `28px` |
 
 ### GridItem Props
 
diff --git a/src/grid/index.js b/src/grid/index.js
index bd8c9865f..bb128f27e 100644
--- a/src/grid/index.js
+++ b/src/grid/index.js
@@ -13,7 +13,7 @@ export default createComponent({
     iconSize: [Number, String],
     clickable: Boolean,
     columnNum: {
-      type: Number,
+      type: [Number, String],
       default: 4,
     },
     center: {