Browse Source

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

* commit 'd7c3ba974350144ce50b1bab6f4f3ce8088d3ffe':
  BI-39187 格式统一
master
windy 6 years ago
parent
commit
1de5f8e2cb
  1. 12
      dist/bundle.ie.js
  2. 4
      dist/bundle.ie.min.js
  3. 12
      dist/bundle.js
  4. 4
      dist/bundle.min.js
  5. 12
      dist/fineui.ie.js
  6. 4
      dist/fineui.ie.min.js
  7. 12
      dist/fineui.js
  8. 4
      dist/fineui.min.js
  9. 12
      dist/fineui_without_jquery_polyfill.js
  10. 2
      dist/utils.min.js
  11. 12
      dist/widget.js
  12. 6
      src/widget/dynamicdate/dynamicdate.popup.js
  13. 4
      src/widget/dynamicdate/dynamicdate.trigger.js
  14. 2
      src/widget/dynamicdatetime/dynamicdatetime.popup.js

12
dist/bundle.ie.js vendored

@ -62325,13 +62325,13 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
tabHeight: 30,
buttonHeight: 24
},
props: {
baseCls: "bi-dynamic-date-popup",
width: 248,
height: 344
},
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options, c = this.constants;
@ -62486,7 +62486,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}
@ -62593,7 +62593,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
var text = self._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = BI.print(date, "%Y-%x-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
@ -62703,7 +62703,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
},
_setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%X-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
},
@ -63278,7 +63278,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}

4
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/bundle.js vendored

@ -62729,13 +62729,13 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
tabHeight: 30,
buttonHeight: 24
},
props: {
baseCls: "bi-dynamic-date-popup",
width: 248,
height: 344
},
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options, c = this.constants;
@ -62890,7 +62890,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}
@ -62997,7 +62997,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
var text = self._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = BI.print(date, "%Y-%x-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
@ -63107,7 +63107,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
},
_setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%X-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
},
@ -63682,7 +63682,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/fineui.ie.js vendored

@ -62570,13 +62570,13 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
tabHeight: 30,
buttonHeight: 24
},
props: {
baseCls: "bi-dynamic-date-popup",
width: 248,
height: 344
},
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options, c = this.constants;
@ -62731,7 +62731,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}
@ -62838,7 +62838,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
var text = self._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = BI.print(date, "%Y-%x-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
@ -62948,7 +62948,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
},
_setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%X-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
},
@ -63523,7 +63523,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/fineui.js vendored

@ -62974,13 +62974,13 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
tabHeight: 30,
buttonHeight: 24
},
props: {
baseCls: "bi-dynamic-date-popup",
width: 248,
height: 344
},
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options, c = this.constants;
@ -63135,7 +63135,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}
@ -63242,7 +63242,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
var text = self._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = BI.print(date, "%Y-%x-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
@ -63352,7 +63352,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
},
_setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%X-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
},
@ -63927,7 +63927,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/fineui_without_jquery_polyfill.js vendored

@ -45785,13 +45785,13 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
tabHeight: 30,
buttonHeight: 24
},
props: {
baseCls: "bi-dynamic-date-popup",
width: 248,
height: 344
},
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options, c = this.constants;
@ -45946,7 +45946,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}
@ -46053,7 +46053,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
var text = self._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = BI.print(date, "%Y-%x-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
@ -46163,7 +46163,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
},
_setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%X-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
},
@ -46738,7 +46738,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/widget.js vendored

@ -3273,13 +3273,13 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
tabHeight: 30,
buttonHeight: 24
},
props: {
baseCls: "bi-dynamic-date-popup",
width: 248,
height: 344
},
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options, c = this.constants;
@ -3434,7 +3434,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}
@ -3541,7 +3541,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
var text = self._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = BI.print(date, "%Y-%x-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
@ -3651,7 +3651,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
},
_setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%X-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
},
@ -4226,7 +4226,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}

6
src/widget/dynamicdate/dynamicdate.popup.js

@ -3,13 +3,13 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
tabHeight: 30,
buttonHeight: 24
},
props: {
baseCls: "bi-dynamic-date-popup",
width: 248,
height: 344
},
_init: function () {
BI.DynamicDatePopup.superclass._init.apply(this, arguments);
var self = this, opts = this.options, c = this.constants;
@ -164,7 +164,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}

4
src/widget/dynamicdate/dynamicdate.trigger.js

@ -52,7 +52,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
var text = self._getText(value);
var date = BI.getDate();
date = BI.DynamicDateHelper.getCalculation(value);
var dateStr = BI.print(date, "%Y-%x-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
return BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr);
case BI.DynamicDateCombo.Static:
default:
@ -162,7 +162,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
},
_setInnerValue: function (date) {
var dateStr = BI.print(date, "%Y-%X-%e");
var dateStr = BI.print(date, "%Y-%X-%d");
this.editor.setState(dateStr);
this.editor.setValue(dateStr);
},

2
src/widget/dynamicdatetime/dynamicdatetime.popup.js

@ -176,7 +176,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
this.textButton.setEnable(true);
} else {
var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
date = BI.print(date, "%Y-%x-%e");
date = BI.print(date, "%Y-%X-%d");
this.textButton.setValue(date);
this.textButton.setEnable(false);
}

Loading…
Cancel
Save