Browse Source

Merge pull request #178 in ~GUY/fineui from ~URTHUR/fineui:master to master

* commit '8ae56377810edcce04da4059fd84db945afebcdc':
  关联视图中关联表的关联字段未对齐
  时分秒输入不可为空
es6
Urthur 7 years ago
parent
commit
a4f24c8318
  1. 1
      src/widget/datetime/datetime.select.js
  2. 3
      src/widget/relationview/relationview.item.js

1
src/widget/datetime/datetime.select.js

@ -16,6 +16,7 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
this.editor = BI.createWidget({ this.editor = BI.createWidget({
type: "bi.sign_editor", type: "bi.sign_editor",
value: this._alertInEditorValue(o.min), value: this._alertInEditorValue(o.min),
allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"), errorText: BI.i18nText("BI-Please_Input_Natural_Number"),
validationChecker: function(v){ validationChecker: function(v){
return BI.isNaturalNumber(v); return BI.isNaturalNumber(v);

3
src/widget/relationview/relationview.item.js

@ -35,7 +35,8 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, {
value: o.value, value: o.value,
height: o.height, height: o.height,
textAlign: "left", textAlign: "left",
width: o.isPrimary ? 70 : 90 width: o.isPrimary ? 70 : 90,
lgap: o.isPrimary ? 0 : 10
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical_adapt", type: "bi.vertical_adapt",

Loading…
Cancel
Save