From 131708e9e64ba422b285accbb79dcde2bf2af887 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 25 Jun 2019 16:00:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?BI-46786=20refactor:=20bi.button=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=AE=BD=E5=BA=A6=E5=90=8E=EF=BC=8Cicon=E5=92=8C?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=88=86=E5=A4=AA=E5=BC=80?= 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 78e073290..a76540c21 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -59,7 +59,7 @@ BI.Button = BI.inherit(BI.BasicButton, { height: o.height - 2 }); BI.createWidget({ - type: "bi.horizontal_auto", + type: "bi.center_adapt", cls: o.iconCls, element: this, hgap: o.hgap, From fb657ce7f51521f5b28b079b665605dc16c90427 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 25 Jun 2019 16:10:57 +0800 Subject: [PATCH 2/4] update --- src/base/single/button/buttons/button.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index a76540c21..38afe6ed7 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -59,8 +59,7 @@ BI.Button = BI.inherit(BI.BasicButton, { height: o.height - 2 }); BI.createWidget({ - type: "bi.center_adapt", - cls: o.iconCls, + type: "bi.default", element: this, hgap: o.hgap, vgap: o.vgap, @@ -69,8 +68,12 @@ BI.Button = BI.inherit(BI.BasicButton, { lgap: o.lgap, rgap: o.rgap, items: [{ - type: "bi.horizontal", - items: [this.icon, this.text] + type: "bi.center_adapt", + cls: o.iconCls, + items: [{ + type: "bi.horizontal", + items: [this.icon, this.text] + }] }] }); } else { From 7064338a3dbb8d943b35081bcacebfb45102a861 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 25 Jun 2019 17:31:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-18382=20fix:=20=E6=97=B6=E5=88=86?= =?UTF-8?q?=E7=A7=92=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=BC=E5=BC=8F=E6=97=A0?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/time/time.trigger.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/widget/time/time.trigger.js b/src/widget/time/time.trigger.js index 0de374465..ce3decb98 100644 --- a/src/widget/time/time.trigger.js +++ b/src/widget/time/time.trigger.js @@ -3,7 +3,7 @@ _const: { COMPARE_FORMAT: "%H:%M:%S", - COMPLETE_COMPARE_FORMAT: "%Y-%M-%d %H:%M:%S", + COMPLETE_COMPARE_FORMAT: "%Y-%M-%d %H:%M:%S %P", FORMAT_ARRAY: [ "%H:%M:%S", // HH:mm:ss "%I:%M:%S", // hh:mm:ss @@ -11,6 +11,7 @@ "%k:%M:%S", // H:mm:ss "%l:%M:%S %p", // h:mm:ss a "%l:%M:%S %P", // h:mm:ss a + "%H:%M:%S %p", // HH:mm:ss a "%l:%M", // h:mm "%k:%M", // H:mm "%I:%M", // hh:mm From f668c8e09b6291432808239d3cc8e3fba3affabd Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 25 Jun 2019 18:06:11 +0800 Subject: [PATCH 4/4] update --- src/base/single/button/buttons/button.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index 38afe6ed7..a76540c21 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -59,7 +59,8 @@ BI.Button = BI.inherit(BI.BasicButton, { height: o.height - 2 }); BI.createWidget({ - type: "bi.default", + type: "bi.center_adapt", + cls: o.iconCls, element: this, hgap: o.hgap, vgap: o.vgap, @@ -68,12 +69,8 @@ BI.Button = BI.inherit(BI.BasicButton, { lgap: o.lgap, rgap: o.rgap, items: [{ - type: "bi.center_adapt", - cls: o.iconCls, - items: [{ - type: "bi.horizontal", - items: [this.icon, this.text] - }] + type: "bi.horizontal", + items: [this.icon, this.text] }] }); } else {