Browse Source

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

* commit '1a3742bbf8bdf19a3ca7e0b83d8e599759d646f3':
  DEC-4250 展开时点击小日历会闪一下
  update
  无JIRA方式 零散的边框导致边框高亮缺一边
es6
windy 6 years ago
parent
commit
f8f72d1a86
  1. 44
      dist/bundle.js
  2. 30
      dist/bundle.min.js
  3. 44
      dist/fineui.js
  4. 30
      dist/fineui.min.js
  5. 44
      dist/fineui_without_jquery_polyfill.js
  6. 2
      dist/utils.min.js
  7. 44
      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
  11. 12
      src/widget/numberinterval/numberinterval.js

44
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
@ -71899,7 +71917,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
return true; return true;
}, },
cls: "number-interval-small-editor bi-border-top bi-border-bottom bi-border-left" cls: "number-interval-small-editor bi-border"
}); });
this.smallTip = BI.createWidget({ this.smallTip = BI.createWidget({
@ -71936,7 +71954,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
return true; return true;
}, },
cls: "number-interval-big-editor bi-border-top bi-border-bottom bi-border-right" cls: "number-interval-big-editor bi-border"
}); });
this.bigTip = BI.createWidget({ this.bigTip = BI.createWidget({
@ -71972,7 +71990,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
// }); // });
this.smallCombo = BI.createWidget({ this.smallCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-small-combo bi-border", cls: "number-interval-small-combo bi-border-top bi-border-bottom bi-border-right",
height: o.height - 2, height: o.height - 2,
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -71991,7 +72009,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
this.bigCombo = BI.createWidget({ this.bigCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-big-combo bi-border", cls: "number-interval-big-combo bi-border-top bi-border-bottom bi-border-left",
height: o.height - 2, height: o.height - 2,
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -72023,7 +72041,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
el: self.smallEditor el: self.smallEditor
}, { }, {
el: self.smallCombo, el: self.smallCombo,
width: c.width - c.border * 2 width: c.width - c.border
}] }]
}); });
@ -72031,7 +72049,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
type: "bi.htape", type: "bi.htape",
items: [{ items: [{
el: self.bigCombo, el: self.bigCombo,
width: c.width - c.border * 2 width: c.width - c.border
}, { }, {
el: self.bigEditor, el: self.bigEditor,
// BI-23883 间距考虑边框 // BI-23883 间距考虑边框

30
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

44
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
@ -72141,7 +72159,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
return true; return true;
}, },
cls: "number-interval-small-editor bi-border-top bi-border-bottom bi-border-left" cls: "number-interval-small-editor bi-border"
}); });
this.smallTip = BI.createWidget({ this.smallTip = BI.createWidget({
@ -72178,7 +72196,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
return true; return true;
}, },
cls: "number-interval-big-editor bi-border-top bi-border-bottom bi-border-right" cls: "number-interval-big-editor bi-border"
}); });
this.bigTip = BI.createWidget({ this.bigTip = BI.createWidget({
@ -72214,7 +72232,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
// }); // });
this.smallCombo = BI.createWidget({ this.smallCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-small-combo bi-border", cls: "number-interval-small-combo bi-border-top bi-border-bottom bi-border-right",
height: o.height - 2, height: o.height - 2,
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -72233,7 +72251,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
this.bigCombo = BI.createWidget({ this.bigCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-big-combo bi-border", cls: "number-interval-big-combo bi-border-top bi-border-bottom bi-border-left",
height: o.height - 2, height: o.height - 2,
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -72265,7 +72283,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
el: self.smallEditor el: self.smallEditor
}, { }, {
el: self.smallCombo, el: self.smallCombo,
width: c.width - c.border * 2 width: c.width - c.border
}] }]
}); });
@ -72273,7 +72291,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
type: "bi.htape", type: "bi.htape",
items: [{ items: [{
el: self.bigCombo, el: self.bigCombo,
width: c.width - c.border * 2 width: c.width - c.border
}, { }, {
el: self.bigEditor, el: self.bigEditor,
// BI-23883 间距考虑边框 // BI-23883 间距考虑边框

30
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

44
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
@ -55025,7 +55043,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
return true; return true;
}, },
cls: "number-interval-small-editor bi-border-top bi-border-bottom bi-border-left" cls: "number-interval-small-editor bi-border"
}); });
this.smallTip = BI.createWidget({ this.smallTip = BI.createWidget({
@ -55062,7 +55080,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
return true; return true;
}, },
cls: "number-interval-big-editor bi-border-top bi-border-bottom bi-border-right" cls: "number-interval-big-editor bi-border"
}); });
this.bigTip = BI.createWidget({ this.bigTip = BI.createWidget({
@ -55098,7 +55116,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
// }); // });
this.smallCombo = BI.createWidget({ this.smallCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-small-combo bi-border", cls: "number-interval-small-combo bi-border-top bi-border-bottom bi-border-right",
height: o.height - 2, height: o.height - 2,
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -55117,7 +55135,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
this.bigCombo = BI.createWidget({ this.bigCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-big-combo bi-border", cls: "number-interval-big-combo bi-border-top bi-border-bottom bi-border-left",
height: o.height - 2, height: o.height - 2,
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -55149,7 +55167,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
el: self.smallEditor el: self.smallEditor
}, { }, {
el: self.smallCombo, el: self.smallCombo,
width: c.width - c.border * 2 width: c.width - c.border
}] }]
}); });
@ -55157,7 +55175,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
type: "bi.htape", type: "bi.htape",
items: [{ items: [{
el: self.bigCombo, el: self.bigCombo,
width: c.width - c.border * 2 width: c.width - c.border
}, { }, {
el: self.bigEditor, el: self.bigEditor,
// BI-23883 间距考虑边框 // BI-23883 间距考虑边框

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

44
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
@ -13355,7 +13373,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
return true; return true;
}, },
cls: "number-interval-small-editor bi-border-top bi-border-bottom bi-border-left" cls: "number-interval-small-editor bi-border"
}); });
this.smallTip = BI.createWidget({ this.smallTip = BI.createWidget({
@ -13392,7 +13410,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
return true; return true;
}, },
cls: "number-interval-big-editor bi-border-top bi-border-bottom bi-border-right" cls: "number-interval-big-editor bi-border"
}); });
this.bigTip = BI.createWidget({ this.bigTip = BI.createWidget({
@ -13428,7 +13446,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
// }); // });
this.smallCombo = BI.createWidget({ this.smallCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-small-combo bi-border", cls: "number-interval-small-combo bi-border-top bi-border-bottom bi-border-right",
height: o.height - 2, height: o.height - 2,
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -13447,7 +13465,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
this.bigCombo = BI.createWidget({ this.bigCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-big-combo bi-border", cls: "number-interval-big-combo bi-border-top bi-border-bottom bi-border-left",
height: o.height - 2, height: o.height - 2,
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -13479,7 +13497,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
el: self.smallEditor el: self.smallEditor
}, { }, {
el: self.smallCombo, el: self.smallCombo,
width: c.width - c.border * 2 width: c.width - c.border
}] }]
}); });
@ -13487,7 +13505,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
type: "bi.htape", type: "bi.htape",
items: [{ items: [{
el: self.bigCombo, el: self.bigCombo,
width: c.width - c.border * 2 width: c.width - c.border
}, { }, {
el: self.bigEditor, el: self.bigEditor,
// BI-23883 间距考虑边框 // BI-23883 间距考虑边框

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

12
src/widget/numberinterval/numberinterval.js

@ -50,7 +50,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
return true; return true;
}, },
cls: "number-interval-small-editor bi-border-top bi-border-bottom bi-border-left" cls: "number-interval-small-editor bi-border"
}); });
this.smallTip = BI.createWidget({ this.smallTip = BI.createWidget({
@ -87,7 +87,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
return true; return true;
}, },
cls: "number-interval-big-editor bi-border-top bi-border-bottom bi-border-right" cls: "number-interval-big-editor bi-border"
}); });
this.bigTip = BI.createWidget({ this.bigTip = BI.createWidget({
@ -123,7 +123,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
// }); // });
this.smallCombo = BI.createWidget({ this.smallCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-small-combo bi-border", cls: "number-interval-small-combo bi-border-top bi-border-bottom bi-border-right",
height: o.height - 2, height: o.height - 2,
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -142,7 +142,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
} }
this.bigCombo = BI.createWidget({ this.bigCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-big-combo bi-border", cls: "number-interval-big-combo bi-border-top bi-border-bottom bi-border-left",
height: o.height - 2, height: o.height - 2,
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
@ -174,7 +174,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
el: self.smallEditor el: self.smallEditor
}, { }, {
el: self.smallCombo, el: self.smallCombo,
width: c.width - c.border * 2 width: c.width - c.border
}] }]
}); });
@ -182,7 +182,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
type: "bi.htape", type: "bi.htape",
items: [{ items: [{
el: self.bigCombo, el: self.bigCombo,
width: c.width - c.border * 2 width: c.width - c.border
}, { }, {
el: self.bigEditor, el: self.bigEditor,
// BI-23883 间距考虑边框 // BI-23883 间距考虑边框

Loading…
Cancel
Save