diff --git a/src/grid-item/index.js b/src/grid-item/index.js
index 250488908..c489b6d4d 100644
--- a/src/grid-item/index.js
+++ b/src/grid-item/index.js
@@ -11,6 +11,7 @@ export default createComponent({
props: {
...routeProps,
+ dot: Boolean,
text: String,
icon: String,
info: [Number, String]
@@ -68,7 +69,10 @@ export default createComponent({
}
return [
- this.slots('icon') || (this.icon && ),
+ this.slots('icon') ||
+ (this.icon && (
+
+ )),
this.slots('text') || (this.text && {this.text})
];
}
diff --git a/src/grid/README.md b/src/grid/README.md
index c6baa3e00..b8d298bd5 100644
--- a/src/grid/README.md
+++ b/src/grid/README.md
@@ -90,7 +90,7 @@ Vue.use(Grid).use(GridItem);
```html
-
+
```
@@ -114,6 +114,7 @@ Vue.use(Grid).use(GridItem);
|------|------|------|------|------|
| text | Text | *string* | - | - |
| icon | Icon name or URL | *string* | - | - |
+| dot | Whether to show red dot | *boolean* | `false` | 2.2.1 |
| info | Content of the badge | *string \| number* | `''` | 2.2.1 |
| url | Link URL | *string* | - | - |
| to | Target route of the link, same as to of vue-router | *string \| object* | - | - |
diff --git a/src/grid/README.zh-CN.md b/src/grid/README.zh-CN.md
index 91db159a9..f9065994f 100644
--- a/src/grid/README.zh-CN.md
+++ b/src/grid/README.zh-CN.md
@@ -102,13 +102,13 @@ Vue.use(Grid).use(GridItem);
```
-### 显示徽标
+### 提示信息
-设置`info`属性后,会在图标的右上角显示红色的徽标
+设置`dot`属性后,会在图标右上角展示一个小红点。设置`info`属性后,会在图标右上角展示相应的徽标
```html
-
+
```
@@ -132,6 +132,7 @@ Vue.use(Grid).use(GridItem);
|------|------|------|------|------|
| text | 文字 | *string* | - | - |
| icon | 图标名称或图片链接,可选值见 [Icon 组件](/#/zh-CN/icon) | *string* | - | - |
+| dot | 是否显示图标右上角小红点 | *boolean* | `false` | 2.2.1 |
| info | 图标右上角徽标的内容 | *string \| number* | - | 2.2.1 |
| url | 点击后跳转的链接地址 | *string* | - | - |
| to | 点击后跳转的目标路由对象,同 vue-router 的 [to 属性](https://router.vuejs.org/zh/api/#to) | *string \| object* | - | - |
diff --git a/src/grid/demo/index.vue b/src/grid/demo/index.vue
index 80c71c4e2..4833886b2 100644
--- a/src/grid/demo/index.vue
+++ b/src/grid/demo/index.vue
@@ -47,7 +47,7 @@
-
+
@@ -66,7 +66,7 @@ export default {
customContent: '自定义内容',
urlRoute: 'URL 跳转',
vueRoute: '路由跳转',
- showInfo: '显示徽标'
+ showInfo: '提示信息'
},
'en-US': {
text: 'Text',
diff --git a/src/grid/test/__snapshots__/demo.spec.js.snap b/src/grid/test/__snapshots__/demo.spec.js.snap
index 2b2446cbd..915c02518 100644
--- a/src/grid/test/__snapshots__/demo.spec.js.snap
+++ b/src/grid/test/__snapshots__/demo.spec.js.snap
@@ -166,7 +166,7 @@ exports[`renders demo correctly 1`] = `