diff --git a/src/grid-item/index.js b/src/grid-item/index.js index 1d6a3cfbd..5dad92519 100644 --- a/src/grid-item/index.js +++ b/src/grid-item/index.js @@ -71,7 +71,13 @@ export default createComponent({ return [ 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 b8d298bd5..d19bc8d82 100644 --- a/src/grid/README.md +++ b/src/grid/README.md @@ -107,6 +107,7 @@ Vue.use(Grid).use(GridItem); | 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 | Icon size | *string \| number* | `28px` | 2.2.6 | ### GridItem Props diff --git a/src/grid/README.zh-CN.md b/src/grid/README.zh-CN.md index eab1113dd..1c1ff1fc5 100644 --- a/src/grid/README.zh-CN.md +++ b/src/grid/README.zh-CN.md @@ -125,6 +125,7 @@ Vue.use(Grid).use(GridItem); | center | 是否将格子内容居中显示 | *boolean* | `true` | - | | square | 是否将格子固定为正方形 | *boolean* | `false` | - | | clickable | 是否开启格子点击反馈 | *boolean* | `false` | - | +| icon-size | 图标大小,默认单位为`px` | *string \| number* | `28px` | 2.2.6 | ### GridItem Props diff --git a/src/grid/index.js b/src/grid/index.js index 0dca485dc..83174c2ed 100644 --- a/src/grid/index.js +++ b/src/grid/index.js @@ -10,6 +10,7 @@ export default createComponent({ props: { square: Boolean, gutter: [Number, String], + iconSize: [Number, String], clickable: Boolean, columnNum: { type: Number, diff --git a/src/grid/test/__snapshots__/index.spec.js.snap b/src/grid/test/__snapshots__/index.spec.js.snap index 9390f65ef..a66e337fb 100644 --- a/src/grid/test/__snapshots__/index.spec.js.snap +++ b/src/grid/test/__snapshots__/index.spec.js.snap @@ -1,5 +1,14 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`icon-size prop 1`] = ` +
+
+
+
+
+
+`; + exports[`sqaure and set gutter 1`] = `
diff --git a/src/grid/test/index.spec.js b/src/grid/test/index.spec.js index a53544cbc..e277c5e24 100644 --- a/src/grid/test/index.spec.js +++ b/src/grid/test/index.spec.js @@ -38,3 +38,15 @@ test('sqaure and set gutter', () => { expect(wrapper).toMatchSnapshot(); }); + +test('icon-size prop', () => { + const wrapper = mount({ + template: ` + + + + ` + }); + + expect(wrapper).toMatchSnapshot(); +});