Browse Source

Pull request #2272: 无JIRA任务 恢复多减的宽高

Merge in VISUAL/fineui from ~TELLER/fineui:master to master

* commit '485c41384b737d95896957d391e6f0a463880fd6':
  无JIRA任务 fix: 恢复多减的宽高
es6
Teller 3 years ago
parent
commit
9e788685bd
  1. 12
      src/widget/dynamicdate/dynamicdate.combo.js
  2. 10
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  3. 8
      src/widget/year/combo.year.js
  4. 8
      src/widget/yearmonth/combo.yearmonth.js
  5. 8
      src/widget/yearquarter/combo.yearquarter.js

12
src/widget/dynamicdate/dynamicdate.combo.js

@ -30,7 +30,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
this.storeTriggerValue = "";
var date = BI.getDate();
this.storeValue = opts.value;
return {
type: "bi.absolute",
items: [{
@ -250,10 +250,10 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
self.comboWrapper = _ref;
}
},
top: 1,
left: 1,
right: 1,
bottom: 1
top: 0,
left: 0,
right: 0,
bottom: 0
}]
};
},
@ -289,7 +289,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
return BI.isNotEmptyObject(v.value);
case BI.DynamicDateCombo.Static:
var value = v.value || {};
return !BI.checkDateVoid(value.year, value.month, value.day, o.minDate, o.maxDate)[0];
default:
return true;

10
src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -30,7 +30,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
this.storeTriggerValue = "";
var date = BI.getDate();
this.storeValue = opts.value;
return {
type: "bi.absolute",
items: [{
@ -259,10 +259,10 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
self.comboWrapper = _ref;
}
},
top: 1,
left: 1,
right: 1,
bottom: 1
top: 0,
left: 0,
right: 0,
bottom: 0
}]
};
},

8
src/widget/year/combo.year.js

@ -141,10 +141,10 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
width: o.height - 2
}, this.combo]
},
top: 1,
left: 1,
right: 1,
bottom: 1
top: 0,
left: 0,
right: 0,
bottom: 0
}]
});
this._checkDynamicValue(o.value);

8
src/widget/yearmonth/combo.yearmonth.js

@ -145,10 +145,10 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
width: o.height - 2
}, this.combo]
},
top: 1,
left: 1,
right: 1,
bottom: 1
top: 0,
left: 0,
right: 0,
bottom: 0
}]
});
this._checkDynamicValue(o.value);

8
src/widget/yearquarter/combo.yearquarter.js

@ -145,10 +145,10 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
width: o.height - 2
}, this.combo]
},
top: 1,
left: 1,
right: 1,
bottom: 1
top: 0,
left: 0,
right: 0,
bottom: 0
}]
});
this._checkDynamicValue(o.value);

Loading…
Cancel
Save