From cf819306fd173e55d4713b71d6ab8ef384160910 Mon Sep 17 00:00:00 2001 From: treecat Date: Fri, 19 Aug 2022 10:38:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?KERNEL-9408=20fix:=E8=A7=A3=E5=86=B3button?= =?UTF-8?q?=E7=9A=84icon=E5=B1=9E=E6=80=A7=E6=9C=89=E6=97=B6=E5=A4=B1?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/button/buttons/button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index 7a8ba672d..11762c86d 100644 --- 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 { From 67bc8f8aefd40b4a24760dabdfb8ef7c2c71e5de Mon Sep 17 00:00:00 2001 From: Kira Date: Fri, 19 Aug 2022 11:09:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?JSY-21914=20fix:=20=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/textvaluecombo/combo.textvalue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index b7f25ea50..97113ee49 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -152,7 +152,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { }, getValue: function () { - var value = this.popup.getValue(); + var value = this.combo.getValue(); return BI.isNull(value) ? [] : (BI.isArray(value) ? value : [value]); }, From b616c6796f0ab9cfe30c4182cfb744729caa734e Mon Sep 17 00:00:00 2001 From: data Date: Fri, 19 Aug 2022 11:35:34 +0800 Subject: [PATCH 3/5] auto upgrade version to 2.0.20220819113527 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c270ebd9..313842244 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220818153502", + "version": "2.0.20220819113527", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 3bd01018903bc8504296bd943fd8ea31d128f89b Mon Sep 17 00:00:00 2001 From: data Date: Fri, 19 Aug 2022 11:45:38 +0800 Subject: [PATCH 4/5] auto upgrade version to 2.0.20220819114527 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 313842244..4ceb09229 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220819113527", + "version": "2.0.20220819114527", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From be7f7bfff96cc55f840bd0b328911263df1bf68c Mon Sep 17 00:00:00 2001 From: data Date: Fri, 19 Aug 2022 14:06:50 +0800 Subject: [PATCH 5/5] auto upgrade version to 2.0.20220819140607 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ceb09229..0f1dab006 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220819114527", + "version": "2.0.20220819140607", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",