Browse Source

Merge pull request #489 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'b6a314cc7d070ed83b51ec531117ed62b850d1a3':
  update
  update
  update
  BI-25602 && BI-25604
  BI-25602
es6
Young 6 years ago
parent
commit
e2bb356d83
  1. 86
      dist/_fineui.min.js
  2. 8
      dist/base.css
  3. 3
      dist/base.js
  4. 12
      dist/bundle.css
  5. 249
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 70
      dist/bundle.min.js
  8. 23
      dist/case.js
  9. 12
      dist/fineui.css
  10. 249
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 86
      dist/fineui.min.js
  13. 4
      dist/widget.css
  14. 223
      dist/widget.js
  15. 3
      src/base/layer/layer.popup.js
  16. 3
      src/case/calendar/calendar.js
  17. 2
      src/case/calendar/calendar.year.js
  18. 4
      src/case/checkbox/check.first.treenode.js
  19. 4
      src/case/checkbox/check.last.treenode.js
  20. 4
      src/case/checkbox/check.mid.treenode.js
  21. 4
      src/case/checkbox/check.treenode.js
  22. 2
      src/case/linearsegment/button.linear.segment.js
  23. 4
      src/css/base/calendar/calendar.css
  24. 4
      src/css/base/view/popupview.css
  25. 4
      src/css/widget/date/calendar/popup.css
  26. 0
      src/css/widget/dynamicdatecombo/dynamicdatepopup.css
  27. 0
      src/css/widget/dynamicdatecombo/dynamicdatetimepopup.css
  28. 0
      src/css/widget/yearmonth/popup.css
  29. 0
      src/css/widget/yearquarter/popup.css
  30. 6
      src/less/base/calendar/calendar.year.less
  31. 4
      src/less/base/view/popupview.less
  32. 5
      src/less/widget/dynamicdatecombo/dynamicdatepopup.less
  33. 5
      src/less/widget/dynamicdatecombo/dynamicdatetimepopup.less
  34. 5
      src/less/widget/multidate/multidate.combo.less
  35. 6
      src/less/widget/multidate/multidate.day.less
  36. 6
      src/less/widget/multidate/multidate.month.less
  37. 23
      src/less/widget/multidate/multidate.popup.less
  38. 6
      src/less/widget/multidate/multidate.quarter.less
  39. 9
      src/less/widget/multidate/multidate.segment.less
  40. 6
      src/less/widget/multidate/multidate.week.less
  41. 6
      src/less/widget/multidate/multidate.year.less
  42. 5
      src/less/widget/yearmonth/popup.yearmonth.less
  43. 5
      src/less/widget/yearquarter/popup.yearquarter.less
  44. 2
      src/widget/date/calendar/combo.year.date.js
  45. 2
      src/widget/date/calendar/picker.date.js
  46. 2
      src/widget/date/calendar/picker.year.js
  47. 20
      src/widget/date/calendar/popup.calendar.date.js
  48. 5
      src/widget/date/calendar/trigger.triangle.date.js
  49. 34
      src/widget/datepane/card.static.datepane.js
  50. 29
      src/widget/datetimepane/card.static.datetimepane.js
  51. 2
      src/widget/downlist/popup.downlist.js
  52. 58
      src/widget/dynamicdate/dynamicdate.card.js
  53. 6
      src/widget/multilayerselecttree/node/node.first.plus.js
  54. 6
      src/widget/multilayerselecttree/node/node.last.plus.js
  55. 6
      src/widget/multilayerselecttree/node/node.mid.plus.js
  56. 6
      src/widget/multilayersingletree/node/node.first.plus.js
  57. 6
      src/widget/multilayersingletree/node/node.last.plus.js
  58. 6
      src/widget/multilayersingletree/node/node.mid.plus.js
  59. 6
      src/widget/multilayersingletree/treeitem/item.first.treeleaf.js
  60. 6
      src/widget/multilayersingletree/treeitem/item.last.treeleaf.js
  61. 6
      src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js
  62. 4
      src/widget/selecttree/nodes/node.first.plus.js
  63. 4
      src/widget/selecttree/nodes/node.last.plus.js
  64. 4
      src/widget/selecttree/nodes/node.mid.plus.js
  65. 1
      src/widget/yearmonth/card.static.yearmonth.js
  66. 2
      src/widget/yearmonth/combo.yearmonth.js

86
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

8
dist/base.css vendored

@ -1,3 +1,7 @@
.bi-year-calendar {
padding-top: 5px;
padding-bottom: 5px;
}
.bi-color-chooser-popup .disable-mask {
opacity: 0.5;
filter: alpha(opacity=50);
@ -1935,6 +1939,10 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-popup-view .padding-outer {
padding-top: 5px;
padding-bottom: 5px;
}
.bi-popup-view .list-view-shadow {
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);

3
dist/base.js vendored

@ -15582,6 +15582,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
bgap: 0,
vgap: 0,
hgap: 0,
innerVGap: 0,
direction: BI.Direction.Top, // 工具栏的方向
stopEvent: false, // 是否停止mousedown、mouseup事件
stopPropagation: false, // 是否停止mousedown、mouseup向上冒泡
@ -15659,7 +15660,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
_createView: function () {
var o = this.options;
this.button_group = BI.createWidget(o.el, {type: "bi.button_group", value: o.value});
this.button_group.element.css({"min-height": o.minHeight + "px"});
this.button_group.element.css({"min-height": o.minHeight + "px", "padding-top": o.innerVGap + "px", "padding-bottom": o.innerVGap + "px"});
return this.button_group;
},

12
dist/bundle.css vendored

@ -1786,6 +1786,10 @@ textarea {
.bi-theme-dark .bi-input {
color: #ffffff;
}
.bi-year-calendar {
padding-top: 5px;
padding-bottom: 5px;
}
.bi-color-chooser-popup .disable-mask {
opacity: 0.5;
filter: alpha(opacity=50);
@ -3723,6 +3727,10 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-popup-view .padding-outer {
padding-top: 5px;
padding-bottom: 5px;
}
.bi-popup-view .list-view-shadow {
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
@ -3743,6 +3751,10 @@ ul.ztree.zTreeDragUL {
.bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element {
border-left: none;
}
.bi-date-calendar-popup .navigation-header {
padding-left: 10px;
padding-right: 10px;
}
.bi-date-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;

249
dist/bundle.js vendored

@ -51353,6 +51353,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
bgap: 0,
vgap: 0,
hgap: 0,
innerVGap: 0,
direction: BI.Direction.Top, // 工具栏的方向
stopEvent: false, // 是否停止mousedown、mouseup事件
stopPropagation: false, // 是否停止mousedown、mouseup向上冒泡
@ -51430,7 +51431,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
_createView: function () {
var o = this.options;
this.button_group = BI.createWidget(o.el, {type: "bi.button_group", value: o.value});
this.button_group.element.css({"min-height": o.minHeight + "px"});
this.button_group.element.css({"min-height": o.minHeight + "px", "padding-top": o.innerVGap + "px", "padding-bottom": o.innerVGap + "px"});
return this.button_group;
},
@ -74203,6 +74204,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
items = BI.map(items, function (i, item) {
return BI.map(item, function (j, td) {
var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
return BI.extend(td, {
type: "bi.text_item",
cls: "bi-list-item-select",
@ -74211,7 +74213,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
once: false,
forceSelected: true,
height: 24,
value: o.year + "-" + o.month + "-" + td.text,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled
// selected: td.currentDay
});
@ -74367,7 +74369,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
once: false,
forceSelected: true,
height: 24,
width: 38,
width: 45,
value: td.text,
disabled: td.disabled
});
@ -74589,8 +74591,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type2",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -74615,8 +74617,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type4",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -74641,8 +74643,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type3",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -74667,8 +74669,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type1",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -81381,7 +81383,7 @@ BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicBu
el: {
type: "bi.layout",
cls: "line-segment-button-line",
height: 3,
height: 2,
ref: function () {
self.line = this;
}
@ -88218,7 +88220,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
isNeedAdjustWidth: false,
el: this.trigger,
popup: {
minWidth: 85,
minWidth: 100,
stopPropagation: false,
el: this.popup
}
@ -88252,7 +88254,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-date-picker bi-background",
baseCls: "bi-date-picker",
height: 40,
min: "1900-01-01", // 最小日期
max: "2099-12-31" // 最大日期
@ -88408,7 +88410,7 @@ BI.YearPicker = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-year-picker bi-background",
baseCls: "bi-year-picker",
behaviors: {},
height: 40,
min: "1900-01-01", // 最小日期
@ -88567,7 +88569,6 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
this.calendar = BI.createWidget({
direction: "top",
element: this,
logic: {
dynamic: true
},
@ -88595,6 +88596,25 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
self.setValue(self.selectedTime);
self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: this.calendar,
left: 10,
right: 10
}, {
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
},
setValue: function (timeOb) {
@ -88763,7 +88783,10 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
type: "bi.center_adapt",
width: 50,
height: c.height,
items: [this.text, this.icon]
items: [{
el: this.text,
rgap: 10
}, this.icon]
}]
});
},
@ -88838,11 +88861,10 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
});
this.calendar = BI.createWidget({
direction: "top",
element: this,
logic: {
dynamic: false
},
direction: "custom",
// logic: {
// dynamic: false
// },
type: "bi.navigation",
tab: this.datePicker,
cardCreator: BI.bind(this._createNav, this)
@ -88855,6 +88877,31 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
});
this.setValue(o.selectedTime);
BI.createWidget({
type: "bi.vtape",
element: this,
items: [{
el: this.datePicker,
height: 40
}, this.calendar],
hgap: 10
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
},
_createNav: function (v) {
@ -89584,10 +89631,10 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
});
this.calendar = BI.createWidget({
direction: "top",
logic: {
dynamic: false
},
direction: "custom",
// logic: {
// dynamic: false
// },
type: "bi.navigation",
tab: this.datePicker,
cardCreator: BI.bind(this._createNav, this)
@ -89602,7 +89649,11 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
BI.createWidget({
type: "bi.vtape",
element: this,
items: [this.calendar, {
hgap: 10,
items: [{
el: this.datePicker,
height: 40
}, this.calendar, {
el: {
type: "bi.dynamic_date_time_select",
ref: function () {
@ -89619,6 +89670,21 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
height: 40
}]
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
this.setValue(o.selectedTime);
},
@ -90278,7 +90344,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}]
},
vgap: 5,
innerVGap: 5,
maxHeight: 378
};
item.el.childValues = [];
@ -90537,15 +90603,18 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 24,
height: 12,
lgap: 10
}
},
tgap: 10,
bgap: 5
}, {
type: "bi.button_group",
ref: function () {
self.checkgroup = this;
},
chooseType: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
lgap: 4,
value: [BI.DynamicDateCard.TYPE.YEAR],
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year"),
@ -90569,7 +90638,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
}
}),
layouts: [{
type: "bi.left"
type: "bi.left",
rgap: 4
}],
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
@ -90605,29 +90675,33 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
}]
}, {
type: "bi.vertical_adapt",
lgap: 2,
items: [{
type: "bi.multi_select_item",
ref: function () {
self.workDayBox = this;
},
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Work_Day"),
value: BI.DynamicDateCard.TYPE.WORK_DAY,
listeners: [{
eventName: BI.MultiSelectItem.EVENT_CHANGE,
action: function () {
if(this.isSelected()) {
self.checkgroup.setValue();
el: {
type: "bi.multi_select_item",
ref: function () {
self.workDayBox = this;
},
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Work_Day"),
value: BI.DynamicDateCard.TYPE.WORK_DAY,
listeners: [{
eventName: BI.MultiSelectItem.EVENT_CHANGE,
action: function () {
if(this.isSelected()) {
self.checkgroup.setValue();
}
self.resultPane.populate(this.isSelected() ? self._getParamJson([{
dateType: BI.DynamicDateCard.TYPE.WORK_DAY
}]) : []);
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");
}
self.resultPane.populate(this.isSelected() ? self._getParamJson([{
dateType: BI.DynamicDateCard.TYPE.WORK_DAY
}]) : []);
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");
}
}]
}]
},
bgap: 5
}],
ref: function () {
self.workDay = this;
@ -90642,7 +90716,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
},
layouts: [{
type: "bi.vertical",
vgap: 10,
bgap: 10,
hgap: 10
}]
}]
@ -95527,7 +95601,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -95559,7 +95633,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -95567,7 +95641,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -95621,7 +95695,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -95653,7 +95727,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -95661,7 +95735,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -95711,7 +95785,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -95743,7 +95817,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -95751,7 +95825,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96088,7 +96162,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -96122,7 +96196,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96130,7 +96204,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96172,7 +96246,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -96206,7 +96280,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96214,7 +96288,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96256,7 +96330,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -96290,7 +96364,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96298,7 +96372,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96340,7 +96414,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -96373,7 +96447,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96381,7 +96455,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96429,7 +96503,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -96462,7 +96536,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96470,7 +96544,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96518,7 +96592,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -96551,7 +96625,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96559,7 +96633,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -104752,7 +104826,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -104784,7 +104858,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({
@ -104836,7 +104910,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -104868,7 +104942,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({
@ -104920,7 +104994,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -104952,7 +105026,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({
@ -110292,6 +110366,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
}]
}, {
type: "bi.button_group",
cls: "bi-border-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;
@ -110413,7 +110488,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
isNeedAdjustWidth: false,
el: this.trigger,
popup: {
minWidth: 85,
minWidth: 100,
stopPropagation: false,
el: {
type: "bi.dynamic_year_month_popup",

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

70
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

23
dist/case.js vendored

@ -1703,6 +1703,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
items = BI.map(items, function (i, item) {
return BI.map(item, function (j, td) {
var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
return BI.extend(td, {
type: "bi.text_item",
cls: "bi-list-item-select",
@ -1711,7 +1712,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
once: false,
forceSelected: true,
height: 24,
value: o.year + "-" + o.month + "-" + td.text,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled
// selected: td.currentDay
});
@ -1867,7 +1868,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
once: false,
forceSelected: true,
height: 24,
width: 38,
width: 45,
value: td.text,
disabled: td.disabled
});
@ -2089,8 +2090,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type2",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -2115,8 +2116,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type4",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -2141,8 +2142,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type3",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -2167,8 +2168,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type1",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -8881,7 +8882,7 @@ BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicBu
el: {
type: "bi.layout",
cls: "line-segment-button-line",
height: 3,
height: 2,
ref: function () {
self.line = this;
}

12
dist/fineui.css vendored

@ -1786,6 +1786,10 @@ textarea {
.bi-theme-dark .bi-input {
color: #ffffff;
}
.bi-year-calendar {
padding-top: 5px;
padding-bottom: 5px;
}
.bi-color-chooser-popup .disable-mask {
opacity: 0.5;
filter: alpha(opacity=50);
@ -3723,6 +3727,10 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-popup-view .padding-outer {
padding-top: 5px;
padding-bottom: 5px;
}
.bi-popup-view .list-view-shadow {
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
@ -3743,6 +3751,10 @@ ul.ztree.zTreeDragUL {
.bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element {
border-left: none;
}
.bi-date-calendar-popup .navigation-header {
padding-left: 10px;
padding-right: 10px;
}
.bi-date-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;

249
dist/fineui.js vendored

@ -51602,6 +51602,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
bgap: 0,
vgap: 0,
hgap: 0,
innerVGap: 0,
direction: BI.Direction.Top, // 工具栏的方向
stopEvent: false, // 是否停止mousedown、mouseup事件
stopPropagation: false, // 是否停止mousedown、mouseup向上冒泡
@ -51679,7 +51680,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
_createView: function () {
var o = this.options;
this.button_group = BI.createWidget(o.el, {type: "bi.button_group", value: o.value});
this.button_group.element.css({"min-height": o.minHeight + "px"});
this.button_group.element.css({"min-height": o.minHeight + "px", "padding-top": o.innerVGap + "px", "padding-bottom": o.innerVGap + "px"});
return this.button_group;
},
@ -74452,6 +74453,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
items = BI.map(items, function (i, item) {
return BI.map(item, function (j, td) {
var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
return BI.extend(td, {
type: "bi.text_item",
cls: "bi-list-item-select",
@ -74460,7 +74462,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
once: false,
forceSelected: true,
height: 24,
value: o.year + "-" + o.month + "-" + td.text,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled
// selected: td.currentDay
});
@ -74616,7 +74618,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
once: false,
forceSelected: true,
height: 24,
width: 38,
width: 45,
value: td.text,
disabled: td.disabled
});
@ -74838,8 +74840,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type2",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -74864,8 +74866,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type4",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -74890,8 +74892,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type3",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -74916,8 +74918,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type1",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {
@ -81630,7 +81632,7 @@ BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicBu
el: {
type: "bi.layout",
cls: "line-segment-button-line",
height: 3,
height: 2,
ref: function () {
self.line = this;
}
@ -88467,7 +88469,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
isNeedAdjustWidth: false,
el: this.trigger,
popup: {
minWidth: 85,
minWidth: 100,
stopPropagation: false,
el: this.popup
}
@ -88501,7 +88503,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-date-picker bi-background",
baseCls: "bi-date-picker",
height: 40,
min: "1900-01-01", // 最小日期
max: "2099-12-31" // 最大日期
@ -88657,7 +88659,7 @@ BI.YearPicker = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-year-picker bi-background",
baseCls: "bi-year-picker",
behaviors: {},
height: 40,
min: "1900-01-01", // 最小日期
@ -88816,7 +88818,6 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
this.calendar = BI.createWidget({
direction: "top",
element: this,
logic: {
dynamic: true
},
@ -88844,6 +88845,25 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
self.setValue(self.selectedTime);
self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: this.calendar,
left: 10,
right: 10
}, {
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
},
setValue: function (timeOb) {
@ -89012,7 +89032,10 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
type: "bi.center_adapt",
width: 50,
height: c.height,
items: [this.text, this.icon]
items: [{
el: this.text,
rgap: 10
}, this.icon]
}]
});
},
@ -89087,11 +89110,10 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
});
this.calendar = BI.createWidget({
direction: "top",
element: this,
logic: {
dynamic: false
},
direction: "custom",
// logic: {
// dynamic: false
// },
type: "bi.navigation",
tab: this.datePicker,
cardCreator: BI.bind(this._createNav, this)
@ -89104,6 +89126,31 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
});
this.setValue(o.selectedTime);
BI.createWidget({
type: "bi.vtape",
element: this,
items: [{
el: this.datePicker,
height: 40
}, this.calendar],
hgap: 10
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
},
_createNav: function (v) {
@ -89833,10 +89880,10 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
});
this.calendar = BI.createWidget({
direction: "top",
logic: {
dynamic: false
},
direction: "custom",
// logic: {
// dynamic: false
// },
type: "bi.navigation",
tab: this.datePicker,
cardCreator: BI.bind(this._createNav, this)
@ -89851,7 +89898,11 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
BI.createWidget({
type: "bi.vtape",
element: this,
items: [this.calendar, {
hgap: 10,
items: [{
el: this.datePicker,
height: 40
}, this.calendar, {
el: {
type: "bi.dynamic_date_time_select",
ref: function () {
@ -89868,6 +89919,21 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
height: 40
}]
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
this.setValue(o.selectedTime);
},
@ -90527,7 +90593,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}]
},
vgap: 5,
innerVGap: 5,
maxHeight: 378
};
item.el.childValues = [];
@ -90786,15 +90852,18 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 24,
height: 12,
lgap: 10
}
},
tgap: 10,
bgap: 5
}, {
type: "bi.button_group",
ref: function () {
self.checkgroup = this;
},
chooseType: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
lgap: 4,
value: [BI.DynamicDateCard.TYPE.YEAR],
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year"),
@ -90818,7 +90887,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
}
}),
layouts: [{
type: "bi.left"
type: "bi.left",
rgap: 4
}],
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
@ -90854,29 +90924,33 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
}]
}, {
type: "bi.vertical_adapt",
lgap: 2,
items: [{
type: "bi.multi_select_item",
ref: function () {
self.workDayBox = this;
},
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Work_Day"),
value: BI.DynamicDateCard.TYPE.WORK_DAY,
listeners: [{
eventName: BI.MultiSelectItem.EVENT_CHANGE,
action: function () {
if(this.isSelected()) {
self.checkgroup.setValue();
el: {
type: "bi.multi_select_item",
ref: function () {
self.workDayBox = this;
},
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Work_Day"),
value: BI.DynamicDateCard.TYPE.WORK_DAY,
listeners: [{
eventName: BI.MultiSelectItem.EVENT_CHANGE,
action: function () {
if(this.isSelected()) {
self.checkgroup.setValue();
}
self.resultPane.populate(this.isSelected() ? self._getParamJson([{
dateType: BI.DynamicDateCard.TYPE.WORK_DAY
}]) : []);
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");
}
self.resultPane.populate(this.isSelected() ? self._getParamJson([{
dateType: BI.DynamicDateCard.TYPE.WORK_DAY
}]) : []);
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");
}
}]
}]
},
bgap: 5
}],
ref: function () {
self.workDay = this;
@ -90891,7 +90965,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
},
layouts: [{
type: "bi.vertical",
vgap: 10,
bgap: 10,
hgap: 10
}]
}]
@ -95776,7 +95850,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -95808,7 +95882,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -95816,7 +95890,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -95870,7 +95944,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -95902,7 +95976,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -95910,7 +95984,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -95960,7 +96034,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -95992,7 +96066,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96000,7 +96074,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96337,7 +96411,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -96371,7 +96445,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96379,7 +96453,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96421,7 +96495,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -96455,7 +96529,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96463,7 +96537,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96505,7 +96579,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -96539,7 +96613,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96547,7 +96621,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96589,7 +96663,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -96622,7 +96696,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96630,7 +96704,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96678,7 +96752,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -96711,7 +96785,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96719,7 +96793,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -96767,7 +96841,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -96800,7 +96874,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -96808,7 +96882,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -105001,7 +105075,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -105033,7 +105107,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({
@ -105085,7 +105159,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -105117,7 +105191,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({
@ -105169,7 +105243,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -105201,7 +105275,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({
@ -110541,6 +110615,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
}]
}, {
type: "bi.button_group",
cls: "bi-border-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;
@ -110662,7 +110737,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
isNeedAdjustWidth: false,
el: this.trigger,
popup: {
minWidth: 85,
minWidth: 100,
stopPropagation: false,
el: {
type: "bi.dynamic_year_month_popup",

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

86
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.css vendored

@ -1,3 +1,7 @@
.bi-date-calendar-popup .navigation-header {
padding-left: 10px;
padding-right: 10px;
}
.bi-date-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;

223
dist/widget.js vendored

@ -530,7 +530,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
isNeedAdjustWidth: false,
el: this.trigger,
popup: {
minWidth: 85,
minWidth: 100,
stopPropagation: false,
el: this.popup
}
@ -564,7 +564,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-date-picker bi-background",
baseCls: "bi-date-picker",
height: 40,
min: "1900-01-01", // 最小日期
max: "2099-12-31" // 最大日期
@ -720,7 +720,7 @@ BI.YearPicker = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-year-picker bi-background",
baseCls: "bi-year-picker",
behaviors: {},
height: 40,
min: "1900-01-01", // 最小日期
@ -879,7 +879,6 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
this.calendar = BI.createWidget({
direction: "top",
element: this,
logic: {
dynamic: true
},
@ -907,6 +906,25 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
self.setValue(self.selectedTime);
self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: this.calendar,
left: 10,
right: 10
}, {
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
},
setValue: function (timeOb) {
@ -1075,7 +1093,10 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
type: "bi.center_adapt",
width: 50,
height: c.height,
items: [this.text, this.icon]
items: [{
el: this.text,
rgap: 10
}, this.icon]
}]
});
},
@ -1150,11 +1171,10 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
});
this.calendar = BI.createWidget({
direction: "top",
element: this,
logic: {
dynamic: false
},
direction: "custom",
// logic: {
// dynamic: false
// },
type: "bi.navigation",
tab: this.datePicker,
cardCreator: BI.bind(this._createNav, this)
@ -1167,6 +1187,31 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
});
this.setValue(o.selectedTime);
BI.createWidget({
type: "bi.vtape",
element: this,
items: [{
el: this.datePicker,
height: 40
}, this.calendar],
hgap: 10
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
},
_createNav: function (v) {
@ -1896,10 +1941,10 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
});
this.calendar = BI.createWidget({
direction: "top",
logic: {
dynamic: false
},
direction: "custom",
// logic: {
// dynamic: false
// },
type: "bi.navigation",
tab: this.datePicker,
cardCreator: BI.bind(this._createNav, this)
@ -1914,7 +1959,11 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
BI.createWidget({
type: "bi.vtape",
element: this,
items: [this.calendar, {
hgap: 10,
items: [{
el: this.datePicker,
height: 40
}, this.calendar, {
el: {
type: "bi.dynamic_date_time_select",
ref: function () {
@ -1931,6 +1980,21 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
height: 40
}]
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
this.setValue(o.selectedTime);
},
@ -2590,7 +2654,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}]
},
vgap: 5,
innerVGap: 5,
maxHeight: 378
};
item.el.childValues = [];
@ -2849,15 +2913,18 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 24,
height: 12,
lgap: 10
}
},
tgap: 10,
bgap: 5
}, {
type: "bi.button_group",
ref: function () {
self.checkgroup = this;
},
chooseType: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
lgap: 4,
value: [BI.DynamicDateCard.TYPE.YEAR],
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year"),
@ -2881,7 +2948,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
}
}),
layouts: [{
type: "bi.left"
type: "bi.left",
rgap: 4
}],
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
@ -2917,29 +2985,33 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
}]
}, {
type: "bi.vertical_adapt",
lgap: 2,
items: [{
type: "bi.multi_select_item",
ref: function () {
self.workDayBox = this;
},
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Work_Day"),
value: BI.DynamicDateCard.TYPE.WORK_DAY,
listeners: [{
eventName: BI.MultiSelectItem.EVENT_CHANGE,
action: function () {
if(this.isSelected()) {
self.checkgroup.setValue();
el: {
type: "bi.multi_select_item",
ref: function () {
self.workDayBox = this;
},
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Work_Day"),
value: BI.DynamicDateCard.TYPE.WORK_DAY,
listeners: [{
eventName: BI.MultiSelectItem.EVENT_CHANGE,
action: function () {
if(this.isSelected()) {
self.checkgroup.setValue();
}
self.resultPane.populate(this.isSelected() ? self._getParamJson([{
dateType: BI.DynamicDateCard.TYPE.WORK_DAY
}]) : []);
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");
}
self.resultPane.populate(this.isSelected() ? self._getParamJson([{
dateType: BI.DynamicDateCard.TYPE.WORK_DAY
}]) : []);
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");
}
}]
}]
},
bgap: 5
}],
ref: function () {
self.workDay = this;
@ -2954,7 +3026,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
},
layouts: [{
type: "bi.vertical",
vgap: 10,
bgap: 10,
hgap: 10
}]
}]
@ -7839,7 +7911,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -7871,7 +7943,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -7879,7 +7951,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -7933,7 +8005,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -7965,7 +8037,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -7973,7 +8045,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -8023,7 +8095,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -8055,7 +8127,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -8063,7 +8135,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -8400,7 +8472,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -8434,7 +8506,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -8442,7 +8514,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -8484,7 +8556,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -8518,7 +8590,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -8526,7 +8598,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -8568,7 +8640,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -8602,7 +8674,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -8610,7 +8682,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -8652,7 +8724,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -8685,7 +8757,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -8693,7 +8765,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -8741,7 +8813,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -8774,7 +8846,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -8782,7 +8854,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -8830,7 +8902,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -8863,7 +8935,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -8871,7 +8943,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},
@ -17064,7 +17136,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -17096,7 +17168,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({
@ -17148,7 +17220,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -17180,7 +17252,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({
@ -17232,7 +17304,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -17264,7 +17336,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({
@ -22604,6 +22676,7 @@ BI.shortcut("bi.dynamic_year_month_card", BI.DynamicYearMonthCard);BI.StaticYear
}]
}, {
type: "bi.button_group",
cls: "bi-border-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;
@ -22725,7 +22798,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
isNeedAdjustWidth: false,
el: this.trigger,
popup: {
minWidth: 85,
minWidth: 100,
stopPropagation: false,
el: {
type: "bi.dynamic_year_month_popup",

3
src/base/layer/layer.popup.js

@ -17,6 +17,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
bgap: 0,
vgap: 0,
hgap: 0,
innerVGap: 0,
direction: BI.Direction.Top, // 工具栏的方向
stopEvent: false, // 是否停止mousedown、mouseup事件
stopPropagation: false, // 是否停止mousedown、mouseup向上冒泡
@ -94,7 +95,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
_createView: function () {
var o = this.options;
this.button_group = BI.createWidget(o.el, {type: "bi.button_group", value: o.value});
this.button_group.element.css({"min-height": o.minHeight + "px"});
this.button_group.element.css({"min-height": o.minHeight + "px", "padding-top": o.innerVGap + "px", "padding-bottom": o.innerVGap + "px"});
return this.button_group;
},

3
src/case/calendar/calendar.js

@ -102,6 +102,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
items = BI.map(items, function (i, item) {
return BI.map(item, function (j, td) {
var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
return BI.extend(td, {
type: "bi.text_item",
cls: "bi-list-item-select",
@ -110,7 +111,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
once: false,
forceSelected: true,
height: 24,
value: o.year + "-" + o.month + "-" + td.text,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled
// selected: td.currentDay
});

2
src/case/calendar/calendar.year.js

@ -65,7 +65,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
once: false,
forceSelected: true,
height: 24,
width: 38,
width: 45,
value: td.text,
disabled: td.disabled
});

4
src/case/checkbox/check.first.treenode.js

@ -7,8 +7,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type2",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {

4
src/case/checkbox/check.last.treenode.js

@ -7,8 +7,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type4",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {

4
src/case/checkbox/check.mid.treenode.js

@ -7,8 +7,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type3",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {

4
src/case/checkbox/check.treenode.js

@ -7,8 +7,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type1",
iconWidth: 25,
iconHeight: 25
iconWidth: 24,
iconHeight: 24
});
},
_init: function () {

2
src/case/linearsegment/button.linear.segment.js

@ -26,7 +26,7 @@ BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
el: {
type: "bi.layout",
cls: "line-segment-button-line",
height: 3,
height: 2,
ref: function () {
self.line = this;
}

4
src/css/base/calendar/calendar.css

@ -0,0 +1,4 @@
.bi-year-calendar {
padding-top: 5px;
padding-bottom: 5px;
}

4
src/css/base/view/popupview.css

@ -11,6 +11,10 @@
-moz-border-radius: 2px;
border-radius: 2px;
}
.bi-popup-view .padding-outer {
padding-top: 5px;
padding-bottom: 5px;
}
.bi-popup-view .list-view-shadow {
-webkit-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
-moz-box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);

4
src/css/widget/date/calendar/popup.css

@ -0,0 +1,4 @@
.bi-date-calendar-popup .navigation-header {
padding-left: 10px;
padding-right: 10px;
}

0
src/css/widget/dynamicdatecombo/dynamicdatepopup.css

0
src/css/widget/dynamicdatecombo/dynamicdatetimepopup.css

0
src/css/widget/yearmonth/popup.css

0
src/css/widget/yearquarter/popup.css

6
src/less/base/calendar/calendar.year.less

@ -0,0 +1,6 @@
@import "../../index";
.bi-year-calendar {
padding-top: 5px;
padding-bottom: 5px;
}

4
src/less/base/view/popupview.less

@ -10,6 +10,10 @@
& .list-view-outer {
.border-radius(2px);
}
& .padding-outer{
padding-top: 5px;
padding-bottom: 5px;
}
& .list-view-shadow {
.box-shadow(0 1px 5px 0, fade(@color-bi-background-black, 20));
}

5
src/less/widget/dynamicdatecombo/dynamicdatepopup.less

@ -0,0 +1,5 @@
@import "../../index";
.bi-dynamic-date-popup{
}

5
src/less/widget/dynamicdatecombo/dynamicdatetimepopup.less

@ -0,0 +1,5 @@
@import "../../index";
.bi-dynamic-date-time-popup{
}

5
src/less/widget/multidate/multidate.combo.less

@ -1,5 +0,0 @@
@import "../../index";
.bi-multidate-combo {
.border-radius(2px);
}

6
src/less/widget/multidate/multidate.day.less

@ -1,6 +0,0 @@
@import "../../index";
.bi-multidate-daycard{
& .bi-multidate-inner-label{
}
}

6
src/less/widget/multidate/multidate.month.less

@ -1,6 +0,0 @@
@import "../../index";
.bi-multidate-monthcard{
& .bi-multidate-inner-label{
}
}

23
src/less/widget/multidate/multidate.popup.less

@ -1,23 +0,0 @@
@import "../../index";
.bi-multidate-popup{
& .multidate-popup-label {
color:@color-bi-text-highlight;
font-size:@font-size-14;
}
& .multidate-popup-tab {
}
& .multidate-popup-item{
&:active,&.active{
background-color: @color-bi-text-highlight;
color: @color-bi-background-default;
.border-corner-radius(@radius-2,@radius-2,0,0);
}
}
& .multidate-popup-button{
color:@color-bi-text-highlight;
font-size:@font-size-14;
}
}

6
src/less/widget/multidate/multidate.quarter.less

@ -1,6 +0,0 @@
@import "../../index";
.bi-multidate-quartercard{
& .bi-multidate-inner-label{
}
}

9
src/less/widget/multidate/multidate.segment.less

@ -1,9 +0,0 @@
@import "../../index";
.bi-multidate-segment{
& .bi-multidate-normal-label{
}
& .bi-multidate-editor{
font-size: @font-size-14;
}
}

6
src/less/widget/multidate/multidate.week.less

@ -1,6 +0,0 @@
@import "../../index";
.bi-multidate-weekcard{
& .bi-multidate-inner-label{
}
}

6
src/less/widget/multidate/multidate.year.less

@ -1,6 +0,0 @@
@import "../../index";
.bi-multidate-yearcard{
& .bi-multidate-inner-label{
}
}

5
src/less/widget/yearmonth/popup.yearmonth.less

@ -0,0 +1,5 @@
@import "../../index";
.bi-year-month-popup{
}

5
src/less/widget/yearquarter/popup.yearquarter.less

@ -0,0 +1,5 @@
@import "../../index";
.bi-year-month-popup{
}

2
src/widget/date/calendar/combo.year.date.js

@ -45,7 +45,7 @@ BI.YearDateCombo = BI.inherit(BI.Trigger, {
isNeedAdjustWidth: false,
el: this.trigger,
popup: {
minWidth: 85,
minWidth: 100,
stopPropagation: false,
el: this.popup
}

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

@ -7,7 +7,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-date-picker bi-background",
baseCls: "bi-date-picker",
height: 40,
min: "1900-01-01", // 最小日期
max: "2099-12-31" // 最大日期

2
src/widget/date/calendar/picker.year.js

@ -7,7 +7,7 @@ BI.YearPicker = BI.inherit(BI.Widget, {
_defaultConfig: function () {
var conf = BI.YearPicker.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-year-picker bi-background",
baseCls: "bi-year-picker",
behaviors: {},
height: 40,
min: "1900-01-01", // 最小日期

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

@ -53,7 +53,6 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
this.calendar = BI.createWidget({
direction: "top",
element: this,
logic: {
dynamic: true
},
@ -81,6 +80,25 @@ BI.DateCalendarPopup = BI.inherit(BI.Widget, {
self.setValue(self.selectedTime);
self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: this.calendar,
left: 10,
right: 10
}, {
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
},
setValue: function (timeOb) {

5
src/widget/date/calendar/trigger.triangle.date.js

@ -42,7 +42,10 @@ BI.DateTriangleTrigger = BI.inherit(BI.Trigger, {
type: "bi.center_adapt",
width: 50,
height: c.height,
items: [this.text, this.icon]
items: [{
el: this.text,
rgap: 10
}, this.icon]
}]
});
},

34
src/widget/datepane/card.static.datepane.js

@ -48,11 +48,10 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
});
this.calendar = BI.createWidget({
direction: "top",
element: this,
logic: {
dynamic: false
},
direction: "custom",
// logic: {
// dynamic: false
// },
type: "bi.navigation",
tab: this.datePicker,
cardCreator: BI.bind(this._createNav, this)
@ -65,6 +64,31 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
});
this.setValue(o.selectedTime);
BI.createWidget({
type: "bi.vtape",
element: this,
items: [{
el: this.datePicker,
height: 40
}, this.calendar],
hgap: 10
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
},
_createNav: function (v) {

29
src/widget/datetimepane/card.static.datetimepane.js

@ -46,10 +46,10 @@ BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
});
this.calendar = BI.createWidget({
direction: "top",
logic: {
dynamic: false
},
direction: "custom",
// logic: {
// dynamic: false
// },
type: "bi.navigation",
tab: this.datePicker,
cardCreator: BI.bind(this._createNav, this)
@ -64,7 +64,11 @@ BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.vtape",
element: this,
items: [this.calendar, {
hgap: 10,
items: [{
el: this.datePicker,
height: 40
}, this.calendar, {
el: {
type: "bi.dynamic_date_time_select",
ref: function () {
@ -81,6 +85,21 @@ BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
height: 40
}]
});
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
el: {
type: "bi.layout",
cls: "bi-border-top"
},
height: 1,
top: 40,
left: 0,
right: 0
}]
});
this.setValue(o.selectedTime);
},

2
src/widget/downlist/popup.downlist.js

@ -106,7 +106,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}]
},
vgap: 5,
innerVGap: 5,
maxHeight: 378
};
item.el.childValues = [];

58
src/widget/dynamicdate/dynamicdate.card.js

@ -14,15 +14,18 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 24,
height: 12,
lgap: 10
}
},
tgap: 10,
bgap: 5
}, {
type: "bi.button_group",
ref: function () {
self.checkgroup = this;
},
chooseType: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
lgap: 4,
value: [BI.DynamicDateCard.TYPE.YEAR],
items: BI.createItems([{
text: BI.i18nText("BI-Basic_Year"),
@ -46,7 +49,8 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
}
}),
layouts: [{
type: "bi.left"
type: "bi.left",
rgap: 4
}],
listeners: [{
eventName: BI.ButtonGroup.EVENT_CHANGE,
@ -82,29 +86,33 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
}]
}, {
type: "bi.vertical_adapt",
lgap: 2,
items: [{
type: "bi.multi_select_item",
ref: function () {
self.workDayBox = this;
},
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Work_Day"),
value: BI.DynamicDateCard.TYPE.WORK_DAY,
listeners: [{
eventName: BI.MultiSelectItem.EVENT_CHANGE,
action: function () {
if(this.isSelected()) {
self.checkgroup.setValue();
el: {
type: "bi.multi_select_item",
ref: function () {
self.workDayBox = this;
},
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Work_Day"),
value: BI.DynamicDateCard.TYPE.WORK_DAY,
listeners: [{
eventName: BI.MultiSelectItem.EVENT_CHANGE,
action: function () {
if(this.isSelected()) {
self.checkgroup.setValue();
}
self.resultPane.populate(this.isSelected() ? self._getParamJson([{
dateType: BI.DynamicDateCard.TYPE.WORK_DAY
}]) : []);
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");
}
self.resultPane.populate(this.isSelected() ? self._getParamJson([{
dateType: BI.DynamicDateCard.TYPE.WORK_DAY
}]) : []);
self.position = BI.DynamicDateCard.OFFSET.CURRENT;
self.fireEvent("EVENT_CHANGE");
}
}]
}]
},
bgap: 5
}],
ref: function () {
self.workDay = this;
@ -119,7 +127,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
},
layouts: [{
type: "bi.vertical",
vgap: 10,
bgap: 10,
hgap: 10
}]
}]

6
src/widget/multilayerselecttree/node/node.first.plus.js

@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -47,7 +47,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -55,7 +55,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},

6
src/widget/multilayerselecttree/node/node.last.plus.js

@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -47,7 +47,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -55,7 +55,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},

6
src/widget/multilayerselecttree/node/node.mid.plus.js

@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -47,7 +47,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -55,7 +55,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},

6
src/widget/multilayersingletree/node/node.first.plus.js

@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -48,7 +48,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},

6
src/widget/multilayersingletree/node/node.last.plus.js

@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -48,7 +48,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},

6
src/widget/multilayersingletree/node/node.mid.plus.js

@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -48,7 +48,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},

6
src/widget/multilayersingletree/treeitem/item.first.treeleaf.js

@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -47,7 +47,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -55,7 +55,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},

6
src/widget/multilayersingletree/treeitem/item.last.treeleaf.js

@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -47,7 +47,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -55,7 +55,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},

6
src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js

@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
layer: 0,
id: "",
pId: "",
height: 25
height: 24
});
},
_init: function () {
@ -47,7 +47,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: "base-line-conn-background",
width: 13,
width: 12,
height: o.height
});
});
@ -55,7 +55,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 13),
columnSize: BI.makeArray(o.layer, 12),
items: [items]
});
},

4
src/widget/selecttree/nodes/node.first.plus.js

@ -16,7 +16,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -48,7 +48,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({

4
src/widget/selecttree/nodes/node.last.plus.js

@ -16,7 +16,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -48,7 +48,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({

4
src/widget/selecttree/nodes/node.mid.plus.js

@ -16,7 +16,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 25
height: 24
});
},
_init: function () {
@ -48,7 +48,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 25,
width: 24,
el: this.checkbox
}, this.text);
BI.createWidget(BI.extend({

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

@ -56,6 +56,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
}]
}, {
type: "bi.button_group",
cls: "bi-border-top",
behaviors: o.behaviors,
ref: function () {
self.month = this;

2
src/widget/yearmonth/combo.yearmonth.js

@ -60,7 +60,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
isNeedAdjustWidth: false,
el: this.trigger,
popup: {
minWidth: 85,
minWidth: 100,
stopPropagation: false,
el: {
type: "bi.dynamic_year_month_popup",

Loading…
Cancel
Save