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

2 years ago · 3b57760726
2 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20220818153502",
+  "version": "2.0.20220819140607",
  "description": "fineui",
  "main": "dist/fineui_without_conflict.min.js",
  "types": "dist/lib/index.d.ts",
--- a/src/base/single/button/buttons/button.js
+++ b/src/base/single/button/buttons/button.js
@ -90,7 +90,7 @@
                }
            }

-            var iconInvisible = !o.loading && !o.iconCls;
+            var iconInvisible = !o.loading && !o.iconCls && !o.icon;
            if (BI.isPlainObject(o.icon) && !o.loading) {
                this.icon = BI.createWidget(o.icon);
            } else {