Browse Source

高度默认24

es6
guy 7 years ago
parent
commit
8cd096b904
  1. 2
      bi/base.js
  2. 56
      bi/case.js
  3. 53
      bi/widget.js
  4. 2
      dist/base.js
  5. 111
      dist/bundle.js
  6. 56
      dist/case.js
  7. 7
      dist/fix/fix.compact.js
  8. 53
      dist/widget.js
  9. 2
      src/base/single/trigger/trigger.js
  10. 2
      src/case/combo/editoriconcheckcombo/combo.editoriconcheck.js
  11. 2
      src/case/combo/staticcombo/combo.static.js
  12. 2
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  13. 2
      src/case/editor/editor.clear.js
  14. 2
      src/case/editor/editor.shelter.js
  15. 2
      src/case/editor/editor.sign.initial.js
  16. 2
      src/case/editor/editor.sign.js
  17. 2
      src/case/editor/editor.state.js
  18. 2
      src/case/editor/editor.state.simple.js
  19. 2
      src/case/segment/segment.js
  20. 9
      src/case/trigger/trigger.editor.js
  21. 2
      src/case/trigger/trigger.icon.js
  22. 11
      src/case/trigger/trigger.icon.text.js
  23. 7
      src/case/trigger/trigger.text.js
  24. 7
      src/case/trigger/trigger.text.small.js
  25. 3
      src/widget/date/trigger.date.js
  26. 2
      src/widget/datetime/datetime.combo.js
  27. 3
      src/widget/datetime/datetime.trigger.js
  28. 2
      src/widget/editor/editor.search.js
  29. 2
      src/widget/editor/editor.text.js
  30. 11
      src/widget/month/trigger.month.js
  31. 8
      src/widget/multidate/multidate.combo.js
  32. 7
      src/widget/quarter/trigger.quarter.js
  33. 2
      src/widget/singletree/singletree.combo.js
  34. 2
      src/widget/singletree/singletree.trigger.js
  35. 11
      src/widget/year/trigger.year.js

2
bi/base.js

@ -21477,7 +21477,7 @@ BI.Trigger = BI.inherit(BI.Single, {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
height: 30
height: 24
})
},

56
bi/case.js

@ -5137,7 +5137,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.EditorIconCheckCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-check-editor-combo",
width: 100,
height: 30,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
@ -5457,7 +5457,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.StaticCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-static-combo",
height: 30,
height: 24,
text: "",
el: {},
items: [],
@ -5523,7 +5523,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.TextValueCheckCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-text-value-check-combo",
width: 100,
height: 30,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: ""
})
@ -6036,7 +6036,7 @@ BI.ClearEditor = BI.inherit(BI.Widget, {
var conf = BI.ClearEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-clear-editor",
height: 30,
height: 24,
errorText: "",
watermark: "",
validationChecker: BI.emptyFn,
@ -6215,7 +6215,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30,
height: 24,
textAlign: "left"
})
},
@ -6472,7 +6472,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
errorText: "",
value: "",
text: "",
height: 30
height: 24
})
},
@ -6739,7 +6739,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -6997,7 +6997,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -7271,7 +7271,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -9403,7 +9403,7 @@ BI.Segment = BI.inherit(BI.Widget, {
return BI.extend(BI.Segment.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-segment",
items: [],
height: 30
height: 24
});
},
_init: function () {
@ -12263,13 +12263,12 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border",
height: 30,
height: 24,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
allowBlank: false,
watermark: "",
errorText: "",
triggerWidth: 30
errorText: ""
});
},
@ -12304,9 +12303,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
el: {
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth
width: o.triggerWidth || o.height
},
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});
@ -12338,7 +12337,7 @@ BI.IconTrigger = BI.inherit(BI.Trigger, {
return BI.extend(BI.IconTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-icon-trigger",
el: {},
height: 30
height: 24
});
},
_init: function () {
@ -12361,15 +12360,14 @@ BI.shortcut('bi.icon_trigger', BI.IconTrigger);/**
*/
BI.IconTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
triggerWidth: 30
hgap: 4
},
_defaultConfig: function () {
var conf = BI.IconTextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 30
height: 24
});
},
@ -12386,7 +12384,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: c.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -12401,13 +12399,13 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
},
disableSelected: true
},
width: 24
width: o.triggerWidth || o.height
},
{
el: this.text
}, {
el: this.trigerButton,
width: c.triggerWidth
width: o.triggerWidth || o.height
}
]
});
@ -12443,8 +12441,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
var conf = BI.TextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 30,
triggerWidth: 30
height: 24
});
},
@ -12462,7 +12459,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -12473,7 +12470,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
el: this.text
}, {
el: this.trigerButton,
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});
@ -12609,8 +12606,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
var conf = BI.SmallTextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 20,
triggerWidth: 20
height: 20
});
},
@ -12626,7 +12622,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
width: o.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -12637,7 +12633,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
el: this.text
}, {
el: this.trigerButton,
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});

53
bi/widget.js

@ -2293,7 +2293,6 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 30,
yearLength: 4,
yearMonthLength: 7
},
@ -2303,7 +2302,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
extraCls: "bi-date-trigger",
min: '1900-01-01', //最小日期
max: '2099-12-31', //最大日期
height: 25
height: 24
});
},
_init: function () {
@ -2807,7 +2806,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
width: 30,
width: 24,
height: 24
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
@ -3145,7 +3144,6 @@ BI.shortcut("bi.date_time_select", BI.DateTimeSelect);/**
BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
triggerWidth: 30
},
_defaultConfig: function () {
@ -3173,7 +3171,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
element: this,
items: [{
el: BI.createWidget(),
width: c.triggerWidth
width: o.height
}, {
el: this.text
}]
@ -4009,7 +4007,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-search-editor bi-border",
height: 30,
height: 24,
errorText: "",
watermark: BI.i18nText("BI-Basic_Search"),
validationChecker: BI.emptyFn,
@ -4228,7 +4226,7 @@ BI.TextEditor = BI.inherit(BI.Widget, {
allowBlank: false,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -5783,14 +5781,13 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 25,
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
},
_defaultConfig: function () {
return BI.extend(BI.MonthTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-month-trigger bi-border",
height: 25
height: 24
});
},
_init: function () {
@ -5846,15 +5843,15 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
type: "bi.text_button",
text: BI.i18nText("BI-Multi_Date_Month"),
baseCls: "bi-trigger-month-text",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});
@ -6166,8 +6163,8 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font",
width: 30,
height: 23
width: 24,
height: 24
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
if (self.combo.isViewVisible()) {
@ -6179,8 +6176,8 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
this.changeIcon = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font",
width: 30,
height: 23
width: 24,
height: 24
});
@ -13925,7 +13922,6 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 30,
textWidth: 40,
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
},
@ -13933,7 +13929,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.QuarterTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-quarter-trigger bi-border",
height: 25
height: 24
});
},
_init: function () {
@ -13996,9 +13992,9 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});
@ -16069,7 +16065,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.SingleTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-tree-combo",
trigger: {},
height: 30,
height: 24,
text: "",
items: []
});
@ -16204,7 +16200,7 @@ BI.SingleTreeTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleTreeTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-tree-trigger",
height: 30,
height: 24,
text: "",
items: []
});
@ -16769,7 +16765,6 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 25,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
},
@ -16779,7 +16774,7 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
extraCls: "bi-year-trigger bi-border",
min: '1900-01-01', //最小日期
max: '2099-12-31', //最大日期
height: 25
height: 24
});
},
_init: function () {
@ -16836,15 +16831,15 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
type: "bi.text_button",
baseCls: "bi-trigger-year-text",
text: BI.i18nText("BI-Multi_Date_Year"),
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});

2
dist/base.js vendored

@ -21477,7 +21477,7 @@ BI.Trigger = BI.inherit(BI.Single, {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
height: 30
height: 24
})
},

111
dist/bundle.js vendored

@ -47218,7 +47218,7 @@ BI.Trigger = BI.inherit(BI.Single, {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
height: 30
height: 24
})
},
@ -67502,7 +67502,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.EditorIconCheckCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-check-editor-combo",
width: 100,
height: 30,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
@ -67822,7 +67822,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.StaticCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-static-combo",
height: 30,
height: 24,
text: "",
el: {},
items: [],
@ -67888,7 +67888,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.TextValueCheckCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-text-value-check-combo",
width: 100,
height: 30,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: ""
})
@ -68401,7 +68401,7 @@ BI.ClearEditor = BI.inherit(BI.Widget, {
var conf = BI.ClearEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-clear-editor",
height: 30,
height: 24,
errorText: "",
watermark: "",
validationChecker: BI.emptyFn,
@ -68580,7 +68580,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30,
height: 24,
textAlign: "left"
})
},
@ -68837,7 +68837,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
errorText: "",
value: "",
text: "",
height: 30
height: 24
})
},
@ -69104,7 +69104,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -69362,7 +69362,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -69636,7 +69636,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -71768,7 +71768,7 @@ BI.Segment = BI.inherit(BI.Widget, {
return BI.extend(BI.Segment.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-segment",
items: [],
height: 30
height: 24
});
},
_init: function () {
@ -74628,13 +74628,12 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border",
height: 30,
height: 24,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
allowBlank: false,
watermark: "",
errorText: "",
triggerWidth: 30
errorText: ""
});
},
@ -74669,9 +74668,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
el: {
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth
width: o.triggerWidth || o.height
},
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});
@ -74703,7 +74702,7 @@ BI.IconTrigger = BI.inherit(BI.Trigger, {
return BI.extend(BI.IconTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-icon-trigger",
el: {},
height: 30
height: 24
});
},
_init: function () {
@ -74726,15 +74725,14 @@ BI.shortcut('bi.icon_trigger', BI.IconTrigger);/**
*/
BI.IconTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
triggerWidth: 30
hgap: 4
},
_defaultConfig: function () {
var conf = BI.IconTextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 30
height: 24
});
},
@ -74751,7 +74749,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: c.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -74766,13 +74764,13 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
},
disableSelected: true
},
width: 24
width: o.triggerWidth || o.height
},
{
el: this.text
}, {
el: this.trigerButton,
width: c.triggerWidth
width: o.triggerWidth || o.height
}
]
});
@ -74808,8 +74806,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
var conf = BI.TextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 30,
triggerWidth: 30
height: 24
});
},
@ -74827,7 +74824,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -74838,7 +74835,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
el: this.text
}, {
el: this.trigerButton,
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});
@ -74974,8 +74971,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
var conf = BI.SmallTextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 20,
triggerWidth: 20
height: 20
});
},
@ -74991,7 +74987,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
width: o.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -75002,7 +74998,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
el: this.text
}, {
el: this.trigerButton,
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});
@ -77311,7 +77307,6 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 30,
yearLength: 4,
yearMonthLength: 7
},
@ -77321,7 +77316,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
extraCls: "bi-date-trigger",
min: '1900-01-01', //最小日期
max: '2099-12-31', //最大日期
height: 25
height: 24
});
},
_init: function () {
@ -77825,7 +77820,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
width: 30,
width: 24,
height: 24
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
@ -78163,7 +78158,6 @@ BI.shortcut("bi.date_time_select", BI.DateTimeSelect);/**
BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
triggerWidth: 30
},
_defaultConfig: function () {
@ -78191,7 +78185,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
element: this,
items: [{
el: BI.createWidget(),
width: c.triggerWidth
width: o.height
}, {
el: this.text
}]
@ -79027,7 +79021,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-search-editor bi-border",
height: 30,
height: 24,
errorText: "",
watermark: BI.i18nText("BI-Basic_Search"),
validationChecker: BI.emptyFn,
@ -79246,7 +79240,7 @@ BI.TextEditor = BI.inherit(BI.Widget, {
allowBlank: false,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -80801,14 +80795,13 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 25,
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
},
_defaultConfig: function () {
return BI.extend(BI.MonthTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-month-trigger bi-border",
height: 25
height: 24
});
},
_init: function () {
@ -80864,15 +80857,15 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
type: "bi.text_button",
text: BI.i18nText("BI-Multi_Date_Month"),
baseCls: "bi-trigger-month-text",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});
@ -81184,8 +81177,8 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font",
width: 30,
height: 23
width: 24,
height: 24
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
if (self.combo.isViewVisible()) {
@ -81197,8 +81190,8 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
this.changeIcon = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font",
width: 30,
height: 23
width: 24,
height: 24
});
@ -88943,7 +88936,6 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 30,
textWidth: 40,
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
},
@ -88951,7 +88943,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.QuarterTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-quarter-trigger bi-border",
height: 25
height: 24
});
},
_init: function () {
@ -89014,9 +89006,9 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});
@ -91087,7 +91079,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.SingleTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-tree-combo",
trigger: {},
height: 30,
height: 24,
text: "",
items: []
});
@ -91222,7 +91214,7 @@ BI.SingleTreeTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleTreeTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-tree-trigger",
height: 30,
height: 24,
text: "",
items: []
});
@ -91787,7 +91779,6 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 25,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
},
@ -91797,7 +91788,7 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
extraCls: "bi-year-trigger bi-border",
min: '1900-01-01', //最小日期
max: '2099-12-31', //最大日期
height: 25
height: 24
});
},
_init: function () {
@ -91854,15 +91845,15 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
type: "bi.text_button",
baseCls: "bi-trigger-year-text",
text: BI.i18nText("BI-Multi_Date_Year"),
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});

56
dist/case.js vendored

@ -5137,7 +5137,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.EditorIconCheckCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-check-editor-combo",
width: 100,
height: 30,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
@ -5457,7 +5457,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.StaticCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-static-combo",
height: 30,
height: 24,
text: "",
el: {},
items: [],
@ -5523,7 +5523,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.TextValueCheckCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-text-value-check-combo",
width: 100,
height: 30,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: ""
})
@ -6036,7 +6036,7 @@ BI.ClearEditor = BI.inherit(BI.Widget, {
var conf = BI.ClearEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-clear-editor",
height: 30,
height: 24,
errorText: "",
watermark: "",
validationChecker: BI.emptyFn,
@ -6215,7 +6215,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30,
height: 24,
textAlign: "left"
})
},
@ -6472,7 +6472,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
errorText: "",
value: "",
text: "",
height: 30
height: 24
})
},
@ -6739,7 +6739,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -6997,7 +6997,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -7271,7 +7271,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -9403,7 +9403,7 @@ BI.Segment = BI.inherit(BI.Widget, {
return BI.extend(BI.Segment.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-segment",
items: [],
height: 30
height: 24
});
},
_init: function () {
@ -12263,13 +12263,12 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border",
height: 30,
height: 24,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
allowBlank: false,
watermark: "",
errorText: "",
triggerWidth: 30
errorText: ""
});
},
@ -12304,9 +12303,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
el: {
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth
width: o.triggerWidth || o.height
},
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});
@ -12338,7 +12337,7 @@ BI.IconTrigger = BI.inherit(BI.Trigger, {
return BI.extend(BI.IconTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-icon-trigger",
el: {},
height: 30
height: 24
});
},
_init: function () {
@ -12361,15 +12360,14 @@ BI.shortcut('bi.icon_trigger', BI.IconTrigger);/**
*/
BI.IconTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
triggerWidth: 30
hgap: 4
},
_defaultConfig: function () {
var conf = BI.IconTextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 30
height: 24
});
},
@ -12386,7 +12384,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: c.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -12401,13 +12399,13 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
},
disableSelected: true
},
width: 24
width: o.triggerWidth || o.height
},
{
el: this.text
}, {
el: this.trigerButton,
width: c.triggerWidth
width: o.triggerWidth || o.height
}
]
});
@ -12443,8 +12441,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
var conf = BI.TextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 30,
triggerWidth: 30
height: 24
});
},
@ -12462,7 +12459,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -12473,7 +12470,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
el: this.text
}, {
el: this.trigerButton,
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});
@ -12609,8 +12606,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
var conf = BI.SmallTextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 20,
triggerWidth: 20
height: 20
});
},
@ -12626,7 +12622,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
width: o.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -12637,7 +12633,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
el: this.text
}, {
el: this.trigerButton,
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});

7
dist/fix/fix.compact.js vendored

@ -42,8 +42,11 @@
BI.Widget.prototype._unMount = function () {
unMount.apply(this, arguments);
this.store && this.store.destroy();
BI.each(this._watchers, function (i, unwatch) {
unwatch();
BI.each(this._watchers, function (i, unwatches) {
unwatches = BI.isArray(unwatches) ? unwatches : [unwatches];
BI.each(unwatches, function (j, unwatch) {
unwatch();
})
});
this._watchers && (this._watchers = []);
this.store && (this.store = null);

53
dist/widget.js vendored

@ -2293,7 +2293,6 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 30,
yearLength: 4,
yearMonthLength: 7
},
@ -2303,7 +2302,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
extraCls: "bi-date-trigger",
min: '1900-01-01', //最小日期
max: '2099-12-31', //最大日期
height: 25
height: 24
});
},
_init: function () {
@ -2807,7 +2806,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
width: 30,
width: 24,
height: 24
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
@ -3145,7 +3144,6 @@ BI.shortcut("bi.date_time_select", BI.DateTimeSelect);/**
BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
triggerWidth: 30
},
_defaultConfig: function () {
@ -3173,7 +3171,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
element: this,
items: [{
el: BI.createWidget(),
width: c.triggerWidth
width: o.height
}, {
el: this.text
}]
@ -4009,7 +4007,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-search-editor bi-border",
height: 30,
height: 24,
errorText: "",
watermark: BI.i18nText("BI-Basic_Search"),
validationChecker: BI.emptyFn,
@ -4228,7 +4226,7 @@ BI.TextEditor = BI.inherit(BI.Widget, {
allowBlank: false,
watermark: "",
errorText: "",
height: 30
height: 24
})
},
@ -5783,14 +5781,13 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 25,
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
},
_defaultConfig: function () {
return BI.extend(BI.MonthTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-month-trigger bi-border",
height: 25
height: 24
});
},
_init: function () {
@ -5846,15 +5843,15 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
type: "bi.text_button",
text: BI.i18nText("BI-Multi_Date_Month"),
baseCls: "bi-trigger-month-text",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});
@ -6166,8 +6163,8 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font",
width: 30,
height: 23
width: 24,
height: 24
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
if (self.combo.isViewVisible()) {
@ -6179,8 +6176,8 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
this.changeIcon = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font",
width: 30,
height: 23
width: 24,
height: 24
});
@ -13925,7 +13922,6 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 30,
textWidth: 40,
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
},
@ -13933,7 +13929,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.QuarterTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-quarter-trigger bi-border",
height: 25
height: 24
});
},
_init: function () {
@ -13996,9 +13992,9 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});
@ -16069,7 +16065,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.SingleTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-tree-combo",
trigger: {},
height: 30,
height: 24,
text: "",
items: []
});
@ -16204,7 +16200,7 @@ BI.SingleTreeTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleTreeTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-tree-trigger",
height: 30,
height: 24,
text: "",
items: []
});
@ -16769,7 +16765,6 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 25,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
},
@ -16779,7 +16774,7 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
extraCls: "bi-year-trigger bi-border",
min: '1900-01-01', //最小日期
max: '2099-12-31', //最大日期
height: 25
height: 24
});
},
_init: function () {
@ -16836,15 +16831,15 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
type: "bi.text_button",
baseCls: "bi-trigger-year-text",
text: BI.i18nText("BI-Multi_Date_Year"),
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});

2
src/base/single/trigger/trigger.js

@ -9,7 +9,7 @@ BI.Trigger = BI.inherit(BI.Single, {
var conf = BI.Trigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-trigger cursor-pointer",
height: 30
height: 24
})
},

2
src/case/combo/editoriconcheckcombo/combo.editoriconcheck.js

@ -6,7 +6,7 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.EditorIconCheckCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-check-editor-combo",
width: 100,
height: 30,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,

2
src/case/combo/staticcombo/combo.static.js

@ -8,7 +8,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.StaticCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-static-combo",
height: 30,
height: 24,
text: "",
el: {},
items: [],

2
src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js

@ -8,7 +8,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.TextValueCheckCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-text-value-check-combo",
width: 100,
height: 30,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: ""
})

2
src/case/editor/editor.clear.js

@ -9,7 +9,7 @@ BI.ClearEditor = BI.inherit(BI.Widget, {
var conf = BI.ClearEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-clear-editor",
height: 30,
height: 24,
errorText: "",
watermark: "",
validationChecker: BI.emptyFn,

2
src/case/editor/editor.shelter.js

@ -20,7 +20,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30,
height: 24,
textAlign: "left"
})
},

2
src/case/editor/editor.sign.initial.js

@ -19,7 +19,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
errorText: "",
value: "",
text: "",
height: 30
height: 24
})
},

2
src/case/editor/editor.sign.js

@ -20,7 +20,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},

2
src/case/editor/editor.state.js

@ -20,7 +20,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},

2
src/case/editor/editor.state.simple.js

@ -21,7 +21,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
allowBlank: true,
watermark: "",
errorText: "",
height: 30
height: 24
})
},

2
src/case/segment/segment.js

@ -10,7 +10,7 @@ BI.Segment = BI.inherit(BI.Widget, {
return BI.extend(BI.Segment.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-segment",
items: [],
height: 30
height: 24
});
},
_init: function () {

9
src/case/trigger/trigger.editor.js

@ -14,13 +14,12 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border",
height: 30,
height: 24,
validationChecker: BI.emptyFn,
quitChecker: BI.emptyFn,
allowBlank: false,
watermark: "",
errorText: "",
triggerWidth: 30
errorText: ""
});
},
@ -55,9 +54,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
el: {
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth
width: o.triggerWidth || o.height
},
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});

2
src/case/trigger/trigger.icon.js

@ -11,7 +11,7 @@ BI.IconTrigger = BI.inherit(BI.Trigger, {
return BI.extend(BI.IconTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-icon-trigger",
el: {},
height: 30
height: 24
});
},
_init: function () {

11
src/case/trigger/trigger.icon.text.js

@ -7,15 +7,14 @@
*/
BI.IconTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
triggerWidth: 30
hgap: 4
},
_defaultConfig: function () {
var conf = BI.IconTextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 30
height: 24
});
},
@ -32,7 +31,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: c.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -47,13 +46,13 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
},
disableSelected: true
},
width: 24
width: o.triggerWidth || o.height
},
{
el: this.text
}, {
el: this.trigerButton,
width: c.triggerWidth
width: o.triggerWidth || o.height
}
]
});

7
src/case/trigger/trigger.text.js

@ -14,8 +14,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
var conf = BI.TextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 30,
triggerWidth: 30
height: 24
});
},
@ -33,7 +32,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -44,7 +43,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
el: this.text
}, {
el: this.trigerButton,
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});

7
src/case/trigger/trigger.text.small.js

@ -13,8 +13,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
var conf = BI.SmallTextTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-text-trigger",
height: 20,
triggerWidth: 20
height: 20
});
},
@ -30,7 +29,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
width: o.triggerWidth
width: o.triggerWidth || o.height
});
BI.createWidget({
@ -41,7 +40,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
el: this.text
}, {
el: this.trigerButton,
width: o.triggerWidth
width: o.triggerWidth || o.height
}
]
});

3
src/widget/date/trigger.date.js

@ -2,7 +2,6 @@ BI.DateTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 30,
yearLength: 4,
yearMonthLength: 7
},
@ -12,7 +11,7 @@ BI.DateTrigger = BI.inherit(BI.Trigger, {
extraCls: "bi-date-trigger",
min: '1900-01-01', //最小日期
max: '2099-12-31', //最大日期
height: 25
height: 24
});
},
_init: function () {

2
src/widget/datetime/datetime.combo.js

@ -79,7 +79,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font bi-border-right",
width: 30,
width: 24,
height: 24
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {

3
src/widget/datetime/datetime.trigger.js

@ -4,7 +4,6 @@
BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
triggerWidth: 30
},
_defaultConfig: function () {
@ -32,7 +31,7 @@ BI.DateTimeTrigger = BI.inherit(BI.Trigger, {
element: this,
items: [{
el: BI.createWidget(),
width: c.triggerWidth
width: o.height
}, {
el: this.text
}]

2
src/widget/editor/editor.search.js

@ -6,7 +6,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: "bi-search-editor bi-border",
height: 30,
height: 24,
errorText: "",
watermark: BI.i18nText("BI-Basic_Search"),
validationChecker: BI.emptyFn,

2
src/widget/editor/editor.text.js

@ -19,7 +19,7 @@ BI.TextEditor = BI.inherit(BI.Widget, {
allowBlank: false,
watermark: "",
errorText: "",
height: 30
height: 24
})
},

11
src/widget/month/trigger.month.js

@ -9,14 +9,13 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 25,
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
},
_defaultConfig: function () {
return BI.extend(BI.MonthTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-month-trigger bi-border",
height: 25
height: 24
});
},
_init: function () {
@ -72,15 +71,15 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
type: "bi.text_button",
text: BI.i18nText("BI-Multi_Date_Month"),
baseCls: "bi-trigger-month-text",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});

8
src/widget/multidate/multidate.combo.js

@ -131,8 +131,8 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
var triggerBtn = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-font",
width: 30,
height: 23
width: 24,
height: 24
});
triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
if (self.combo.isViewVisible()) {
@ -144,8 +144,8 @@ BI.MultiDateCombo = BI.inherit(BI.Single, {
this.changeIcon = BI.createWidget({
type: "bi.icon_button",
cls: "bi-trigger-icon-button date-change-h-font",
width: 30,
height: 23
width: 24,
height: 24
});

7
src/widget/quarter/trigger.quarter.js

@ -9,7 +9,6 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 30,
textWidth: 40,
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
},
@ -17,7 +16,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.QuarterTrigger.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-quarter-trigger bi-border",
height: 25
height: 24
});
},
_init: function () {
@ -80,9 +79,9 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});

2
src/widget/singletree/singletree.combo.js

@ -8,7 +8,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.SingleTreeCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-tree-combo",
trigger: {},
height: 30,
height: 24,
text: "",
items: []
});

2
src/widget/singletree/singletree.trigger.js

@ -8,7 +8,7 @@ BI.SingleTreeTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () {
return BI.extend(BI.SingleTreeTrigger.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-tree-trigger",
height: 30,
height: 24,
text: "",
items: []
});

11
src/widget/year/trigger.year.js

@ -9,7 +9,6 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
triggerWidth: 25,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
},
@ -19,7 +18,7 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
extraCls: "bi-year-trigger bi-border",
min: '1900-01-01', //最小日期
max: '2099-12-31', //最大日期
height: 25
height: 24
});
},
_init: function () {
@ -76,15 +75,15 @@ BI.YearTrigger = BI.inherit(BI.Trigger, {
type: "bi.text_button",
baseCls: "bi-trigger-year-text",
text: BI.i18nText("BI-Multi_Date_Year"),
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}, {
el: {
type: "bi.trigger_icon_button",
width: c.triggerWidth
width: o.height
},
width: c.triggerWidth
width: o.height
}
]
});

Loading…
Cancel
Save