From b971ddfb7bd56cb88dc70638567e14bedeb35bec Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 11 Mar 2019 20:48:19 +0800 Subject: [PATCH] [new feature] Collapse: add size prop (#2946) --- packages/cell/index.tsx | 2 -- packages/cell/shared.ts | 2 ++ packages/collapse/en-US.md | 1 + packages/collapse/zh-CN.md | 1 + packages/field/index.js | 1 - 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/cell/index.tsx b/packages/cell/index.tsx index e7e373e77..3afcb417f 100644 --- a/packages/cell/index.tsx +++ b/packages/cell/index.tsx @@ -11,7 +11,6 @@ import { Mods } from '../utils/use/bem'; export type CellProps = RouteProps & SharedCellProps & { - size?: string; clickable?: boolean; arrowDirection?: string; }; @@ -102,7 +101,6 @@ function Cell( Cell.props = { ...cellProps, ...routeProps, - size: String, clickable: Boolean, arrowDirection: String }; diff --git a/packages/cell/shared.ts b/packages/cell/shared.ts index 35069747c..d14013a4a 100644 --- a/packages/cell/shared.ts +++ b/packages/cell/shared.ts @@ -1,5 +1,6 @@ export type SharedCellProps = { icon?: string; + size?: string; border: boolean; center?: boolean; isLink?: boolean; @@ -14,6 +15,7 @@ export type SharedCellProps = { export const cellProps = { icon: String, + size: String, center: Boolean, isLink: Boolean, required: Boolean, diff --git a/packages/collapse/en-US.md b/packages/collapse/en-US.md index 43b74aed1..5261530d9 100644 --- a/packages/collapse/en-US.md +++ b/packages/collapse/en-US.md @@ -91,6 +91,7 @@ export default { |------|------|------|------| | name | Name | `String | Number` | `index` | | icon | Left Icon | `String` | - | +| size | Title size,can be set to `large` | `String` | - | | title | Title | `String | Number` | - | | value | Right text | `String | Number` | - | | label | Description below the title | `String` | - | diff --git a/packages/collapse/zh-CN.md b/packages/collapse/zh-CN.md index 3455e920d..83ea75dec 100644 --- a/packages/collapse/zh-CN.md +++ b/packages/collapse/zh-CN.md @@ -103,6 +103,7 @@ export default { |------|------|------|------|------|------| | name | 唯一标识符,默认为索引值 | `String | Number` | `index` | - | | icon | 标题栏左侧图标名称或图片链接,可选值见 Icon 组件 | `String` | - | 1.2.1 | +| size | 标题栏大小,可选值为 `large` | `String` | - | 1.6.9 | | title | 标题栏左侧内容 | `String | Number` | - | - | | value | 标题栏右侧内容 | `String | Number` | - | 1.2.1 | | label | 标题栏描述信息 | `String | Number` | - | 1.2.1 | diff --git a/packages/field/index.js b/packages/field/index.js index ee62aae52..65a7d727e 100644 --- a/packages/field/index.js +++ b/packages/field/index.js @@ -10,7 +10,6 @@ export default sfc({ props: { ...cellProps, - size: String, error: Boolean, leftIcon: String, rightIcon: String,