Browse Source

DEC-4250 展开时点击小日历会闪一下

es6
windy 6 years ago
parent
commit
1a3742bbf8
  1. 32
      dist/bundle.js
  2. 30
      dist/bundle.min.js
  3. 32
      dist/fineui.js
  4. 30
      dist/fineui.min.js
  5. 32
      dist/fineui_without_jquery_polyfill.js
  6. 2
      dist/utils.min.js
  7. 32
      dist/widget.js
  8. 8
      src/widget/datetime/datetime.combo.js
  9. 11
      src/widget/dynamicdate/dynamicdate.combo.js
  10. 13
      src/widget/dynamicdatetime/dynamicdatetime.combo.js

32
dist/bundle.js vendored

@ -59628,6 +59628,10 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
el: this.popup, el: this.popup,
width: this.constants.popupWidth, width: this.constants.popupWidth,
stopPropagation: false stopPropagation: false
},
// DEC-4250 和复选下拉一样,点击不收起
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
@ -59641,9 +59645,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
width: 24, width: 24,
height: 24 height: 24
}); });
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { triggerBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
@ -61577,6 +61581,10 @@ BI.extend(BI.DynamicDateCard, {
}, },
stopPropagation: false stopPropagation: false
}, },
// DEC-4250 和复选下拉一样,点击triggerBtn不默认收起
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
},
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () { action: function () {
@ -61599,12 +61607,15 @@ BI.extend(BI.DynamicDateCard, {
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
} }
}] }],
ref: function () {
self.triggerBtn = this;
}
}, },
top: 0, top: 0,
right: 0 right: 0
@ -62474,7 +62485,11 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
self.popup.setValue(self.storeValue); self.popup.setValue(self.storeValue);
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW);
} }
}] }],
// DEC-4250 和复选下拉一样,点击不收起
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
}
}, },
top: 0, top: 0,
left: 0, left: 0,
@ -62490,12 +62505,15 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
} }
}] }],
ref: function () {
self.triggerBtn = this;
}
}, },
top: 0, top: 0,
right: 0 right: 0

30
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

32
dist/fineui.js vendored

@ -59870,6 +59870,10 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
el: this.popup, el: this.popup,
width: this.constants.popupWidth, width: this.constants.popupWidth,
stopPropagation: false stopPropagation: false
},
// DEC-4250 和复选下拉一样,点击不收起
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
@ -59883,9 +59887,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
width: 24, width: 24,
height: 24 height: 24
}); });
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { triggerBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
@ -61819,6 +61823,10 @@ BI.extend(BI.DynamicDateCard, {
}, },
stopPropagation: false stopPropagation: false
}, },
// DEC-4250 和复选下拉一样,点击triggerBtn不默认收起
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
},
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () { action: function () {
@ -61841,12 +61849,15 @@ BI.extend(BI.DynamicDateCard, {
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
} }
}] }],
ref: function () {
self.triggerBtn = this;
}
}, },
top: 0, top: 0,
right: 0 right: 0
@ -62716,7 +62727,11 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
self.popup.setValue(self.storeValue); self.popup.setValue(self.storeValue);
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW);
} }
}] }],
// DEC-4250 和复选下拉一样,点击不收起
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
}
}, },
top: 0, top: 0,
left: 0, left: 0,
@ -62732,12 +62747,15 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
} }
}] }],
ref: function () {
self.triggerBtn = this;
}
}, },
top: 0, top: 0,
right: 0 right: 0

30
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

32
dist/fineui_without_jquery_polyfill.js vendored

@ -42754,6 +42754,10 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
el: this.popup, el: this.popup,
width: this.constants.popupWidth, width: this.constants.popupWidth,
stopPropagation: false stopPropagation: false
},
// DEC-4250 和复选下拉一样,点击不收起
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
@ -42767,9 +42771,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
width: 24, width: 24,
height: 24 height: 24
}); });
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { triggerBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
@ -44703,6 +44707,10 @@ BI.extend(BI.DynamicDateCard, {
}, },
stopPropagation: false stopPropagation: false
}, },
// DEC-4250 和复选下拉一样,点击triggerBtn不默认收起
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
},
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () { action: function () {
@ -44725,12 +44733,15 @@ BI.extend(BI.DynamicDateCard, {
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
} }
}] }],
ref: function () {
self.triggerBtn = this;
}
}, },
top: 0, top: 0,
right: 0 right: 0
@ -45600,7 +45611,11 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
self.popup.setValue(self.storeValue); self.popup.setValue(self.storeValue);
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW);
} }
}] }],
// DEC-4250 和复选下拉一样,点击不收起
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
}
}, },
top: 0, top: 0,
left: 0, left: 0,
@ -45616,12 +45631,15 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
} }
}] }],
ref: function () {
self.triggerBtn = this;
}
}, },
top: 0, top: 0,
right: 0 right: 0

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

32
dist/widget.js vendored

@ -1084,6 +1084,10 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
el: this.popup, el: this.popup,
width: this.constants.popupWidth, width: this.constants.popupWidth,
stopPropagation: false stopPropagation: false
},
// DEC-4250 和复选下拉一样,点击不收起
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
@ -1097,9 +1101,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
width: 24, width: 24,
height: 24 height: 24
}); });
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { triggerBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
@ -3033,6 +3037,10 @@ BI.extend(BI.DynamicDateCard, {
}, },
stopPropagation: false stopPropagation: false
}, },
// DEC-4250 和复选下拉一样,点击triggerBtn不默认收起
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
},
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () { action: function () {
@ -3055,12 +3063,15 @@ BI.extend(BI.DynamicDateCard, {
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
} }
}] }],
ref: function () {
self.triggerBtn = this;
}
}, },
top: 0, top: 0,
right: 0 right: 0
@ -3930,7 +3941,11 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
self.popup.setValue(self.storeValue); self.popup.setValue(self.storeValue);
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW);
} }
}] }],
// DEC-4250 和复选下拉一样,点击不收起
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
}
}, },
top: 0, top: 0,
left: 0, left: 0,
@ -3946,12 +3961,15 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
} }
}] }],
ref: function () {
self.triggerBtn = this;
}
}, },
top: 0, top: 0,
right: 0 right: 0

8
src/widget/datetime/datetime.combo.js

@ -68,6 +68,10 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
el: this.popup, el: this.popup,
width: this.constants.popupWidth, width: this.constants.popupWidth,
stopPropagation: false stopPropagation: false
},
// DEC-4250 和复选下拉一样,点击不收起
hideChecker: function (e) {
return triggerBtn.element.find(e.target).length === 0;
} }
}); });
this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
@ -81,9 +85,9 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
width: 24, width: 24,
height: 24 height: 24
}); });
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { triggerBtn.on(BI.IconButton.EVENT_CHANGE, function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }

11
src/widget/dynamicdate/dynamicdate.combo.js

@ -177,6 +177,10 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
}, },
stopPropagation: false stopPropagation: false
}, },
// DEC-4250 和复选下拉一样,点击triggerBtn不默认收起
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
},
listeners: [{ listeners: [{
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: function () { action: function () {
@ -199,12 +203,15 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
} }
}] }],
ref: function () {
self.triggerBtn = this;
}
}, },
top: 0, top: 0,
right: 0 right: 0

13
src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -186,7 +186,11 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
self.popup.setValue(self.storeValue); self.popup.setValue(self.storeValue);
self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW);
} }
}] }],
// DEC-4250 和复选下拉一样,点击不收起
hideChecker: function (e) {
return self.triggerBtn.element.find(e.target).length === 0;
}
}, },
top: 0, top: 0,
left: 0, left: 0,
@ -202,12 +206,15 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
if (self.combo.isViewVisible()) { if (self.combo.isViewVisible()) {
self.combo.hideView(); // self.combo.hideView();
} else { } else {
self.combo.showView(); self.combo.showView();
} }
} }
}] }],
ref: function () {
self.triggerBtn = this;
}
}, },
top: 0, top: 0,
right: 0 right: 0

Loading…
Cancel
Save