Browse Source

Pull request #208685: 无jira cherry pick 一下

Merge in DEC/fineui from ~TREECAT/dec-fineui:release/11.0 to release/11.0

* commit '7434617a2e8458c0ebfb5622274071d78344dab3':
  Pull request #3222: REPORT-85040 fix: 日期控件时间会超
  auto upgrade version to 2.0.20221121190600
research/test
treecat-罗群 2 years ago
parent
commit
c71280a801
  1. 2
      package.json
  2. 10
      src/case/calendar/calendar.js

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20221117172352", "version": "2.0.20221121190600",
"description": "fineui", "description": "fineui",
"main": "dist/fineui_without_conflict.min.js", "main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

10
src/case/calendar/calendar.js

@ -156,11 +156,19 @@ BI.Calendar = BI.inherit(BI.Widget, {
return BI.map(items, function (i, item) { return BI.map(items, function (i, item) {
return BI.map(item, function (j, td) { return BI.map(item, function (j, td) {
var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month); var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
var year = o.year;
if (month > 12) {
month = 1;
year++;
} else if (month < 1) {
month = 12;
year--;
}
return BI.extend(td, { return BI.extend(td, {
type: "bi.calendar_date_item", type: "bi.calendar_date_item",
once: false, once: false,
forceSelected: true, forceSelected: true,
value: o.year + "-" + month + "-" + td.text, value: year + "-" + month + "-" + td.text,
disabled: td.disabled, disabled: td.disabled,
cls: td.lastMonth || td.nextMonth ? "not-current-month-day" : "", cls: td.lastMonth || td.nextMonth ? "not-current-month-day" : "",
lgap: 2, lgap: 2,

Loading…
Cancel
Save