From dfad5345abfc784482d25ab26e349b4a12e21004 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 9 Mar 2021 19:31:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdate/dynamicdate.popup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget/dynamicdate/dynamicdate.popup.js b/src/widget/dynamicdate/dynamicdate.popup.js index d004604fe..58717846c 100644 --- a/src/widget/dynamicdate/dynamicdate.popup.js +++ b/src/widget/dynamicdate/dynamicdate.popup.js @@ -171,7 +171,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { _setInnerValue: function () { if (this.dateTab.getSelect() === BI.DynamicDateCombo.Static) { this.todayButton.setValue(BI.i18nText("BI-Multi_Date_Today")); - this.textButton.setEnable(!this._checkTodayValid()); + this.todayButton.setEnable(!this._checkTodayValid()); } else { var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue()); date = BI.print(date, "%Y-%X-%d"); From 7cd9ea11cdad1a89fb8d8fce9d9cbb3bc7961cc0 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 9 Mar 2021 19:40:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=B8=8B=E5=9B=9E?= =?UTF-8?q?=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdate/dynamicdate.card.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/widget/dynamicdate/dynamicdate.card.js b/src/widget/dynamicdate/dynamicdate.card.js index 621756ac0..c93d02d51 100644 --- a/src/widget/dynamicdate/dynamicdate.card.js +++ b/src/widget/dynamicdate/dynamicdate.card.js @@ -46,7 +46,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: { dynamic: true - } + }, + iconWrapperWidth: 26, }), layouts: [{ type: "bi.left", @@ -90,6 +91,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.multi_select_item", + iconWrapperWidth: 26, ref: function () { self.workDayBox = this; },