fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' into bugfix/BI-17502

es6
iapyang 7 years ago
parent
cf7f4c4ba2 7ef854f28b
commit
32c05a4d5b
6 changed files with 47 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      dist/_fineui.min.js
  2. 11
      dist/bundle.js
  3. 6
      dist/bundle.min.js
  4. 26
      dist/fineui.min.js
  5. 11
      dist/widget.js
  6. 11
      src/widget/dynamicdate/dynamicdate.caculate.js

26
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/bundle.js vendored
Unescape View File

@ -89576,19 +89576,20 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
date = BI.getDate((date.getFullYear() + BI.parseInt(obj.year)), date.getMonth(), date.getDate()); date = BI.getDate((date.getFullYear() + BI.parseInt(obj.year)), date.getMonth(), date.getDate());
} }
if (BI.isNotNull(obj.quarter)) { if (BI.isNotNull(obj.quarter)) {
date = date.getAfterMulQuarter(obj.quarter); date = date.getAfterMulQuarter(BI.parseInt(obj.quarter));
} }
if (BI.isNotNull(obj.month)) { if (BI.isNotNull(obj.month)) {
date = date.getAfterMultiMonth(obj.month); date = date.getAfterMultiMonth(BI.parseInt(obj.month));
} }
if (BI.isNotNull(obj.week)) { if (BI.isNotNull(obj.week)) {
date = date.getOffsetDate(obj.week * 7); date = date.getOffsetDate(BI.parseInt(obj.week) * 7);
} }
if (BI.isNotNull(obj.day)) { if (BI.isNotNull(obj.day)) {
date = date.getOffsetDate(obj.day); date = date.getOffsetDate(BI.parseInt(obj.day));
} }
if (BI.isNotNull(obj.workDay)) { if (BI.isNotNull(obj.workDay)) {
// todo 根据工作日做偏移 // todo 根据工作日做偏移 暂时按天偏移
date = date.getOffsetDate(BI.parseInt(obj.workDay));
} }
if (BI.isNotNull(obj.position) && obj.position !== BI.DynamicDateCard.OFFSET.CURRENT) { if (BI.isNotNull(obj.position) && obj.position !== BI.DynamicDateCard.OFFSET.CURRENT) {
date = this.getBeginDate(date, obj); date = this.getBeginDate(date, obj);

6
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

26
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/widget.js vendored
Unescape View File

@ -3065,19 +3065,20 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
date = BI.getDate((date.getFullYear() + BI.parseInt(obj.year)), date.getMonth(), date.getDate()); date = BI.getDate((date.getFullYear() + BI.parseInt(obj.year)), date.getMonth(), date.getDate());
} }
if (BI.isNotNull(obj.quarter)) { if (BI.isNotNull(obj.quarter)) {
date = date.getAfterMulQuarter(obj.quarter); date = date.getAfterMulQuarter(BI.parseInt(obj.quarter));
} }
if (BI.isNotNull(obj.month)) { if (BI.isNotNull(obj.month)) {
date = date.getAfterMultiMonth(obj.month); date = date.getAfterMultiMonth(BI.parseInt(obj.month));
} }
if (BI.isNotNull(obj.week)) { if (BI.isNotNull(obj.week)) {
date = date.getOffsetDate(obj.week * 7); date = date.getOffsetDate(BI.parseInt(obj.week) * 7);
} }
if (BI.isNotNull(obj.day)) { if (BI.isNotNull(obj.day)) {
date = date.getOffsetDate(obj.day); date = date.getOffsetDate(BI.parseInt(obj.day));
} }
if (BI.isNotNull(obj.workDay)) { if (BI.isNotNull(obj.workDay)) {
// todo 根据工作日做偏移 // todo 根据工作日做偏移 暂时按天偏移
date = date.getOffsetDate(BI.parseInt(obj.workDay));
} }
if (BI.isNotNull(obj.position) && obj.position !== BI.DynamicDateCard.OFFSET.CURRENT) { if (BI.isNotNull(obj.position) && obj.position !== BI.DynamicDateCard.OFFSET.CURRENT) {
date = this.getBeginDate(date, obj); date = this.getBeginDate(date, obj);

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

@ -11,19 +11,20 @@
date = BI.getDate((date.getFullYear() + BI.parseInt(obj.year)), date.getMonth(), date.getDate()); date = BI.getDate((date.getFullYear() + BI.parseInt(obj.year)), date.getMonth(), date.getDate());
} }
if (BI.isNotNull(obj.quarter)) { if (BI.isNotNull(obj.quarter)) {
date = date.getAfterMulQuarter(obj.quarter); date = date.getAfterMulQuarter(BI.parseInt(obj.quarter));
} }
if (BI.isNotNull(obj.month)) { if (BI.isNotNull(obj.month)) {
date = date.getAfterMultiMonth(obj.month); date = date.getAfterMultiMonth(BI.parseInt(obj.month));
} }
if (BI.isNotNull(obj.week)) { if (BI.isNotNull(obj.week)) {
date = date.getOffsetDate(obj.week * 7); date = date.getOffsetDate(BI.parseInt(obj.week) * 7);
} }
if (BI.isNotNull(obj.day)) { if (BI.isNotNull(obj.day)) {
date = date.getOffsetDate(obj.day); date = date.getOffsetDate(BI.parseInt(obj.day));
} }
if (BI.isNotNull(obj.workDay)) { if (BI.isNotNull(obj.workDay)) {
// todo 根据工作日做偏移 // todo 根据工作日做偏移 暂时按天偏移
date = date.getOffsetDate(BI.parseInt(obj.workDay));
} }
if (BI.isNotNull(obj.position) && obj.position !== BI.DynamicDateCard.OFFSET.CURRENT) { if (BI.isNotNull(obj.position) && obj.position !== BI.DynamicDateCard.OFFSET.CURRENT) {
date = this.getBeginDate(date, obj); date = this.getBeginDate(date, obj);

Write Preview
Loading…
Cancel
Save