Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221020141659",
+  "version": "2.0.20221021135419",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

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) {
-                        lineHeight = o.height;
-                    } else {
+                    if (!(o.clear && o.block && o.light)) {
                         hasBorder = true;
-                        lineHeight = o.height;
                     }
+                    lineHeight = o.height;
                 } else {
                     lineHeight = textHeight;
                 }