Merge pull request #202936 in DEC/fineui from master to feature/x

* commit 'dafa625e95c52372895c97829a641fddd0dc7570':
  无jira fix: 改一下button的代码格式

src/base/single/button/buttons/button.js

@@ -76,12 +76,10 @@
             var hasBorder = false
             if (BI.isNumber(o.height)) {
                 if (!isVertical(o.iconPosition)) {
-                    if (o.clear || o.block || o.light) {
+                    if (!(o.clear && o.block && o.light)) {
-                        lineHeight = o.height;
-                    } else {
                         hasBorder = true;
-                        lineHeight = o.height;
                     }
+                    lineHeight = o.height;
                 } else {
                     lineHeight = textHeight;
                 }