From 8f64e500139522354d4462b75ce28ef3e5b86b7a Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 23 Jul 2020 14:46:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=8D=95?= =?UTF-8?q?=E9=80=89=E6=A0=91=E4=B8=8D=E9=80=89=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multilayerselecttree/multilayerselecttree.leveltree.js | 2 +- .../multilayersingletree/multilayersingletree.leveltree.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js b/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js index 1ee8e1c60..936e39211 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js @@ -113,7 +113,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { isDefaultInit: o.itemsCreator !== BI.emptyFn, el: { type: "bi.button_tree", - chooseType: BI.Selection.Default, // 不使用buttontree内部getValue逻辑 + chooseType: o.chooseType === BI.Selection.None ? BI.Selection.None : BI.Selection.Default, // 不使用buttontree内部getValue逻辑 behaviors: o.behaviors, layouts: [{ type: "bi.vertical" diff --git a/src/widget/multilayersingletree/multilayersingletree.leveltree.js b/src/widget/multilayersingletree/multilayersingletree.leveltree.js index 09b75e3b8..d4eed85fa 100644 --- a/src/widget/multilayersingletree/multilayersingletree.leveltree.js +++ b/src/widget/multilayersingletree/multilayersingletree.leveltree.js @@ -112,7 +112,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { isDefaultInit: o.itemsCreator !== BI.emptyFn, el: { type: "bi.button_tree", - chooseType: BI.Selection.Default, // 不使用buttontree内部getValue逻辑 + chooseType: o.chooseType === BI.Selection.None ? BI.Selection.None : BI.Selection.Default, // 不使用buttontree内部getValue逻辑 behaviors: o.behaviors, layouts: [{ type: "bi.vertical" From 070042cb3aa883f377ebf35345492e9864081cd2 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 23 Jul 2020 14:47:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-35912=20fix:=20=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/date/calendar/picker.date.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/date/calendar/picker.date.js b/src/widget/date/calendar/picker.date.js index 6c702e7cb..2d840b2b0 100644 --- a/src/widget/date/calendar/picker.date.js +++ b/src/widget/date/calendar/picker.date.js @@ -35,7 +35,7 @@ BI.DatePicker = BI.inherit(BI.Widget, { } else { self.setValue({ year: self.year.getValue(), - month: self.month.getValue() - 1, + month: (self.month.getValue() - 1) || BI.getDate().getMonth(), }); } self.fireEvent(BI.DatePicker.EVENT_CHANGE); @@ -59,7 +59,7 @@ BI.DatePicker = BI.inherit(BI.Widget, { } else { self.setValue({ year: self.year.getValue(), - month: self.month.getValue() + 1, + month: (self.month.getValue() + 1) || (BI.getDate().getMonth() + 2), }); } self.fireEvent(BI.DatePicker.EVENT_CHANGE);