Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~claire.tang/fineui

es6
Tangjinxia 3 years ago
parent
commit
e4f852f0ae
  1. 1
      changelog.md
  2. 4
      dist/2.0/fineui.css
  3. 4
      dist/2.0/fineui.ie.min.js
  4. 2
      dist/2.0/fineui.ie.min.js.map
  5. 965
      dist/2.0/fineui.js
  6. 2
      dist/2.0/fineui.js.map
  7. 4
      dist/2.0/fineui.min.css
  8. 4
      dist/2.0/fineui.min.js
  9. 2
      dist/2.0/fineui.min.js.map
  10. 4
      dist/2.0/fineui_without_normalize.css
  11. 4
      dist/2.0/fineui_without_normalize.min.css
  12. 4
      dist/core.css
  13. 938
      dist/core.js
  14. 2
      dist/core.js.map
  15. 4
      dist/demo.css
  16. 1295
      dist/demo.js
  17. 2
      dist/demo.js.map
  18. 4
      dist/fineui.css
  19. 4
      dist/fineui.ie.min.js
  20. 2
      dist/fineui.ie.min.js.map
  21. 964
      dist/fineui.js
  22. 2
      dist/fineui.js.map
  23. 4
      dist/fineui.min.css
  24. 4
      dist/fineui.min.js
  25. 2
      dist/fineui.min.js.map
  26. 324
      dist/fineui_without_jquery_polyfill.js
  27. 2
      dist/fineui_without_jquery_polyfill.js.map
  28. 2
      dist/font.css
  29. 4
      dist/lib/index.d.ts
  30. 18
      dist/lib/widget/date/calendar/popup.calendar.date.d.ts
  31. 2
      dist/resource.css
  32. 1
      dist/resource.js
  33. 73
      dist/utils.js
  34. 2
      dist/utils.js.map
  35. 4
      dist/utils.min.js
  36. 2
      dist/utils.min.js.map
  37. 1
      i18n/i18n.cn.js
  38. 2
      package.json
  39. 2
      src/case/linersegment/linear.segment.js
  40. 4
      src/core/platform/web/config.js
  41. 4
      src/less/widget/dynamicdatecombo/dynamicdatepopup.less
  42. 4
      src/less/widget/dynamicdatecombo/dynamicdatetimepopup.less
  43. 3
      src/less/widget/year/popup.year.less
  44. 4
      src/less/widget/yearmonth/popup.yearmonth.less
  45. 6
      src/less/widget/yearquarter/popup.yearquarter.less
  46. 33
      src/widget/date/calendar/popup.calendar.date.js
  47. 4
      src/widget/dynamicdate/dynamicdate.combo.js
  48. 13
      src/widget/dynamicdate/dynamicdate.popup.js
  49. 4
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  50. 23
      src/widget/dynamicdatetime/dynamicdatetime.popup.js
  51. 15
      src/widget/multiselect/multiselect.combo.js
  52. 4
      src/widget/multiselect/multiselect.combo.nobar.js
  53. 4
      src/widget/multiselect/multiselect.insert.combo.js
  54. 4
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  55. 4
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
  56. 4
      src/widget/timeinterval/dateinterval.js
  57. 4
      src/widget/timeinterval/timeinterval.js
  58. 4
      src/widget/year/combo.year.js
  59. 14
      src/widget/year/popup.year.js
  60. 57
      src/widget/yearmonth/card.static.yearmonth.js
  61. 4
      src/widget/yearmonth/combo.yearmonth.js
  62. 13
      src/widget/yearmonth/popup.yearmonth.js
  63. 4
      src/widget/yearmonthinterval/yearmonthinterval.js
  64. 40
      src/widget/yearquarter/card.static.yearquarter.js
  65. 4
      src/widget/yearquarter/combo.yearquarter.js
  66. 13
      src/widget/yearquarter/popup.yearquarter.js
  67. 3
      typescript/index.ts
  68. 20
      typescript/widget/date/calendar/popup.calendar.date.ts

1
changelog.md

@ -1,5 +1,6 @@
# 更新日志
2.0(2021-01)
- 日期类型控件全系列可设置是否显示动态日期
- 日期类型控件全系列可设置最大最小日期
- 调整了combo的popup显示位置计算逻辑

4
dist/2.0/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

965
dist/2.0/fineui.js vendored

File diff suppressed because it is too large Load Diff

2
dist/2.0/fineui.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui_without_normalize.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/core.css vendored

File diff suppressed because one or more lines are too long

938
dist/core.js vendored

File diff suppressed because it is too large Load Diff

2
dist/core.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/demo.css vendored

File diff suppressed because one or more lines are too long

1295
dist/demo.js vendored

File diff suppressed because it is too large Load Diff

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

964
dist/fineui.js vendored

File diff suppressed because it is too large Load Diff

2
dist/fineui.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

324
dist/fineui_without_jquery_polyfill.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-1-12 19:00:21 */
/*! time: 2021-1-19 09:30:24 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -82,7 +82,7 @@
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 1404);
/******/ return __webpack_require__(__webpack_require__.s = 1405);
/******/ })
/************************************************************************/
/******/ ([
@ -34562,7 +34562,7 @@ BI.shortcut("bi.linear_segment_button", BI.LinearSegmentButton);
BI.LinearSegment = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-linear-segment bi-split-bottom",
baseCls: "bi-linear-segment",
items: [],
layouts: [{
type: "bi.center"
@ -37867,14 +37867,12 @@ BI.shortcut("bi.year_picker", BI.YearPicker);
* @extends BI.Widget
*/
BI.DateCalendarPopup = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.DateCalendarPopup.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-date-calendar-popup",
min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期
selectedTime: null
});
props: {
baseCls: "bi-date-calendar-popup",
min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期
selectedTime: null
},
_createNav: function (v) {
@ -37894,8 +37892,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
return calendar;
},
_init: function () {
BI.DateCalendarPopup.superclass._init.apply(this, arguments);
render: function () {
var self = this,
o = this.options;
this.today = BI.getDate();
@ -37949,14 +37946,16 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
BI.createWidget({
type: "bi.absolute",
element: this,
return [{
type: "bi.vertical",
items: [{
el: this.calendar,
left: 5,
right: 5
}, {
hgap: 5,
bgap: 12
}]
}, {
type: "bi.absolute",
items: [{
el: {
type: "bi.layout",
cls: "bi-split-top"
@ -37966,7 +37965,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
left: 0,
right: 0
}]
});
}]
},
_checkMin: function () {
@ -40591,7 +40590,8 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
minDate: "1900-01-01",
maxDate: "2099-12-31",
format: "",
allowEdit: true
allowEdit: true,
supportDynamic: true,
},
@ -40713,6 +40713,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
popup: {
el: {
type: "bi.dynamic_date_popup",
supportDynamic: opts.supportDynamic,
behaviors: opts.behaviors,
min: opts.minDate,
max: opts.maxDate,
@ -41052,7 +41053,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-dynamic-date-popup",
width: 248,
height: 344
supportDynamic: true,
},
_init: function () {
@ -41061,7 +41062,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: this._getTabJson()
}, {
@ -41106,9 +41107,9 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DynamicDatePopup.BUTTON_OK_EVENT_CHANGE);
}
}]
}]]
}]],
height: 24
},
height: 24
}]
});
this.setValue(opts.value);
@ -41118,11 +41119,15 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.tab",
logic: {
dynamic: true
},
ref: function () {
self.dateTab = this;
},
tab: {
type: "bi.linear_segment",
invisible: !o.supportDynamic,
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
@ -41140,6 +41145,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
case BI.DynamicDateCombo.Dynamic:
return {
type: "bi.dynamic_date_card",
cls: "dynamic-date-pane",
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
@ -41661,7 +41667,8 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
minDate: "1900-01-01",
maxDate: "2099-12-31",
format: "",
allowEdit: true
allowEdit: true,
supportDynamic: true
},
@ -41788,6 +41795,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
popup: {
el: {
type: "bi.dynamic_date_time_popup",
supportDynamic: opts.supportDynamic,
behaviors: opts.behaviors,
min: opts.minDate,
max: opts.maxDate,
@ -41991,7 +41999,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-dynamic-date-time-popup",
width: 248,
height: 385
supportDynamic: true,
},
_init: function () {
@ -42000,7 +42008,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: this._getTabJson()
}, {
@ -42045,9 +42053,9 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE);
}
}]
}]]
},
height: 24
}]],
height: 24
}
}]
});
this.setValue(opts.value);
@ -42057,11 +42065,15 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.tab",
logic: {
dynamic: true
},
ref: function () {
self.dateTab = this;
},
tab: {
type: "bi.linear_segment",
invisible: !o.supportDynamic,
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
@ -42079,6 +42091,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
case BI.DynamicDateCombo.Dynamic:
return {
type: "bi.dynamic_date_card",
cls: "dynamic-date-pane",
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
@ -42094,7 +42107,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
case BI.DynamicDateCombo.Static:
default:
return {
type: "bi.vtape",
type: "bi.vertical",
items: [{
type: "bi.date_calendar_popup",
behaviors: o.behaviors,
@ -42115,9 +42128,9 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
cls: "bi-split-top",
ref: function () {
self.timeSelect = this;
}
},
height: 40
},
height: 40
}
}]
};
}
@ -47664,7 +47677,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self._dataChange = false;// 标记数据是否发生变化
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue);
BI.nextTick(function () {
self._populate();
@ -47759,12 +47774,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
right: o.height,
top: 0,
height: o.height,
height: o.height
}]
});
},
_itemsCreator4Trigger: function(op, callback) {
_itemsCreator4Trigger: function (op, callback) {
var self = this, o = this.options;
o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) {
@ -47775,7 +47790,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
});
},
_stopEditing: function() {
_stopEditing: function () {
this.trigger.stopEditing();
this.numberCounter.hideView();
},
@ -47863,6 +47878,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var self = this, o = this.options;
adjust();
callback();
function adjust () {
if (self.wants2Quit === true) {
self._dataChange && self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
@ -47909,11 +47925,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.combo.populate.apply(this.combo, arguments);
},
showView:function (){
showView: function () {
this.combo.showView();
},
hideView:function (){
hideView: function () {
this.combo.hideView();
},
@ -48143,7 +48159,9 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self._dataChange = false;// 标记数据是否发生变化
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue);
BI.nextTick(function () {
self._populate();
@ -48650,7 +48668,9 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self._dataChange = false;// 标记数据是否发生变化
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue);
BI.nextTick(function () {
self._populate();
@ -49148,7 +49168,9 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self._dataChange = false;// 标记数据是否发生变化
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue);
BI.nextTick(function () {
self._populate();
@ -55827,7 +55849,9 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self._dataChange = false;// 标记数据是否发生变化
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue);
BI.nextTick(function () {
self._populate();
@ -61685,7 +61709,8 @@ BI.DateInterval = BI.inherit(BI.Single, {
extraCls: "bi-date-interval",
minDate: "1900-01-01",
maxDate: "2099-12-31",
height: 24
height: 24,
supportDynamic: true,
});
},
_init: function () {
@ -61738,6 +61763,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_combo",
supportDynamic: o.supportDynamic,
minDate: o.minDate,
maxDate: o.maxDate,
behaviors: o.behaviors,
@ -61898,7 +61924,8 @@ BI.TimeInterval = BI.inherit(BI.Single, {
extraCls: "bi-time-interval",
minDate: "1900-01-01",
maxDate: "2099-12-31",
height: 24
height: 24,
supportDynamic: true
});
},
_init: function () {
@ -61951,6 +61978,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_time_combo",
supportDynamic: o.supportDynamic,
minDate: o.minDate,
maxDate: o.maxDate,
behaviors: o.behaviors,
@ -62513,7 +62541,8 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
behaviors: {},
minDate: "1900-01-01", // 最小日期
maxDate: "2099-12-31", // 最大日期
height: 22
height: 22,
supportDynamic: true,
},
_init: function () {
@ -62570,6 +62599,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
stopPropagation: false,
el: {
type: "bi.dynamic_year_popup",
supportDynamic: o.supportDynamic,
ref: function () {
self.popup = this;
},
@ -62715,14 +62745,14 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期,
width: 180,
height: 240
supportDynamic: true,
},
render: function () {
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearCombo.Static};
return {
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: this._getTabJson()
}, {
@ -62767,9 +62797,9 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DynamicYearPopup.BUTTON_OK_EVENT_CHANGE);
}
}]
}]]
}]],
height: 24
},
height: 24
}]
};
},
@ -62790,12 +62820,15 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.tab",
logic: {
dynamic: true
},
ref: function () {
self.dateTab = this;
},
tab: {
type: "bi.linear_segment",
cls: "bi-split-bottom",
invisible: !o.supportDynamic,
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Fen"),
@ -62812,6 +62845,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
case BI.DynamicYearCombo.Dynamic:
return {
type: "bi.dynamic_year_card",
cls: "dynamic-year-pane",
min: self.options.min,
max: self.options.max,
listeners: [{
@ -63294,6 +63328,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
type: "bi.vertical",
items: [{
type: "bi.year_picker",
cls: "bi-split-bottom",
min: o.min,
max: o.max,
ref: function () {
@ -63313,34 +63348,36 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
}
}]
}, {
type: "bi.button_group",
cls: "bi-split-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;
el: {
type: "bi.button_group",
behaviors: o.behaviors,
ref: function () {
self.month = this;
},
items: this._createMonths(),
layouts: [BI.LogicFactory.createLogic("table", BI.extend({
dynamic: true
}, {
columns: 2,
rows: 6,
columnSize: [1 / 2, 1 / 2],
rowSize: 25
})), {
type: "bi.center_adapt",
vgap: 1,
hgap: 2
}],
value: o.value,
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
action: function () {
self.selectedYear = self.yearPicker.getValue();
self.selectedMonth = this.getValue()[0];
self.fireEvent(BI.StaticYearMonthCard.EVENT_CHANGE);
}
}]
},
items: this._createMonths(),
layouts: [BI.LogicFactory.createLogic("table", BI.extend({
dynamic: true
}, {
columns: 2,
rows: 6,
columnSize: [1 / 2, 1 / 2],
rowSize: 25
})), {
type: "bi.center_adapt",
vgap: 1,
hgap: 2
}],
value: o.value,
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
action: function () {
self.selectedYear = self.yearPicker.getValue();
self.selectedMonth = this.getValue()[0];
self.fireEvent(BI.StaticYearMonthCard.EVENT_CHANGE);
}
}]
vgap: 5
}]
};
},
@ -63421,7 +63458,8 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
behaviors: {},
minDate: "1900-01-01", // 最小日期
maxDate: "2099-12-31", // 最大日期
height: 22
height: 22,
supportDynamic: true
},
_init: function () {
@ -63482,6 +63520,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
stopPropagation: false,
el: {
type: "bi.dynamic_year_month_popup",
supportDynamic: o.supportDynamic,
ref: function () {
self.popup = this;
},
@ -63642,14 +63681,14 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期,
width: 180,
height: 240
supportDynamic: true,
},
render: function () {
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearMonthCombo.Static};
return {
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: this._getTabJson()
}, {
@ -63694,9 +63733,9 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DynamicYearMonthPopup.BUTTON_OK_EVENT_CHANGE);
}
}]
}]]
}]],
height: 24
},
height: 24
}]
};
},
@ -63717,12 +63756,16 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.tab",
logic: {
dynamic: true
},
ref: function () {
self.dateTab = this;
},
tab: {
type: "bi.linear_segment",
cls: "bi-split-bottom",
invisible: !o.supportDynamic,
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Month"),
@ -63739,6 +63782,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
case BI.DynamicYearCombo.Dynamic:
return {
type: "bi.dynamic_year_month_card",
cls: "dynamic-year-month-pane",
min: self.options.min,
max: self.options.max,
listeners: [{
@ -64143,7 +64187,8 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
props: {
extraCls: "bi-year-month-interval",
minDate: "1900-01-01",
maxDate: "2099-12-31"
maxDate: "2099-12-31",
supportDynamic: true,
},
_init: function () {
@ -64197,6 +64242,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_year_month_combo",
supportDynamic: o.supportDynamic,
minDate: o.minDate,
maxDate: o.maxDate,
behaviors: o.behaviors,
@ -64522,6 +64568,7 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, {
type: "bi.vertical",
items: [{
type: "bi.year_picker",
cls: "bi-split-bottom",
ref: function () {
self.yearPicker = this;
},
@ -64541,25 +64588,28 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, {
}
}]
}, {
type: "bi.button_group",
behaviors: o.behaviors,
ref: function () {
self.quarter = this;
el: {
type: "bi.button_group",
behaviors: o.behaviors,
ref: function () {
self.quarter = this;
},
items: this._createQuarter(),
layouts: [{
type: "bi.vertical",
vgap: 10
}],
value: o.value,
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
action: function () {
self.selectedYear = self.yearPicker.getValue();
self.selectedQuarter = this.getValue()[0];
self.fireEvent(BI.StaticYearQuarterCard.EVENT_CHANGE);
}
}]
},
items: this._createQuarter(),
layouts: [{
type: "bi.vertical",
vgap: 10
}],
value: o.value,
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
action: function () {
self.selectedYear = self.yearPicker.getValue();
self.selectedQuarter = this.getValue()[0];
self.fireEvent(BI.StaticYearQuarterCard.EVENT_CHANGE);
}
}]
vgap: 5
}]
};
},
@ -64637,7 +64687,8 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
behaviors: {},
minDate: "1900-01-01", // 最小日期
maxDate: "2099-12-31", // 最大日期
height: 22
height: 22,
supportDynamic: true,
},
_init: function () {
@ -64693,6 +64744,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
stopPropagation: false,
el: {
type: "bi.dynamic_year_quarter_popup",
supportDynamic: o.supportDynamic,
ref: function () {
self.popup = this;
},
@ -64831,14 +64883,14 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期,
width: 180,
height: 240
supportDynamic: true,
},
render: function () {
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearQuarterCombo.Static};
return {
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: this._getTabJson()
}, {
@ -64883,9 +64935,9 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DynamicYearQuarterPopup.BUTTON_OK_EVENT_CHANGE);
}
}]
}]]
}]],
height: 24
},
height: 24
}]
};
},
@ -64906,12 +64958,16 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.tab",
logic: {
dynamic: true
},
ref: function () {
self.dateTab = this;
},
tab: {
type: "bi.linear_segment",
cls: "bi-split-bottom",
invisible: !o.supportDynamic,
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Quarter"),
@ -64928,6 +64984,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
case BI.DynamicYearQuarterCombo.Dynamic:
return {
type: "bi.dynamic_year_quarter_card",
cls: "dynamic-year-quarter-pane",
min: self.options.min,
max: self.options.max,
listeners: [{
@ -68608,6 +68665,12 @@ Object.defineProperty(exports, "LayerController", {
return _controller2.LayerController;
}
});
Object.defineProperty(exports, "DateCalendarPopup", {
enumerable: true,
get: function get() {
return _popupCalendar.DateCalendarPopup;
}
});
exports["default"] = void 0;
var _combo = __webpack_require__(714);
@ -68890,6 +68953,8 @@ var _controller = __webpack_require__(90);
var _controller2 = __webpack_require__(831);
var _popupCalendar = __webpack_require__(832);
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@ -70166,7 +70231,15 @@ var _widget = __webpack_require__(1);
var _controller = __webpack_require__(90);
/***/ }),
/* 832 */,
/* 832 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var _widget = __webpack_require__(1);
/***/ }),
/* 833 */,
/* 834 */,
/* 835 */,
@ -70216,7 +70289,8 @@ var _controller = __webpack_require__(90);
/* 879 */,
/* 880 */,
/* 881 */,
/* 882 */
/* 882 */,
/* 883 */
/***/ (function(module, exports) {
;(function () {
@ -70379,17 +70453,17 @@ var _controller = __webpack_require__(90);
/***/ }),
/* 883 */,
/* 884 */,
/* 885 */,
/* 886 */
/* 886 */,
/* 887 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(887);
/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(888);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(17)))
/***/ }),
/* 887 */
/* 888 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(setImmediate) {function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@ -71868,8 +71942,8 @@ var _controller = __webpack_require__(90);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(62).setImmediate))
/***/ }),
/* 888 */,
/* 889 */
/* 889 */,
/* 890 */
/***/ (function(module, exports) {
;(function () {
@ -72165,7 +72239,6 @@ var _controller = __webpack_require__(90);
/***/ }),
/* 890 */,
/* 891 */,
/* 892 */,
/* 893 */,
@ -72382,13 +72455,13 @@ var _controller = __webpack_require__(90);
/* 1104 */,
/* 1105 */,
/* 1106 */,
/* 1107 */
/* 1107 */,
/* 1108 */
/***/ (function(module, exports) {
/***/ }),
/* 1108 */,
/* 1109 */,
/* 1110 */,
/* 1111 */,
@ -72684,7 +72757,8 @@ var _controller = __webpack_require__(90);
/* 1401 */,
/* 1402 */,
/* 1403 */,
/* 1404 */
/* 1404 */,
/* 1405 */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(123);
@ -72788,7 +72862,7 @@ __webpack_require__(393);
__webpack_require__(153);
__webpack_require__(154);
__webpack_require__(155);
__webpack_require__(886);
__webpack_require__(887);
__webpack_require__(394);
__webpack_require__(395);
__webpack_require__(396);
@ -73165,9 +73239,9 @@ __webpack_require__(708);
__webpack_require__(709);
__webpack_require__(710);
__webpack_require__(711);
__webpack_require__(889);
__webpack_require__(882);
__webpack_require__(1107);
__webpack_require__(890);
__webpack_require__(883);
__webpack_require__(1108);
module.exports = __webpack_require__(712);

2
dist/fineui_without_jquery_polyfill.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/font.css vendored

File diff suppressed because one or more lines are too long

4
dist/lib/index.d.ts vendored

@ -147,6 +147,7 @@ import { DynamicYearMonthPopup } from './widget/yearmonth/popup.yearmonth';
import { _utils } from './core/utils';
import { Controller } from "./core/controller/controller";
import { LayerController } from "./core/controller/controller.layer";
import { DateCalendarPopup } from "./widget/date/calendar/popup.calendar.date";
export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
OB: typeof OB;
Plugin: _Plugin;
@ -298,9 +299,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
FloatCenterLayout: typeof FloatCenterLayout;
Msg: _msg;
DynamicYearMonthPopup: typeof DynamicYearMonthPopup;
DateCalendarPopup: typeof DateCalendarPopup;
}
declare const _default: {
Decorators: typeof decorator;
};
export default _default;
export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, };
export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, };

18
dist/lib/widget/date/calendar/popup.calendar.date.d.ts vendored

@ -0,0 +1,18 @@
import { Widget } from "../../../core/widget";
export declare class DateCalendarPopup extends Widget {
static xtype: string;
static EVENT_CHANGE: string;
static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
setMinDate(v: string): void;
setMaxDate(v: string): void;
setValue(v: {
year: number;
month: number;
day: number;
}): void;
getValue(): {
year: number;
month: number;
day: number;
};
}

2
dist/resource.css vendored

File diff suppressed because one or more lines are too long

1
dist/resource.js vendored

@ -184,6 +184,7 @@ BI.i18n = {
"BI-Basic_Hour_Sin": "时",
"BI-Basic_Seconds": "秒",
"BI-Basic_Minute": "分",
"BI-Basic_Thousand": "千",
"BI-Basic_Wan": "万",
"BI-Basic_Million": "百万",
"BI-Basic_Billion": "亿",

73
dist/utils.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-1-12 19:00:21 */
/*! time: 2021-1-19 09:30:24 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -82,12 +82,12 @@
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 1229);
/******/ return __webpack_require__(__webpack_require__.s = 1230);
/******/ })
/************************************************************************/
/******/ ({
/***/ 1090:
/***/ 1091:
/***/ (function(module, exports) {
BI.i18n = {
@ -275,6 +275,7 @@ BI.i18n = {
"BI-Basic_Hour_Sin": "时",
"BI-Basic_Seconds": "秒",
"BI-Basic_Minute": "分",
"BI-Basic_Thousand": "千",
"BI-Basic_Wan": "万",
"BI-Basic_Million": "百万",
"BI-Basic_Billion": "亿",
@ -290,7 +291,36 @@ BI.i18n = {
/***/ }),
/***/ 1229:
/***/ 123:
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global) {/**
* Created by richie on 15/7/8.
*/
/**
* 初始化BI对象
*/
_global = undefined;
if (typeof window !== "undefined") {
_global = window;
} else if (typeof global !== "undefined") {
_global = global;
} else if (typeof self !== "undefined") {
_global = self;
} else {
_global = this;
}
if (_global.BI == null) {
_global.BI = {prepares: []};
}
if(_global.BI.prepares == null) {
_global.BI.prepares = [];
}
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(17)))
/***/ }),
/***/ 1230:
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(123);
@ -320,8 +350,8 @@ __webpack_require__(140);
__webpack_require__(141);
__webpack_require__(142);
__webpack_require__(143);
__webpack_require__(1090);
__webpack_require__(1230);
__webpack_require__(1091);
__webpack_require__(1231);
__webpack_require__(153);
__webpack_require__(154);
module.exports = __webpack_require__(155);
@ -329,36 +359,7 @@ module.exports = __webpack_require__(155);
/***/ }),
/***/ 123:
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global) {/**
* Created by richie on 15/7/8.
*/
/**
* 初始化BI对象
*/
_global = undefined;
if (typeof window !== "undefined") {
_global = window;
} else if (typeof global !== "undefined") {
_global = global;
} else if (typeof self !== "undefined") {
_global = self;
} else {
_global = this;
}
if (_global.BI == null) {
_global.BI = {prepares: []};
}
if(_global.BI.prepares == null) {
_global.BI.prepares = [];
}
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(17)))
/***/ }),
/***/ 1230:
/***/ 1231:
/***/ (function(module, exports) {
/**

2
dist/utils.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/utils.min.js.map vendored

File diff suppressed because one or more lines are too long

1
i18n/i18n.cn.js

@ -183,6 +183,7 @@ BI.i18n = {
"BI-Basic_Hour_Sin": "时",
"BI-Basic_Seconds": "秒",
"BI-Basic_Minute": "分",
"BI-Basic_Thousand": "千",
"BI-Basic_Wan": "万",
"BI-Basic_Million": "百万",
"BI-Basic_Billion": "亿",

2
package.json

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

2
src/case/linersegment/linear.segment.js

@ -1,7 +1,7 @@
BI.LinearSegment = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-linear-segment bi-split-bottom",
baseCls: "bi-linear-segment",
items: [],
layouts: [{
type: "bi.center"

4
src/core/platform/web/config.js

@ -117,14 +117,14 @@ BI.prepares.push(function () {
});
BI.Plugin.configWidget("bi.radio", function (ob) {
if (BI.isIE() && BI.getIEVersion() < 9) {
if (BI.isIE() && BI.getIEVersion() <= 9) {
return BI.extend(ob, {type: "bi.image_radio"});
}
return ob;
});
BI.Plugin.configWidget("bi.checkbox", function (ob) {
if (BI.isIE() && BI.getIEVersion() < 9) {
if (BI.isIE() && BI.getIEVersion() <= 9) {
return BI.extend(ob, {type: "bi.image_checkbox"});
}
return ob;

4
src/less/widget/dynamicdatecombo/dynamicdatepopup.less

@ -1,5 +1,7 @@
@import "../../index";
.bi-dynamic-date-popup{
& .dynamic-date-pane {
min-height: 290px;
}
}

4
src/less/widget/dynamicdatecombo/dynamicdatetimepopup.less

@ -1,5 +1,7 @@
@import "../../index";
.bi-dynamic-date-time-popup{
& .dynamic-date-pane {
min-height: 331px;
}
}

3
src/less/widget/year/popup.year.less

@ -10,6 +10,9 @@
border-left: none;
}
}
& .dynamic-year-pane {
min-height: 186px;
}
}
.bi-theme-dark {

4
src/less/widget/yearmonth/popup.yearmonth.less

@ -1,5 +1,7 @@
@import "../../index";
.bi-year-month-popup{
& .dynamic-year-month-pane {
min-height: 191px;
}
}

6
src/less/widget/yearquarter/popup.yearquarter.less

@ -1,5 +1,7 @@
@import "../../index";
.bi-year-month-popup{
.bi-year-quarter-popup{
& .dynamic-year-quarter-pane {
min-height: 187px;
}
}

33
src/widget/date/calendar/popup.calendar.date.js

@ -4,14 +4,12 @@
* @extends BI.Widget
*/
BI.DateCalendarPopup = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.DateCalendarPopup.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-date-calendar-popup",
min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期
selectedTime: null
});
props: {
baseCls: "bi-date-calendar-popup",
min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期
selectedTime: null
},
_createNav: function (v) {
@ -31,8 +29,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
return calendar;
},
_init: function () {
BI.DateCalendarPopup.superclass._init.apply(this, arguments);
render: function () {
var self = this,
o = this.options;
this.today = BI.getDate();
@ -86,14 +83,16 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
BI.createWidget({
type: "bi.absolute",
element: this,
return [{
type: "bi.vertical",
items: [{
el: this.calendar,
left: 5,
right: 5
}, {
hgap: 5,
bgap: 12
}]
}, {
type: "bi.absolute",
items: [{
el: {
type: "bi.layout",
cls: "bi-split-top"
@ -103,7 +102,7 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
left: 0,
right: 0
}]
});
}]
},
_checkMin: function () {

4
src/widget/dynamicdate/dynamicdate.combo.js

@ -12,7 +12,8 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
minDate: "1900-01-01",
maxDate: "2099-12-31",
format: "",
allowEdit: true
allowEdit: true,
supportDynamic: true,
},
@ -134,6 +135,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
popup: {
el: {
type: "bi.dynamic_date_popup",
supportDynamic: opts.supportDynamic,
behaviors: opts.behaviors,
min: opts.minDate,
max: opts.maxDate,

13
src/widget/dynamicdate/dynamicdate.popup.js

@ -7,7 +7,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-dynamic-date-popup",
width: 248,
height: 344
supportDynamic: true,
},
_init: function () {
@ -16,7 +16,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: this._getTabJson()
}, {
@ -61,9 +61,9 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DynamicDatePopup.BUTTON_OK_EVENT_CHANGE);
}
}]
}]]
}]],
height: 24
},
height: 24
}]
});
this.setValue(opts.value);
@ -73,11 +73,15 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.tab",
logic: {
dynamic: true
},
ref: function () {
self.dateTab = this;
},
tab: {
type: "bi.linear_segment",
invisible: !o.supportDynamic,
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
@ -95,6 +99,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
case BI.DynamicDateCombo.Dynamic:
return {
type: "bi.dynamic_date_card",
cls: "dynamic-date-pane",
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {

4
src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -12,7 +12,8 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
minDate: "1900-01-01",
maxDate: "2099-12-31",
format: "",
allowEdit: true
allowEdit: true,
supportDynamic: true
},
@ -139,6 +140,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
popup: {
el: {
type: "bi.dynamic_date_time_popup",
supportDynamic: opts.supportDynamic,
behaviors: opts.behaviors,
min: opts.minDate,
max: opts.maxDate,

23
src/widget/dynamicdatetime/dynamicdatetime.popup.js

@ -7,7 +7,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-dynamic-date-time-popup",
width: 248,
height: 385
supportDynamic: true,
},
_init: function () {
@ -16,7 +16,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
this.storeValue = {type: BI.DynamicDateCombo.Static};
BI.createWidget({
element: this,
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: this._getTabJson()
}, {
@ -61,9 +61,9 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE);
}
}]
}]]
},
height: 24
}]],
height: 24
}
}]
});
this.setValue(opts.value);
@ -73,11 +73,15 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.tab",
logic: {
dynamic: true
},
ref: function () {
self.dateTab = this;
},
tab: {
type: "bi.linear_segment",
invisible: !o.supportDynamic,
cls: "bi-split-bottom",
height: this.constants.tabHeight,
items: BI.createItems([{
@ -95,6 +99,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
case BI.DynamicDateCombo.Dynamic:
return {
type: "bi.dynamic_date_card",
cls: "dynamic-date-pane",
listeners: [{
eventName: "EVENT_CHANGE",
action: function () {
@ -110,7 +115,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
case BI.DynamicDateCombo.Static:
default:
return {
type: "bi.vtape",
type: "bi.vertical",
items: [{
type: "bi.date_calendar_popup",
behaviors: o.behaviors,
@ -131,9 +136,9 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
cls: "bi-split-top",
ref: function () {
self.timeSelect = this;
}
},
height: 40
},
height: 40
}
}]
};
}

15
src/widget/multiselect/multiselect.combo.js

@ -195,7 +195,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self._dataChange = false;// 标记数据是否发生变化
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue);
BI.nextTick(function () {
self._populate();
@ -290,12 +292,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
},
right: o.height,
top: 0,
height: o.height,
height: o.height
}]
});
},
_itemsCreator4Trigger: function(op, callback) {
_itemsCreator4Trigger: function (op, callback) {
var self = this, o = this.options;
o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) {
@ -306,7 +308,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
});
},
_stopEditing: function() {
_stopEditing: function () {
this.trigger.stopEditing();
this.numberCounter.hideView();
},
@ -394,6 +396,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
var self = this, o = this.options;
adjust();
callback();
function adjust () {
if (self.wants2Quit === true) {
self._dataChange && self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
@ -440,11 +443,11 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.combo.populate.apply(this.combo, arguments);
},
showView:function (){
showView: function () {
this.combo.showView();
},
hideView:function (){
hideView: function () {
this.combo.hideView();
},

4
src/widget/multiselect/multiselect.combo.nobar.js

@ -188,7 +188,9 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self._dataChange = false;// 标记数据是否发生变化
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue);
BI.nextTick(function () {
self._populate();

4
src/widget/multiselect/multiselect.insert.combo.js

@ -190,7 +190,9 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self._dataChange = false;// 标记数据是否发生变化
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue);
BI.nextTick(function () {
self._populate();

4
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -185,7 +185,9 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self._dataChange = false;// 标记数据是否发生变化
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue);
BI.nextTick(function () {
self._populate();

4
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@ -177,7 +177,9 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
});
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
self._dataChange = false;// 标记数据是否发生变化
if (!this.isViewVisible()) {
self._dataChange = false;// 标记数据是否发生变化
}
this.setValue(self.storeValue);
BI.nextTick(function () {
self._populate();

4
src/widget/timeinterval/dateinterval.js

@ -15,7 +15,8 @@ BI.DateInterval = BI.inherit(BI.Single, {
extraCls: "bi-date-interval",
minDate: "1900-01-01",
maxDate: "2099-12-31",
height: 24
height: 24,
supportDynamic: true,
});
},
_init: function () {
@ -68,6 +69,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_combo",
supportDynamic: o.supportDynamic,
minDate: o.minDate,
maxDate: o.maxDate,
behaviors: o.behaviors,

4
src/widget/timeinterval/timeinterval.js

@ -15,7 +15,8 @@ BI.TimeInterval = BI.inherit(BI.Single, {
extraCls: "bi-time-interval",
minDate: "1900-01-01",
maxDate: "2099-12-31",
height: 24
height: 24,
supportDynamic: true
});
},
_init: function () {
@ -68,6 +69,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_date_time_combo",
supportDynamic: o.supportDynamic,
minDate: o.minDate,
maxDate: o.maxDate,
behaviors: o.behaviors,

4
src/widget/year/combo.year.js

@ -5,7 +5,8 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
behaviors: {},
minDate: "1900-01-01", // 最小日期
maxDate: "2099-12-31", // 最大日期
height: 22
height: 22,
supportDynamic: true,
},
_init: function () {
@ -62,6 +63,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
stopPropagation: false,
el: {
type: "bi.dynamic_year_popup",
supportDynamic: o.supportDynamic,
ref: function () {
self.popup = this;
},

14
src/widget/year/popup.year.js

@ -17,14 +17,14 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期,
width: 180,
height: 240
supportDynamic: true,
},
render: function () {
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearCombo.Static};
return {
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: this._getTabJson()
}, {
@ -69,9 +69,9 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DynamicYearPopup.BUTTON_OK_EVENT_CHANGE);
}
}]
}]]
}]],
height: 24
},
height: 24
}]
};
},
@ -92,12 +92,15 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.tab",
logic: {
dynamic: true
},
ref: function () {
self.dateTab = this;
},
tab: {
type: "bi.linear_segment",
cls: "bi-split-bottom",
invisible: !o.supportDynamic,
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Fen"),
@ -114,6 +117,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
case BI.DynamicYearCombo.Dynamic:
return {
type: "bi.dynamic_year_card",
cls: "dynamic-year-pane",
min: self.options.min,
max: self.options.max,
listeners: [{

57
src/widget/yearmonth/card.static.yearmonth.js

@ -44,6 +44,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
type: "bi.vertical",
items: [{
type: "bi.year_picker",
cls: "bi-split-bottom",
min: o.min,
max: o.max,
ref: function () {
@ -63,34 +64,36 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
}
}]
}, {
type: "bi.button_group",
cls: "bi-split-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;
el: {
type: "bi.button_group",
behaviors: o.behaviors,
ref: function () {
self.month = this;
},
items: this._createMonths(),
layouts: [BI.LogicFactory.createLogic("table", BI.extend({
dynamic: true
}, {
columns: 2,
rows: 6,
columnSize: [1 / 2, 1 / 2],
rowSize: 25
})), {
type: "bi.center_adapt",
vgap: 1,
hgap: 2
}],
value: o.value,
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
action: function () {
self.selectedYear = self.yearPicker.getValue();
self.selectedMonth = this.getValue()[0];
self.fireEvent(BI.StaticYearMonthCard.EVENT_CHANGE);
}
}]
},
items: this._createMonths(),
layouts: [BI.LogicFactory.createLogic("table", BI.extend({
dynamic: true
}, {
columns: 2,
rows: 6,
columnSize: [1 / 2, 1 / 2],
rowSize: 25
})), {
type: "bi.center_adapt",
vgap: 1,
hgap: 2
}],
value: o.value,
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
action: function () {
self.selectedYear = self.yearPicker.getValue();
self.selectedMonth = this.getValue()[0];
self.fireEvent(BI.StaticYearMonthCard.EVENT_CHANGE);
}
}]
vgap: 5
}]
};
},

4
src/widget/yearmonth/combo.yearmonth.js

@ -5,7 +5,8 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
behaviors: {},
minDate: "1900-01-01", // 最小日期
maxDate: "2099-12-31", // 最大日期
height: 22
height: 22,
supportDynamic: true
},
_init: function () {
@ -66,6 +67,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
stopPropagation: false,
el: {
type: "bi.dynamic_year_month_popup",
supportDynamic: o.supportDynamic,
ref: function () {
self.popup = this;
},

13
src/widget/yearmonth/popup.yearmonth.js

@ -17,14 +17,14 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期,
width: 180,
height: 240
supportDynamic: true,
},
render: function () {
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearMonthCombo.Static};
return {
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: this._getTabJson()
}, {
@ -69,9 +69,9 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DynamicYearMonthPopup.BUTTON_OK_EVENT_CHANGE);
}
}]
}]]
}]],
height: 24
},
height: 24
}]
};
},
@ -92,12 +92,16 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.tab",
logic: {
dynamic: true
},
ref: function () {
self.dateTab = this;
},
tab: {
type: "bi.linear_segment",
cls: "bi-split-bottom",
invisible: !o.supportDynamic,
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Month"),
@ -114,6 +118,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
case BI.DynamicYearCombo.Dynamic:
return {
type: "bi.dynamic_year_month_card",
cls: "dynamic-year-month-pane",
min: self.options.min,
max: self.options.max,
listeners: [{

4
src/widget/yearmonthinterval/yearmonthinterval.js

@ -10,7 +10,8 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
props: {
extraCls: "bi-year-month-interval",
minDate: "1900-01-01",
maxDate: "2099-12-31"
maxDate: "2099-12-31",
supportDynamic: true,
},
_init: function () {
@ -64,6 +65,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
var self = this, o = this.options;
var combo = BI.createWidget({
type: "bi.dynamic_year_month_combo",
supportDynamic: o.supportDynamic,
minDate: o.minDate,
maxDate: o.maxDate,
behaviors: o.behaviors,

40
src/widget/yearquarter/card.static.yearquarter.js

@ -43,6 +43,7 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, {
type: "bi.vertical",
items: [{
type: "bi.year_picker",
cls: "bi-split-bottom",
ref: function () {
self.yearPicker = this;
},
@ -62,25 +63,28 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, {
}
}]
}, {
type: "bi.button_group",
behaviors: o.behaviors,
ref: function () {
self.quarter = this;
el: {
type: "bi.button_group",
behaviors: o.behaviors,
ref: function () {
self.quarter = this;
},
items: this._createQuarter(),
layouts: [{
type: "bi.vertical",
vgap: 10
}],
value: o.value,
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
action: function () {
self.selectedYear = self.yearPicker.getValue();
self.selectedQuarter = this.getValue()[0];
self.fireEvent(BI.StaticYearQuarterCard.EVENT_CHANGE);
}
}]
},
items: this._createQuarter(),
layouts: [{
type: "bi.vertical",
vgap: 10
}],
value: o.value,
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
action: function () {
self.selectedYear = self.yearPicker.getValue();
self.selectedQuarter = this.getValue()[0];
self.fireEvent(BI.StaticYearQuarterCard.EVENT_CHANGE);
}
}]
vgap: 5
}]
};
},

4
src/widget/yearquarter/combo.yearquarter.js

@ -5,7 +5,8 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
behaviors: {},
minDate: "1900-01-01", // 最小日期
maxDate: "2099-12-31", // 最大日期
height: 22
height: 22,
supportDynamic: true,
},
_init: function () {
@ -61,6 +62,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
stopPropagation: false,
el: {
type: "bi.dynamic_year_quarter_popup",
supportDynamic: o.supportDynamic,
ref: function () {
self.popup = this;
},

13
src/widget/yearquarter/popup.yearquarter.js

@ -10,14 +10,14 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
min: "1900-01-01", // 最小日期
max: "2099-12-31", // 最大日期,
width: 180,
height: 240
supportDynamic: true,
},
render: function () {
var self = this, opts = this.options, c = this.constants;
this.storeValue = {type: BI.DynamicYearQuarterCombo.Static};
return {
type: "bi.vtape",
type: "bi.vertical",
items: [{
el: this._getTabJson()
}, {
@ -62,9 +62,9 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.DynamicYearQuarterPopup.BUTTON_OK_EVENT_CHANGE);
}
}]
}]]
}]],
height: 24
},
height: 24
}]
};
},
@ -85,12 +85,16 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.tab",
logic: {
dynamic: true
},
ref: function () {
self.dateTab = this;
},
tab: {
type: "bi.linear_segment",
cls: "bi-split-bottom",
invisible: !o.supportDynamic,
height: this.constants.tabHeight,
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year_Quarter"),
@ -107,6 +111,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
case BI.DynamicYearQuarterCombo.Dynamic:
return {
type: "bi.dynamic_year_quarter_card",
cls: "dynamic-year-quarter-pane",
min: self.options.min,
max: self.options.max,
listeners: [{

3
typescript/index.ts

@ -147,6 +147,7 @@ import { DynamicYearMonthPopup } from './widget/yearmonth/popup.yearmonth';
import { _utils } from './core/utils';
import { Controller } from "./core/controller/controller";
import { LayerController } from "./core/controller/controller.layer";
import { DateCalendarPopup } from "./widget/date/calendar/popup.calendar.date";
export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@ -300,6 +301,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
FloatCenterLayout: typeof FloatCenterLayout;
Msg: _msg;
DynamicYearMonthPopup: typeof DynamicYearMonthPopup;
DateCalendarPopup: typeof DateCalendarPopup;
}
export default {
@ -453,4 +455,5 @@ export {
ListView,
FloatCenterLayout,
DynamicYearMonthPopup,
DateCalendarPopup,
};

20
typescript/widget/date/calendar/popup.calendar.date.ts

@ -0,0 +1,20 @@
import { Widget } from "../../../core/widget";
export declare class DateCalendarPopup extends Widget {
static xtype: string;
static EVENT_CHANGE: string;
static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
setMinDate(v: string): void;
setMaxDate(v: string): void;
setValue(v: {
year: number;
month: number;
day: number;
}): void;
getValue(): {
year: number;
month: number;
day: number;
}
}
Loading…
Cancel
Save