caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #431 in FUI/fineui from ~WINDY/fui:master to master 

* commit '93b5d6fb3734f4ec16e975adc7fc0dced84d2155':
  节假日
  BI-23371
es6
guy 6 years ago
parent
74a6320a18 93b5d6fb37
commit
97ebf92f8a
12 changed files with 77 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      demo/js/case/combo/demo.icon_text_value_combo.js
  2. 42
      dist/_fineui.min.js
  3. 10
      dist/bundle.js
  4. 14
      dist/bundle.min.js
  5. 6
      dist/case.js
  6. 3
      dist/demo.js
  7. 10
      dist/fineui.js
  8. 42
      dist/fineui.min.js
  9. 4
      dist/widget.js
  10. 1
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  11. 5
      src/case/trigger/trigger.icon.text.select.js
  12. 4
      src/widget/dynamicdate/dynamicdate.caculate.js

3
demo/js/case/combo/demo.icon_text_value_combo.js
Unescape View File

@ -12,7 +12,8 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
items: [{
type: "bi.icon_text_value_combo",
text: "默认值",
value: 1,
// defaultIconCls: "next-page-h-font",
value: 23,
width: 300,
iconHeight: 16,
iconWidth: 16,

42
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/bundle.js vendored
Unescape View File

@ -78407,6 +78407,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
items: o.items,
height: o.height,
text: o.text,
iconCls: o.iconCls,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
@ -87330,7 +87331,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
baseCls: "bi-select-text-trigger bi-border",
height: 24,
iconHeight: null,
iconWidth: null
iconWidth: null,
iconCls: ""
});
},
@ -87373,7 +87375,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
} else {
return {
text: o.text,
iconCls: ""
iconCls: o.iconCls
};
}
},
@ -90400,11 +90402,11 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
}
if (BI.isNotNull(obj.workDay)) {
// 配置了节假日就按照节假日计算工作日偏移，否则按正常的天去算
if(BI.isNotNull(Date.holidays)) {
if(BI.isNotNull(BI.holidays)) {
var count = Math.abs(obj.workDay);
for (var i = 0; i < count; i++) {
date = date.getOffsetDate(obj.workDay < 0 ? -1 : 1);
if(BI.isNotNull(Date.holidays[date.print("%Y-%X-%d")])) {
if(BI.isNotNull(BI.holidays[date.print("%Y-%X-%d")])) {
i--;
}
}

14
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/case.js vendored
Unescape View File

@ -5918,6 +5918,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
items: o.items,
height: o.height,
text: o.text,
iconCls: o.iconCls,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
@ -14841,7 +14842,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
baseCls: "bi-select-text-trigger bi-border",
height: 24,
iconHeight: null,
iconWidth: null
iconWidth: null,
iconCls: ""
});
},
@ -14884,7 +14886,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
} else {
return {
text: o.text,
iconCls: ""
iconCls: o.iconCls
};
}
},

3
dist/demo.js vendored
Unescape View File

@ -2028,7 +2028,8 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
items: [{
type: "bi.icon_text_value_combo",
text: "默认值",
value: 1,
// defaultIconCls: "next-page-h-font",
value: 23,
width: 300,
iconHeight: 16,
iconWidth: 16,

10
dist/fineui.js vendored
Unescape View File

@ -78650,6 +78650,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
items: o.items,
height: o.height,
text: o.text,
iconCls: o.iconCls,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth
@ -87573,7 +87574,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
baseCls: "bi-select-text-trigger bi-border",
height: 24,
iconHeight: null,
iconWidth: null
iconWidth: null,
iconCls: ""
});
},
@ -87616,7 +87618,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
} else {
return {
text: o.text,
iconCls: ""
iconCls: o.iconCls
};
}
},
@ -90643,11 +90645,11 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
}
if (BI.isNotNull(obj.workDay)) {
// 配置了节假日就按照节假日计算工作日偏移，否则按正常的天去算
if(BI.isNotNull(Date.holidays)) {
if(BI.isNotNull(BI.holidays)) {
var count = Math.abs(obj.workDay);
for (var i = 0; i < count; i++) {
date = date.getOffsetDate(obj.workDay < 0 ? -1 : 1);
if(BI.isNotNull(Date.holidays[date.print("%Y-%X-%d")])) {
if(BI.isNotNull(BI.holidays[date.print("%Y-%X-%d")])) {
i--;
}
}

42
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored
Unescape View File

@ -2779,11 +2779,11 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
}
if (BI.isNotNull(obj.workDay)) {
// 配置了节假日就按照节假日计算工作日偏移，否则按正常的天去算
if(BI.isNotNull(Date.holidays)) {
if(BI.isNotNull(BI.holidays)) {
var count = Math.abs(obj.workDay);
for (var i = 0; i < count; i++) {
date = date.getOffsetDate(obj.workDay < 0 ? -1 : 1);
if(BI.isNotNull(Date.holidays[date.print("%Y-%X-%d")])) {
if(BI.isNotNull(BI.holidays[date.print("%Y-%X-%d")])) {
i--;
}
}

1
src/case/combo/icontextvaluecombo/combo.icontextvalue.js
Unescape View File

@ -21,6 +21,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
items: o.items,
height: o.height,
text: o.text,
iconCls: o.iconCls,
value: o.value,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth

5
src/case/trigger/trigger.icon.text.select.js
Unescape View File

@ -8,7 +8,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
baseCls: "bi-select-text-trigger bi-border",
height: 24,
iconHeight: null,
iconWidth: null
iconWidth: null,
iconCls: ""
});
},
@ -51,7 +52,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
} else {
return {
text: o.text,
iconCls: ""
iconCls: o.iconCls
};
}
},

4
src/widget/dynamicdate/dynamicdate.caculate.js
Unescape View File

@ -29,11 +29,11 @@
}
if (BI.isNotNull(obj.workDay)) {
// 配置了节假日就按照节假日计算工作日偏移，否则按正常的天去算
if(BI.isNotNull(Date.holidays)) {
if(BI.isNotNull(BI.holidays)) {
var count = Math.abs(obj.workDay);
for (var i = 0; i < count; i++) {
date = date.getOffsetDate(obj.workDay < 0 ? -1 : 1);
if(BI.isNotNull(Date.holidays[date.print("%Y-%X-%d")])) {
if(BI.isNotNull(BI.holidays[date.print("%Y-%X-%d")])) {
i--;
}
}

Write Preview
Loading…
Cancel
Save