diff --git a/scss/_mixins.scss b/scss/_mixins.scss index 98621ad8..9a579688 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -205,6 +205,7 @@ height: $height; .#{$ns}Button-icon:first-child:not(:last-child):not(.pull-right), + > svg.icon:not(:last-child):not(.pull-right), > .pull-left { margin-right: $padding-x; } diff --git a/src/renderers/Form/Combo.tsx b/src/renderers/Form/Combo.tsx index c02ab3f4..de9530da 100644 --- a/src/renderers/Form/Combo.tsx +++ b/src/renderers/Form/Combo.tsx @@ -772,7 +772,7 @@ export default class ComboControl extends React.Component { { type: 'dropdown-button', icon: addIcon ? ( - + ) : ( '' ), @@ -797,9 +797,7 @@ export default class ComboControl extends React.Component { data-position="left" data-tooltip={__('新增一条数据')} > - {addIcon ? ( - - ) : null} + {addIcon ? : null} {__(addButtonText || '新增')} ) @@ -1149,9 +1147,7 @@ export default class ComboControl extends React.Component { className={cx(`Button Combo-addBtn`, addButtonClassName)} data-tooltip={__('新增一条数据')} > - {addIcon ? ( - - ) : null} + {addIcon ? : null} {__(addButtonText || '新增')} ) diff --git a/src/renderers/Form/SubForm.tsx b/src/renderers/Form/SubForm.tsx index 47da9318..cc7e01ed 100644 --- a/src/renderers/Form/SubForm.tsx +++ b/src/renderers/Form/SubForm.tsx @@ -211,7 +211,7 @@ export default class SubFormControl extends React.PureComponent< disabled={disabled} data-tooltip={__('新增一条数据')} > - + {__('新增')} ];