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

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

* commit '5a2e53cfd83e00255c6dc23e0d68092ff784f299':
  BI-19454
es6
guy 7 years ago
parent
72a3b0ce7b 5a2e53cfd8
commit
9ca22c6e8a
8 changed files with 139 additions and 91 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. 38
      dist/bundle.js
  3. 26
      dist/bundle.min.js
  4. 38
      dist/fineui.js
  5. 26
      dist/fineui.min.js
  6. 38
      dist/widget.js
  7. 16
      src/widget/dynamicdate/dynamicdate.combo.js
  8. 22
      src/widget/dynamicdatetime/dynamicdatetime.combo.js

26
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

38
dist/bundle.js vendored
Unescape View File

@ -90644,8 +90644,11 @@ BI.extend(BI.DynamicDateCard, {
eventName: BI.DynamicDateTrigger.EVENT_ERROR, eventName: BI.DynamicDateTrigger.EVENT_ERROR,
action: function () { action: function () {
self.storeValue = { self.storeValue = {
year: date.getFullYear(), type: BI.DynamicDateCombo.Static,
month: date.getMonth() + 1 value: {
year: date.getFullYear(),
month: date.getMonth() + 1
}
}; };
self.fireEvent(BI.DynamicDateCombo.EVENT_ERROR); self.fireEvent(BI.DynamicDateCombo.EVENT_ERROR);
} }
@ -90701,9 +90704,12 @@ BI.extend(BI.DynamicDateCard, {
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({ self.setValue({
year: date.getFullYear(), type: BI.DynamicDateCombo.Static,
month: date.getMonth() + 1, value: {
day: date.getDate() year: date.getFullYear(),
month: date.getMonth() + 1,
day: date.getDate()
}
}); });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
@ -91493,8 +91499,11 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
eventName: BI.DynamicDateTimeTrigger.EVENT_ERROR, eventName: BI.DynamicDateTimeTrigger.EVENT_ERROR,
action: function () { action: function () {
self.storeValue = { self.storeValue = {
year: date.getFullYear(), type: BI.DynamicDateTimeCombo.Static,
month: date.getMonth() + 1 value: {
year: date.getFullYear(),
month: date.getMonth() + 1
}
}; };
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR);
} }
@ -91550,12 +91559,15 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({ self.setValue({
year: date.getFullYear(), type: BI.DynamicDateTimeCombo.Static,
month: date.getMonth() + 1, value: {
day: date.getDate(), year: date.getFullYear(),
hour: 0, month: date.getMonth() + 1,
minute: 0, day: date.getDate(),
second: 0 hour: 0,
minute: 0,
second: 0
}
}); });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM);

26
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

38
dist/fineui.js vendored
Unescape View File

@ -90887,8 +90887,11 @@ BI.extend(BI.DynamicDateCard, {
eventName: BI.DynamicDateTrigger.EVENT_ERROR, eventName: BI.DynamicDateTrigger.EVENT_ERROR,
action: function () { action: function () {
self.storeValue = { self.storeValue = {
year: date.getFullYear(), type: BI.DynamicDateCombo.Static,
month: date.getMonth() + 1 value: {
year: date.getFullYear(),
month: date.getMonth() + 1
}
}; };
self.fireEvent(BI.DynamicDateCombo.EVENT_ERROR); self.fireEvent(BI.DynamicDateCombo.EVENT_ERROR);
} }
@ -90944,9 +90947,12 @@ BI.extend(BI.DynamicDateCard, {
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({ self.setValue({
year: date.getFullYear(), type: BI.DynamicDateCombo.Static,
month: date.getMonth() + 1, value: {
day: date.getDate() year: date.getFullYear(),
month: date.getMonth() + 1,
day: date.getDate()
}
}); });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
@ -91736,8 +91742,11 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
eventName: BI.DynamicDateTimeTrigger.EVENT_ERROR, eventName: BI.DynamicDateTimeTrigger.EVENT_ERROR,
action: function () { action: function () {
self.storeValue = { self.storeValue = {
year: date.getFullYear(), type: BI.DynamicDateTimeCombo.Static,
month: date.getMonth() + 1 value: {
year: date.getFullYear(),
month: date.getMonth() + 1
}
}; };
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR);
} }
@ -91793,12 +91802,15 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({ self.setValue({
year: date.getFullYear(), type: BI.DynamicDateTimeCombo.Static,
month: date.getMonth() + 1, value: {
day: date.getDate(), year: date.getFullYear(),
hour: 0, month: date.getMonth() + 1,
minute: 0, day: date.getDate(),
second: 0 hour: 0,
minute: 0,
second: 0
}
}); });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM);

26
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

38
dist/widget.js vendored
Unescape View File

@ -3177,8 +3177,11 @@ BI.extend(BI.DynamicDateCard, {
eventName: BI.DynamicDateTrigger.EVENT_ERROR, eventName: BI.DynamicDateTrigger.EVENT_ERROR,
action: function () { action: function () {
self.storeValue = { self.storeValue = {
year: date.getFullYear(), type: BI.DynamicDateCombo.Static,
month: date.getMonth() + 1 value: {
year: date.getFullYear(),
month: date.getMonth() + 1
}
}; };
self.fireEvent(BI.DynamicDateCombo.EVENT_ERROR); self.fireEvent(BI.DynamicDateCombo.EVENT_ERROR);
} }
@ -3234,9 +3237,12 @@ BI.extend(BI.DynamicDateCard, {
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({ self.setValue({
year: date.getFullYear(), type: BI.DynamicDateCombo.Static,
month: date.getMonth() + 1, value: {
day: date.getDate() year: date.getFullYear(),
month: date.getMonth() + 1,
day: date.getDate()
}
}); });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
@ -4026,8 +4032,11 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
eventName: BI.DynamicDateTimeTrigger.EVENT_ERROR, eventName: BI.DynamicDateTimeTrigger.EVENT_ERROR,
action: function () { action: function () {
self.storeValue = { self.storeValue = {
year: date.getFullYear(), type: BI.DynamicDateTimeCombo.Static,
month: date.getMonth() + 1 value: {
year: date.getFullYear(),
month: date.getMonth() + 1
}
}; };
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR);
} }
@ -4083,12 +4092,15 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({ self.setValue({
year: date.getFullYear(), type: BI.DynamicDateTimeCombo.Static,
month: date.getMonth() + 1, value: {
day: date.getDate(), year: date.getFullYear(),
hour: 0, month: date.getMonth() + 1,
minute: 0, day: date.getDate(),
second: 0 hour: 0,
minute: 0,
second: 0
}
}); });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM);

16
src/widget/dynamicdate/dynamicdate.combo.js
Unescape View File

@ -83,8 +83,11 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
eventName: BI.DynamicDateTrigger.EVENT_ERROR, eventName: BI.DynamicDateTrigger.EVENT_ERROR,
action: function () { action: function () {
self.storeValue = { self.storeValue = {
year: date.getFullYear(), type: BI.DynamicDateCombo.Static,
month: date.getMonth() + 1 value: {
year: date.getFullYear(),
month: date.getMonth() + 1
}
}; };
self.fireEvent(BI.DynamicDateCombo.EVENT_ERROR); self.fireEvent(BI.DynamicDateCombo.EVENT_ERROR);
} }
@ -140,9 +143,12 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({ self.setValue({
year: date.getFullYear(), type: BI.DynamicDateCombo.Static,
month: date.getMonth() + 1, value: {
day: date.getDate() year: date.getFullYear(),
month: date.getMonth() + 1,
day: date.getDate()
}
}); });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);

22
src/widget/dynamicdatetime/dynamicdatetime.combo.js
Unescape View File

@ -83,8 +83,11 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
eventName: BI.DynamicDateTimeTrigger.EVENT_ERROR, eventName: BI.DynamicDateTimeTrigger.EVENT_ERROR,
action: function () { action: function () {
self.storeValue = { self.storeValue = {
year: date.getFullYear(), type: BI.DynamicDateTimeCombo.Static,
month: date.getMonth() + 1 value: {
year: date.getFullYear(),
month: date.getMonth() + 1
}
}; };
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR);
} }
@ -140,12 +143,15 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
action: function () { action: function () {
var date = BI.getDate(); var date = BI.getDate();
self.setValue({ self.setValue({
year: date.getFullYear(), type: BI.DynamicDateTimeCombo.Static,
month: date.getMonth() + 1, value: {
day: date.getDate(), year: date.getFullYear(),
hour: 0, month: date.getMonth() + 1,
minute: 0, day: date.getDate(),
second: 0 hour: 0,
minute: 0,
second: 0
}
}); });
self.combo.hideView(); self.combo.hideView();
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM);

Write Preview
Loading…
Cancel
Save