Browse Source

Merge pull request #205964 in DEC/fineui from master to feature/x

* commit '6c3522d18e7176620732bed446e704e81ecab2dd':
  无JIRA fix: 修复tape布局 NaN的场景
  REPORT-83562 feat: 日期控件非本月的日期可选
master
superman 2 years ago
parent
commit
25e3a2ac46
  1. 3
      src/case/calendar/calendar.js
  2. 4
      src/core/wrapper/layout/layout.tape.js
  3. 5
      src/less/case/calendar/calendar.less

3
src/case/calendar/calendar.js

@ -161,7 +161,8 @@ BI.Calendar = BI.inherit(BI.Widget, {
once: false,
forceSelected: true,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled,
disabled: td.disabled,
cls: td.lastMonth || td.nextMonth ? "not-current-month-day": "",
lgap: 2,
rgap: 2,
tgap: 4,

4
src/core/wrapper/layout/layout.tape.js

@ -217,7 +217,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
top: self._optimiseGap(top[i] + self._optimiseItemTgap(item) + self._optimiseItemVgap(item) + o.vgap + o.tgap)
});
if (rowSize === "" || rowSize === "fill") {
if (BI.isNull(rowSize) || rowSize === "" || rowSize === "fill") {
return true;
}
});
@ -235,7 +235,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, {
bottom: self._optimiseGap(bottom[i] + self._optimiseItemBgap(item) + self._optimiseItemVgap(item) + o.vgap + o.bgap)
});
if (rowSize === "" || rowSize === "fill") {
if (BI.isNull(rowSize) || rowSize === "" || rowSize === "fill") {
return true;
}
});

5
src/less/case/calendar/calendar.less

@ -0,0 +1,5 @@
@import "../../index.less";
.bi-calendar-date-item.not-current-month-day {
color: @color-bi-text-disabled-button !important;
}
Loading…
Cancel
Save