diff --git a/src/action-sheet/demo/index.vue b/src/action-sheet/demo/index.vue index b0f9bb3ef..17cb68075 100644 --- a/src/action-sheet/demo/index.vue +++ b/src/action-sheet/demo/index.vue @@ -7,7 +7,7 @@ {{ $t('buttonText') }} - + @@ -15,9 +15,9 @@ @@ -83,7 +83,6 @@ export default { methods: { onSelect(item) { this.show1 = false; - this.show2 = false; this.$toast(item.name); }, diff --git a/src/action-sheet/index.less b/src/action-sheet/index.less index 590cd7daa..daeef0067 100644 --- a/src/action-sheet/index.less +++ b/src/action-sheet/index.less @@ -6,10 +6,13 @@ &__item, &__cancel { + display: block; + width: 100%; font-size: @action-sheet-item-font-size; line-height: @action-sheet-item-height; text-align: center; background-color: @action-sheet-item-background; + border: none; &:active { background-color: @active-color; diff --git a/src/action-sheet/index.tsx b/src/action-sheet/index.tsx index eb2ad8473..ed23b328a 100644 --- a/src/action-sheet/index.tsx +++ b/src/action-sheet/index.tsx @@ -96,22 +96,22 @@ function ActionSheet( } return ( -
{OptionContent()} -
+ ); } function CancelText() { if (cancelText) { return ( -
+
+ ); } } diff --git a/src/action-sheet/test/__snapshots__/index.spec.js.snap b/src/action-sheet/test/__snapshots__/index.spec.js.snap index 621d6614e..718a1b99f 100644 --- a/src/action-sheet/test/__snapshots__/index.spec.js.snap +++ b/src/action-sheet/test/__snapshots__/index.spec.js.snap @@ -1,35 +1,15 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`callback events 1`] = ` -
-
Option
-
Option
-
+
-
OptionSubname
-
Cancel
-
+
`; -exports[`color option 1`] = ` -
-
Option
-
-`; +exports[`color option 1`] = `
`; -exports[`disable lazy-render 1`] = ` - -`; +exports[`disable lazy-render 1`] = ``; exports[`render title and default slot 1`] = ``; -exports[`round prop 1`] = ` -
-
Option
-
-`; +exports[`round prop 1`] = `
`;