Browse Source

Pull request #1411: 无JIRA任务 单选树不选的处理

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '070042cb3aa883f377ebf35345492e9864081cd2':
  REPORT-35912 fix: 范围
  无JIRA任务 单选树不选的处理
master
windy 4 years ago
parent
commit
058be45c23
  1. 4
      src/widget/date/calendar/picker.date.js
  2. 2
      src/widget/multilayerselecttree/multilayerselecttree.leveltree.js
  3. 2
      src/widget/multilayersingletree/multilayersingletree.leveltree.js

4
src/widget/date/calendar/picker.date.js

@ -35,7 +35,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
} else { } else {
self.setValue({ self.setValue({
year: self.year.getValue(), year: self.year.getValue(),
month: self.month.getValue() - 1, month: (self.month.getValue() - 1) || BI.getDate().getMonth(),
}); });
} }
self.fireEvent(BI.DatePicker.EVENT_CHANGE); self.fireEvent(BI.DatePicker.EVENT_CHANGE);
@ -59,7 +59,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
} else { } else {
self.setValue({ self.setValue({
year: self.year.getValue(), year: self.year.getValue(),
month: self.month.getValue() + 1, month: (self.month.getValue() + 1) || (BI.getDate().getMonth() + 2),
}); });
} }
self.fireEvent(BI.DatePicker.EVENT_CHANGE); self.fireEvent(BI.DatePicker.EVENT_CHANGE);

2
src/widget/multilayerselecttree/multilayerselecttree.leveltree.js

@ -113,7 +113,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, {
isDefaultInit: o.itemsCreator !== BI.emptyFn, isDefaultInit: o.itemsCreator !== BI.emptyFn,
el: { el: {
type: "bi.button_tree", 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, behaviors: o.behaviors,
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"

2
src/widget/multilayersingletree/multilayersingletree.leveltree.js

@ -112,7 +112,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, {
isDefaultInit: o.itemsCreator !== BI.emptyFn, isDefaultInit: o.itemsCreator !== BI.emptyFn,
el: { el: {
type: "bi.button_tree", 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, behaviors: o.behaviors,
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"

Loading…
Cancel
Save