Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 3 years ago
parent
commit
a5b8c254f3
  1. 2
      package.json
  2. 7
      src/widget/dynamicdatetime/dynamicdatetime.popup.js

2
package.json

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20211013185141",
"version": "2.0.20211015102301",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

7
src/widget/dynamicdatetime/dynamicdatetime.popup.js

@ -59,7 +59,12 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
listeners: [{
eventName: BI.TextButton.EVENT_CHANGE,
action: function () {
self.fireEvent(BI.DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE);
var type = self.dateTab.getSelect();
if (type === BI.DynamicDateCombo.Dynamic) {
self.dynamicPane.checkValidation(true) && self.fireEvent(BI.DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE);
} else {
self.fireEvent(BI.DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE)
}
}
}]
}]],

Loading…
Cancel
Save