diff --git a/src/action-sheet/README.md b/src/action-sheet/README.md index 42abdb169..6f91abe7d 100644 --- a/src/action-sheet/README.md +++ b/src/action-sheet/README.md @@ -120,7 +120,7 @@ export default { | description `v2.2.8` | Description above the options | *string* | - | | overlay | Whether to show overlay | *boolean* | `true` | | round `v2.0.9` | Whether to show round corner | *boolean* | `true` | -| close-icon `v2.2.13` | Close icon name | *string* | `close` | +| close-icon `v2.2.13` | Close icon name | *string* | `cross` | | close-on-click-action | Whether to close when click action | *boolean* | `false` | | close-on-click-overlay | Whether to close when click overlay | *boolean* | `true` | | lazy-render | Whether to lazy render util appeared | *boolean* | `true` | diff --git a/src/action-sheet/README.zh-CN.md b/src/action-sheet/README.zh-CN.md index a56e22c55..faa670a9b 100644 --- a/src/action-sheet/README.zh-CN.md +++ b/src/action-sheet/README.zh-CN.md @@ -130,7 +130,7 @@ export default { | description `v2.2.8` | 选项上方的描述信息 | *string* | - | | overlay | 是否显示遮罩层 | *boolean* | `true` | | round `v2.0.9` | 是否显示圆角 | *boolean* | `true` | -| close-icon `v2.2.13` | 关闭图标名称或图片链接 | *string* | `close` | +| close-icon `v2.2.13` | 关闭图标名称或图片链接 | *string* | `cross` | | close-on-click-action | 是否在点击选项后关闭 | *boolean* | `false` | | close-on-click-overlay | 是否在点击遮罩层后关闭 | *boolean* | `true` | | lazy-render | 是否在显示弹层时才渲染节点 | *boolean* | `true` | diff --git a/src/action-sheet/index.tsx b/src/action-sheet/index.tsx index 6680092ad..47e9fa1e5 100644 --- a/src/action-sheet/index.tsx +++ b/src/action-sheet/index.tsx @@ -1,6 +1,6 @@ import { createNamespace } from '../utils'; import { emit, inherit } from '../utils/functional'; -import { BORDER_TOP, BORDER_BOTTOM } from '../utils/constant'; +import { BORDER_TOP } from '../utils/constant'; import { popupMixinProps } from '../mixins/popup'; import Icon from '../icon'; import Popup from '../popup'; @@ -51,7 +51,7 @@ function ActionSheet( function Header() { if (title) { return ( -
+
{title} -
Title +
Title
`; @@ -25,7 +25,7 @@ exports[`disable lazy-render 1`] = `
-
Title +
Title
Default
diff --git a/src/style/var.less b/src/style/var.less index a9fd9fbed..61eb9f95d 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -72,7 +72,7 @@ @action-sheet-subname-font-size: @font-size-sm; @action-sheet-close-icon-size: 18px; @action-sheet-close-icon-color: @gray-6; -@action-sheet-close-icon-padding: 0 @padding-sm; +@action-sheet-close-icon-padding: 0 @padding-md; @action-sheet-cancel-padding-top: @padding-xs; @action-sheet-cancel-padding-color: @background-color;