Browse Source

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

* commit '041e7d87070a2c96ba26d93aba81d0fbc69266b7':
  report-136587 feat: 日期区间组件增加格式options
master
superman 3 weeks ago
parent
commit
6a15a83734
  1. 1
      packages/demo/src/demo/widget/yearmonthinterval/demo.year_month_interval.js
  2. 2
      packages/fineui/src/widget/timeinterval/dateinterval.js
  3. 2
      packages/fineui/src/widget/timeinterval/timeinterval.js

1
packages/demo/src/demo/widget/yearmonthinterval/demo.year_month_interval.js

@ -20,6 +20,7 @@ export class YearMonthIntervalDemo extends Widget {
ref(_ref) { ref(_ref) {
self.interval = _ref; self.interval = _ref;
}, },
format: "%Y/%X",
value: { value: {
start: { start: {
type: 2, type: 2,

2
packages/fineui/src/widget/timeinterval/dateinterval.js

@ -41,6 +41,7 @@ export class DateInterval extends Single {
minDate: "1900-01-01", minDate: "1900-01-01",
maxDate: "2099-12-31", maxDate: "2099-12-31",
height: 24, height: 24,
format: "",
supportDynamic: true, supportDynamic: true,
simple: false, simple: false,
}); });
@ -96,6 +97,7 @@ export class DateInterval extends Single {
maxDate: o.maxDate, maxDate: o.maxDate,
simple: o.simple, simple: o.simple,
behaviors: o.behaviors, behaviors: o.behaviors,
format: o.format,
watermark, watermark,
value: v, value: v,
height: o.height, height: o.height,

2
packages/fineui/src/widget/timeinterval/timeinterval.js

@ -40,6 +40,7 @@ export class TimeInterval extends Single {
minDate: "1900-01-01", minDate: "1900-01-01",
maxDate: "2099-12-31", maxDate: "2099-12-31",
height: 24, height: 24,
format: "",
supportDynamic: true, supportDynamic: true,
}); });
} }
@ -94,6 +95,7 @@ export class TimeInterval extends Single {
supportDynamic: o.supportDynamic, supportDynamic: o.supportDynamic,
minDate: o.minDate, minDate: o.minDate,
maxDate: o.maxDate, maxDate: o.maxDate,
format: o.format,
behaviors: o.behaviors, behaviors: o.behaviors,
watermark, watermark,
value: v, value: v,

Loading…
Cancel
Save