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

* commit '9704163398b54ddea79afa0df93790a16b5fee18':
  KERNEL-9408 fix:解决button的icon属性有时失效

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 {