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

Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~austin.duan/new-decision-fineui into release/11.0

research/test
Austin.Duan 3 years ago
parent
21e662b905 e6d27bba6a
commit
3258371d12
1 changed files with 6 additions and 2 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. 8
      src/widget/dynamicdatetime/dynamicdatetime.combo.js

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

@ -32,6 +32,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
var date = BI.getDate(); var date = BI.getDate();
this.storeValue = opts.value; this.storeValue = opts.value;
var border = opts.simple ? 1 : 2; var border = opts.simple ? 1 : 2;
var errorState = false;
return { return {
type: "bi.absolute", type: "bi.absolute",
@ -120,6 +121,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
} }
}; };
self.combo.element.addClass("error"); self.combo.element.addClass("error");
errorState = true;
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR);
} }
}, { }, {
@ -139,10 +141,11 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
action: function () { action: function () {
var dateStore = self.storeTriggerValue; var dateStore = self.storeTriggerValue;
var dateObj = self.trigger.getKey(); var dateObj = self.trigger.getKey();
if (self.combo.isViewVisible() || BI.isEqual(dateObj, dateStore)) { if (self.combo.isViewVisible() || BI.isEqual(dateObj, dateStore) && !errorState) {
return; return;
} }
if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) { if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)
|| BI.isEqual(dateObj, dateStore) && errorState) {
self.storeValue = self.trigger.getValue(); self.storeValue = self.trigger.getValue();
self.setValue(self.trigger.getValue()); self.setValue(self.trigger.getValue());
} else if (BI.isEmptyString(dateObj)) { } else if (BI.isEmptyString(dateObj)) {
@ -151,6 +154,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
} }
self._checkDynamicValue(self.storeValue); self._checkDynamicValue(self.storeValue);
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM);
errorState = false;
} }
}] }]
}] }]

Write Preview
Loading…
Cancel
Save