fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

BI-95299 fix: 修复边框不高亮+高度不准确问题

es6
iapyang 3 years ago
parent
8c5779a1a3
commit
e3cda541c1
5 changed files with 503 additions and 451 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. 23
      src/widget/dynamicdate/dynamicdate.combo.js
  2. 24
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  3. 21
      src/widget/year/combo.year.js
  4. 20
      src/widget/yearmonth/combo.yearmonth.js
  5. 20
      src/widget/yearquarter/combo.yearquarter.js

23
src/widget/dynamicdate/dynamicdate.combo.js
Unescape View File

@ -30,20 +30,24 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
this.storeTriggerValue = ""; this.storeTriggerValue = "";
var date = BI.getDate(); var date = BI.getDate();
this.storeValue = opts.value; this.storeValue = opts.value;
return { return {
type: "bi.absolute",
items: [{
el: {
type: "bi.htape", type: "bi.htape",
cls: "bi-border bi-border-radius", cls: "bi-border bi-border-radius bi-focus-shadow",
items: [{ items: [{
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: opts.height, width: opts.height - 2,
height: opts.height - 2, height: opts.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
}, },
width: opts.height width: opts.height - 2
}, { }, {
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
@ -222,8 +226,8 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font", cls: "bi-trigger-icon-button date-font",
width: opts.height, width: opts.height - 2,
height: opts.height, height: opts.height - 2,
listeners: [{ listeners: [{
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
@ -245,6 +249,12 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
ref: function (_ref) { ref: function (_ref) {
self.comboWrapper = _ref; self.comboWrapper = _ref;
} }
},
top: 1,
left: 1,
right: 1,
bottom: 1
}]
}; };
}, },
@ -261,7 +271,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
switch (type) { switch (type) {
case BI.DynamicDateCombo.Dynamic: case BI.DynamicDateCombo.Dynamic:
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.comboWrapper.attr("items")[0].width = o.height; this.comboWrapper.attr("items")[0].width = o.height - 2;
this.comboWrapper.resize(); this.comboWrapper.resize();
break; break;
default: default:
@ -279,6 +289,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
return BI.isNotEmptyObject(v.value); return BI.isNotEmptyObject(v.value);
case BI.DynamicDateCombo.Static: case BI.DynamicDateCombo.Static:
var value = v.value || {}; var value = v.value || {};
return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0]; return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0];
default: default:
return true; return true;

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

@ -30,25 +30,30 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
this.storeTriggerValue = ""; this.storeTriggerValue = "";
var date = BI.getDate(); var date = BI.getDate();
this.storeValue = opts.value; this.storeValue = opts.value;
return { return {
type: "bi.absolute",
items: [{
el: {
type: "bi.htape", type: "bi.htape",
cls: "bi-border bi-border-radius", cls: "bi-border bi-border-radius bi-focus-shadow",
items: [{ items: [{
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: opts.height, width: opts.height - 2,
height: opts.height - 2, height: opts.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
}, },
width: opts.height width: opts.height - 2
}, { }, {
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
el: { el: {
type: "bi.combo", type: "bi.combo",
cls: "bi-focus-shadow",
destroyWhenHide: true, destroyWhenHide: true,
container: opts.container, container: opts.container,
ref: function () { ref: function () {
@ -230,8 +235,8 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font", cls: "bi-trigger-icon-button date-font",
width: opts.height, width: opts.height - 2,
height: opts.height, height: opts.height - 2,
listeners: [{ listeners: [{
eventName: BI.IconButton.EVENT_CHANGE, eventName: BI.IconButton.EVENT_CHANGE,
action: function () { action: function () {
@ -253,6 +258,12 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
ref: function (_ref) { ref: function (_ref) {
self.comboWrapper = _ref; self.comboWrapper = _ref;
} }
},
top: 1,
left: 1,
right: 1,
bottom: 1
}]
}; };
}, },
@ -269,7 +280,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
switch (type) { switch (type) {
case BI.DynamicDateTimeCombo.Dynamic: case BI.DynamicDateTimeCombo.Dynamic:
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.comboWrapper.attr("items")[0].width = o.height; this.comboWrapper.attr("items")[0].width = o.height - 2;
this.comboWrapper.resize(); this.comboWrapper.resize();
break; break;
default: default:
@ -287,6 +298,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
return BI.isNotEmptyObject(v.value); return BI.isNotEmptyObject(v.value);
case BI.DynamicDateCombo.Static: case BI.DynamicDateCombo.Static:
var value = v.value || {}; var value = v.value || {};
return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0]; return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0];
default: default:
return true; return true;

21
src/widget/year/combo.year.js
Unescape View File

@ -6,7 +6,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
minDate: "1900-01-01", // 最小日期 minDate: "1900-01-01", // 最小日期
maxDate: "2099-12-31", // 最大日期 maxDate: "2099-12-31", // 最大日期
height: 24, height: 24,
supportDynamic: true, supportDynamic: true
}, },
_init: function () { _init: function () {
@ -119,9 +119,12 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.absolute",
cls: "bi-border bi-border-radius",
element: this, element: this,
items: [{
el: {
type: "bi.htape",
cls: "bi-border bi-border-radius bi-focus-shadow",
ref: function () { ref: function () {
self.comboWrapper = this; self.comboWrapper = this;
}, },
@ -129,14 +132,20 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: 24, width: o.height - 2,
height: o.height - 2, height: o.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
}, },
width: 24 width: o.height - 2
}, this.combo] }, this.combo]
},
top: 1,
left: 1,
right: 1,
bottom: 1
}]
}); });
this._checkDynamicValue(o.value); this._checkDynamicValue(o.value);
}, },
@ -149,7 +158,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
switch (type) { switch (type) {
case BI.DynamicYearCombo.Dynamic: case BI.DynamicYearCombo.Dynamic:
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.comboWrapper.attr("items")[0].width = 24; this.comboWrapper.attr("items")[0].width = this.options.height - 2,
this.comboWrapper.resize(); this.comboWrapper.resize();
break; break;
default: default:

20
src/widget/yearmonth/combo.yearmonth.js
Unescape View File

@ -123,9 +123,12 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.absolute",
cls: "bi-border bi-border-radius",
element: this, element: this,
items: [{
el: {
type: "bi.htape",
cls: "bi-border bi-border-radius bi-focus-shadow",
ref: function () { ref: function () {
self.comboWrapper = this; self.comboWrapper = this;
}, },
@ -133,14 +136,20 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: 24, width: o.height - 2,
height: o.height - 2, height: o.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
}, },
width: 24 width: o.height - 2
}, this.combo] }, this.combo]
},
top: 1,
left: 1,
right: 1,
bottom: 1
}]
}); });
this._checkDynamicValue(o.value); this._checkDynamicValue(o.value);
}, },
@ -153,7 +162,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
switch (type) { switch (type) {
case BI.DynamicYearMonthCombo.Dynamic: case BI.DynamicYearMonthCombo.Dynamic:
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.comboWrapper.attr("items")[0].width = 24; this.comboWrapper.attr("items")[0].width = this.options.height - 2,
this.comboWrapper.resize(); this.comboWrapper.resize();
break; break;
default: default:
@ -171,6 +180,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
return BI.isNotEmptyObject(v.value); return BI.isNotEmptyObject(v.value);
case BI.DynamicDateCombo.Static: case BI.DynamicDateCombo.Static:
var value = v.value || {}; var value = v.value || {};
return !BI.checkDateVoid(value.year, value.month, 1, o.minDate, o.maxDate)[0]; return !BI.checkDateVoid(value.year, value.month, 1, o.minDate, o.maxDate)[0];
default: default:
return true; return true;

20
src/widget/yearquarter/combo.yearquarter.js
Unescape View File

@ -123,9 +123,12 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.absolute",
cls: "bi-border bi-border-radius",
element: this, element: this,
items: [{
el: {
type: "bi.htape",
cls: "bi-border bi-border-radius bi-focus-shadow",
ref: function () { ref: function () {
self.comboWrapper = this; self.comboWrapper = this;
}, },
@ -133,14 +136,20 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font", cls: "bi-trigger-icon-button date-change-h-font",
width: 24, width: o.height - 2,
height: o.height - 2, height: o.height - 2,
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
}, },
width: 24 width: o.height - 2
}, this.combo] }, this.combo]
},
top: 1,
left: 1,
right: 1,
bottom: 1
}]
}); });
this._checkDynamicValue(o.value); this._checkDynamicValue(o.value);
}, },
@ -153,7 +162,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
switch (type) { switch (type) {
case BI.DynamicYearQuarterCombo.Dynamic: case BI.DynamicYearQuarterCombo.Dynamic:
this.changeIcon.setVisible(true); this.changeIcon.setVisible(true);
this.comboWrapper.attr("items")[0].width = 24; this.comboWrapper.attr("items")[0].width = this.options.height - 2;
this.comboWrapper.resize(); this.comboWrapper.resize();
break; break;
default: default:
@ -171,6 +180,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
return BI.isNotEmptyObject(v.value); return BI.isNotEmptyObject(v.value);
case BI.DynamicDateCombo.Static: case BI.DynamicDateCombo.Static:
var value = v.value || {}; var value = v.value || {};
return !BI.checkDateVoid(value.year, (value.quarter - 1) * 3 + 1, 1, o.minDate, o.maxDate)[0]; return !BI.checkDateVoid(value.year, (value.quarter - 1) * 3 + 1, 1, o.minDate, o.maxDate)[0];
default: default:
return true; return true;

Write Preview
Loading…
Cancel
Save