From ac04e9dd62230b09ce024556a83f08d767294802 Mon Sep 17 00:00:00 2001 From: bindoon Date: Thu, 6 Dec 2018 10:52:43 +0800 Subject: [PATCH] fix(*): scss --- src/balloon/rtl.scss | 2 +- src/form/item.jsx | 8 ++++++++ src/step/rtl.scss | 2 +- src/tag/main.scss | 6 +++--- src/tag/scss/mixin.scss | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/balloon/rtl.scss b/src/balloon/rtl.scss index 6a20aed960..e7dc45d68a 100644 --- a/src/balloon/rtl.scss +++ b/src/balloon/rtl.scss @@ -76,7 +76,7 @@ } @mixin balloon-close-rtl( - $left, + $left ) { .#{$css-prefix}balloon-close { left: $left; diff --git a/src/form/item.jsx b/src/form/item.jsx index b67f30da8f..24e4684e45 100644 --- a/src/form/item.jsx +++ b/src/form/item.jsx @@ -138,6 +138,14 @@ export default class Item extends React.Component { * 正则校验 */ pattern: PropTypes.any, + /** + * pattern 自定义错误信息 + */ + patternMessage: PropTypes.string, + /** + * pattern 自定义触发方式 + */ + patternTrigger: PropTypes.oneOfType([PropTypes.string, PropTypes.array]), /** * [表单校验] 四种常用的 pattern */ diff --git a/src/step/rtl.scss b/src/step/rtl.scss index 2831b28ad2..d1cfd14cf9 100644 --- a/src/step/rtl.scss +++ b/src/step/rtl.scss @@ -5,7 +5,7 @@ @mixin step-item-state-rtl( $shape: 'circle', - $background: $color-white, + $background: $color-white ) { #{$step-prefix}-item-node-dot { right: 50%; diff --git a/src/tag/main.scss b/src/tag/main.scss index a811571ade..e17ca12140 100644 --- a/src/tag/main.scss +++ b/src/tag/main.scss @@ -80,7 +80,7 @@ $tag-border-width, $tag-size-l-padding-lr, $tag-size-l-text-size, - $tag-size-l-icon-font, + $tag-size-l-icon-font ); } @@ -91,7 +91,7 @@ $tag-border-width, $tag-size-m-padding-lr, $tag-size-m-text-size, - $tag-size-m-icon-font, + $tag-size-m-icon-font ); } @@ -102,7 +102,7 @@ $tag-border-width, $tag-size-s-padding-lr, $tag-size-s-text-size, - $tag-size-s-icon-font, + $tag-size-s-icon-font ); } diff --git a/src/tag/scss/mixin.scss b/src/tag/scss/mixin.scss index ec20fb88a7..19271a46af 100644 --- a/src/tag/scss/mixin.scss +++ b/src/tag/scss/mixin.scss @@ -13,7 +13,7 @@ $borderWidth, $paddingLr, $fontSize, - $iconSize, + $iconSize ) { height: $height; padding: 0;