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

Merging in latest from upstream (VISUAL/fineui:refs/heads/master) 

* commit 'bf0621754a21b5e6433d803c02df52926abf61f1':
  auto upgrade version to 2.0.20221023105429
  反了
  auto upgrade version to 2.0.20221022222430
  bugfix
  bugfix
  toPix 和 pixFormat
es6
Dailer-刘荣歆 2 years ago
parent
cbf5ee2295 bf0621754a
commit
73cfcc5e7b
67 changed files with 170 additions and 169 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. 2
      examples/useContext.html
  2. 2
      package.json
  3. 16
      src/base/layer/layer.popup.js
  4. 14
      src/base/single/1.text.js
  5. 2
      src/base/single/button/buttons/button.icon.js
  6. 2
      src/base/single/button/buttons/button.js
  7. 14
      src/base/single/html/html.js
  8. 8
      src/base/single/label/abstract.label.js
  9. 2
      src/base/single/label/icon.label.js
  10. 5
      src/base/single/tip/tip.toast.js
  11. 2
      src/base/single/tip/tip.tooltip.js
  12. 4
      src/case/colorchooser/colorchooser.js
  13. 6
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  14. 6
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  15. 6
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  16. 6
      src/case/combo/textvaluecombo/combo.textvalue.js
  17. 4
      src/case/layer/panel.js
  18. 2
      src/case/linearsegment/button.linear.segment.js
  19. 2
      src/case/list/list.select.js
  20. 2
      src/case/segment/segment.js
  21. 4
      src/case/tree/treeexpander/tree.expander.popup.js
  22. 6
      src/case/trigger/trigger.editor.js
  23. 2
      src/case/trigger/trigger.text.select.small.js
  24. 4
      src/core/4.widget.js
  25. 4
      src/core/constant/var.js
  26. 10
      src/core/wrapper/layout.js
  27. 8
      src/core/wrapper/layout/layout.flow.js
  28. 8
      src/core/wrapper/layout/layout.inline.js
  29. 2
      src/widget/date/calendar/popup.month.js
  30. 10
      src/widget/dynamicdate/dynamicdate.combo.js
  31. 2
      src/widget/dynamicdate/dynamicdate.param.item.js
  32. 6
      src/widget/dynamicdate/dynamicdate.popup.js
  33. 6
      src/widget/dynamicdatetime/dynamicdatetime.combo.js
  34. 6
      src/widget/dynamicdatetime/dynamicdatetime.popup.js
  35. 4
      src/widget/editor/editor.search.js
  36. 4
      src/widget/editor/editor.text.js
  37. 8
      src/widget/intervalslider/intervalslider.js
  38. 16
      src/widget/multilayerselecttree/multilayerselecttree.combo.js
  39. 2
      src/widget/multilayerselecttree/multilayerselecttree.popup.js
  40. 12
      src/widget/multilayersingletree/multilayersingletree.combo.js
  41. 2
      src/widget/multilayersingletree/multilayersingletree.popup.js
  42. 2
      src/widget/multiselect/multiselect.combo.js
  43. 2
      src/widget/multiselect/multiselect.combo.nobar.js
  44. 2
      src/widget/multiselect/multiselect.insert.combo.js
  45. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  46. 2
      src/widget/multitree/multi.tree.combo.js
  47. 2
      src/widget/multitree/multi.tree.insert.combo.js
  48. 2
      src/widget/multitree/multi.tree.list.combo.js
  49. 4
      src/widget/numbereditor/number.editor.js
  50. 18
      src/widget/numberinterval/numberinterval.js
  51. 2
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
  52. 6
      src/widget/selecttree/selecttree.combo.js
  53. 2
      src/widget/singleselect/singleselect.combo.js
  54. 2
      src/widget/singleselect/singleselect.insert.combo.js
  55. 2
      src/widget/singleselect/singleselect.list.js
  56. 4
      src/widget/singleslider/singleslider.js
  57. 2
      src/widget/singleslider/singleslider.label.js
  58. 6
      src/widget/singletree/singletree.combo.js
  59. 6
      src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
  60. 4
      src/widget/time/time.combo.js
  61. 4
      src/widget/year/combo.year.js
  62. 6
      src/widget/year/popup.year.js
  63. 2
      src/widget/yearmonth/card.static.yearmonth.js
  64. 6
      src/widget/yearmonth/combo.yearmonth.js
  65. 6
      src/widget/yearmonth/popup.yearmonth.js
  66. 4
      src/widget/yearquarter/combo.yearquarter.js
  67. 6
      src/widget/yearquarter/popup.yearquarter.js

2
examples/useContext.html
Unescape View File

@ -56,6 +56,8 @@
return "calc(var(--css-scale) * " + pix + "px)"; return "calc(var(--css-scale) * " + pix + "px)";
}; };
BI.toPix = BI.pixFormat;
var Child = BI.inherit(BI.Widget, { var Child = BI.inherit(BI.Widget, {
render: function () { render: function () {
var label; var label;

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20221022202435", "version": "2.0.20221023105429",
"description": "fineui", "description": "fineui",
"main": "dist/fineui_without_conflict.min.js", "main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

16
src/base/layer/layer.popup.js
Unescape View File

@ -60,8 +60,8 @@ BI.PopupView = BI.inherit(BI.Widget, {
} }
this.element.css({ this.element.css({
"z-index": BI.zIndex_popup, "z-index": BI.zIndex_popup,
"min-width": BI.toPix(o.minWidth), "min-width": BI.pixFormat(o.minWidth),
"max-width": BI.toPix(o.maxWidth), "max-width": BI.pixFormat(o.maxWidth),
}).bind({ click: fn }); }).bind({ click: fn });
this.element.bind("mousewheel", fn); this.element.bind("mousewheel", fn);
@ -135,11 +135,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
var o = this.options; var o = this.options;
this.button_group = BI.createWidget(o.el, { type: "bi.button_group", value: o.value }); this.button_group = BI.createWidget(o.el, { type: "bi.button_group", value: o.value });
this.button_group.element.css({ this.button_group.element.css({
"min-height": BI.toPix(o.minHeight), "min-height": BI.pixFormat(o.minHeight),
"padding-top": BI.toPix(o.innerVgap), "padding-top": BI.pixFormat(o.innerVgap),
"padding-bottom": BI.toPix(o.innerVgap), "padding-bottom": BI.pixFormat(o.innerVgap),
"padding-left": BI.toPix(o.innerHgap), "padding-left": BI.pixFormat(o.innerHgap),
"padding-right": BI.toPix(o.innerHgap), "padding-right": BI.pixFormat(o.innerHgap),
}); });
return this.button_group; return this.button_group;
@ -411,7 +411,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVgap; var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVgap;
this.view.resetHeight ? this.view.resetHeight(resetHeight) : this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({ "max-height": BI.toPix(resetHeight) }); this.view.element.css({ "max-height": BI.pixFormat(resetHeight) });
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {

14
src/base/single/1.text.js
Unescape View File

@ -26,32 +26,32 @@
var self = this, o = this.options; var self = this, o = this.options;
if (o.hgap + o.lgap > 0) { if (o.hgap + o.lgap > 0) {
this.element.css({ this.element.css({
"padding-left": BI.toPix(o.hgap + o.lgap), "padding-left": BI.pixFormat(o.hgap + o.lgap),
}); });
} }
if (o.hgap + o.rgap > 0) { if (o.hgap + o.rgap > 0) {
this.element.css({ this.element.css({
"padding-right": BI.toPix(o.hgap + o.rgap), "padding-right": BI.pixFormat(o.hgap + o.rgap),
}); });
} }
if (o.vgap + o.tgap > 0) { if (o.vgap + o.tgap > 0) {
this.element.css({ this.element.css({
"padding-top": BI.toPix(o.vgap + o.tgap), "padding-top": BI.pixFormat(o.vgap + o.tgap),
}); });
} }
if (o.vgap + o.bgap > 0) { if (o.vgap + o.bgap > 0) {
this.element.css({ this.element.css({
"padding-bottom": BI.toPix(o.vgap + o.bgap), "padding-bottom": BI.pixFormat(o.vgap + o.bgap),
}); });
} }
if (BI.isWidthOrHeight(o.height)) { if (BI.isWidthOrHeight(o.height)) {
this.element.css({ lineHeight: BI.toPix(o.height) }); this.element.css({ lineHeight: BI.pixFormat(o.height) });
} }
if (BI.isWidthOrHeight(o.lineHeight)) { if (BI.isWidthOrHeight(o.lineHeight)) {
this.element.css({ lineHeight: BI.toPix(o.lineHeight) }); this.element.css({ lineHeight: BI.pixFormat(o.lineHeight) });
} }
if (BI.isWidthOrHeight(o.maxWidth)) { if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({ maxWidth: BI.toPix(o.maxWidth) }); this.element.css({ maxWidth: BI.pixFormat(o.maxWidth) });
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,

2
src/base/single/button/buttons/button.icon.js
Unescape View File

@ -31,7 +31,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
height: o.iconHeight, height: o.iconHeight,
}); });
if (BI.isNumber(o.height) && o.height > 0 && BI.isNull(o.iconWidth) && BI.isNull(o.iconHeight)) { if (BI.isNumber(o.height) && o.height > 0 && BI.isNull(o.iconWidth) && BI.isNull(o.iconHeight)) {
this.element.css("lineHeight", BI.toPix(o.height)); this.element.css("lineHeight", BI.pixFormat(o.height));
BI.createWidget({ BI.createWidget({
type: "bi.default", type: "bi.default",
element: this, element: this,

2
src/base/single/button/buttons/button.js
Unescape View File

@ -163,7 +163,7 @@
}); });
if (o.minWidth > 0) { if (o.minWidth > 0) {
this.element.css({ "min-width": BI.toPix(o.minWidth) }); this.element.css({ "min-width": BI.pixFormat(o.minWidth) });
} }
}, },

14
src/base/single/html/html.js
Unescape View File

@ -25,35 +25,35 @@ BI.Html = BI.inherit(BI.Single, {
var self = this, o = this.options; var self = this, o = this.options;
if (o.hgap + o.lgap > 0) { if (o.hgap + o.lgap > 0) {
this.element.css({ this.element.css({
"padding-left": BI.toPix(o.hgap + o.lgap), "padding-left": BI.pixFormat(o.hgap + o.lgap),
}); });
} }
if (o.hgap + o.rgap > 0) { if (o.hgap + o.rgap > 0) {
this.element.css({ this.element.css({
"padding-right": BI.toPix(o.hgap + o.rgap), "padding-right": BI.pixFormat(o.hgap + o.rgap),
}); });
} }
if (o.vgap + o.tgap > 0) { if (o.vgap + o.tgap > 0) {
this.element.css({ this.element.css({
"padding-top": BI.toPix(o.vgap + o.tgap), "padding-top": BI.pixFormat(o.vgap + o.tgap),
}); });
} }
if (o.vgap + o.bgap > 0) { if (o.vgap + o.bgap > 0) {
this.element.css({ this.element.css({
"padding-bottom": BI.toPix(o.vgap + o.bgap), "padding-bottom": BI.pixFormat(o.vgap + o.bgap),
}); });
} }
if (BI.isNumber(o.height)) { if (BI.isNumber(o.height)) {
this.element.css({ lineHeight: BI.toPix(o.height) }); this.element.css({ lineHeight: BI.pixFormat(o.height) });
} }
if (BI.isNumber(o.lineHeight)) { if (BI.isNumber(o.lineHeight)) {
this.element.css({ lineHeight: BI.toPix(o.lineHeight) }); this.element.css({ lineHeight: BI.pixFormat(o.lineHeight) });
} }
if (BI.isWidthOrHeight(o.maxWidth)) { if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({ maxWidth: o.maxWidth }); this.element.css({ maxWidth: o.maxWidth });
} }
if (BI.isNumber(o.maxWidth)) { if (BI.isNumber(o.maxWidth)) {
this.element.css({ maxWidth: BI.toPix(o.maxWidth) }) this.element.css({ maxWidth: BI.pixFormat(o.maxWidth) })
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,

8
src/base/single/label/abstract.label.js
Unescape View File

@ -109,7 +109,7 @@
} }
if (BI.isNumber(o.height) && o.height > 0) { // 1.4 if (BI.isNumber(o.height) && o.height > 0) { // 1.4
this.element.css({ this.element.css({
"line-height": BI.toPix(o.height), "line-height": BI.pixFormat(o.height),
}); });
json.textAlign = o.textAlign; json.textAlign = o.textAlign;
delete json.maxWidth; delete json.maxWidth;
@ -183,7 +183,7 @@
} }
if (BI.isNumber(o.height) && o.height > 0) { // 1.8 if (BI.isNumber(o.height) && o.height > 0) { // 1.8
this.element.css({ this.element.css({
"line-height": BI.toPix(o.height), "line-height": BI.pixFormat(o.height),
}); });
json.textAlign = o.textAlign; json.textAlign = o.textAlign;
delete json.maxWidth; delete json.maxWidth;
@ -263,7 +263,7 @@
if (BI.isNumber(o.height) && o.height > 0) { // 2.3 if (BI.isNumber(o.height) && o.height > 0) { // 2.3
if (o.whiteSpace !== "normal") { if (o.whiteSpace !== "normal") {
this.element.css({ this.element.css({
"line-height": BI.toPix(o.height - (o.vgap * 2)), "line-height": BI.pixFormat(o.height - (o.vgap * 2)),
}); });
} }
delete json.maxWidth; delete json.maxWidth;
@ -325,7 +325,7 @@
if (BI.isNumber(o.height) && o.height > 0) { if (BI.isNumber(o.height) && o.height > 0) {
if (o.whiteSpace !== "normal") { if (o.whiteSpace !== "normal") {
this.element.css({ this.element.css({
"line-height": BI.toPix(o.height - (o.vgap * 2)), "line-height": BI.pixFormat(o.height - (o.vgap * 2)),
}); });
} }
delete json.maxWidth; delete json.maxWidth;

2
src/base/single/label/icon.label.js
Unescape View File

@ -29,7 +29,7 @@ BI.IconLabel = BI.inherit(BI.Single, {
height: o.iconHeight, height: o.iconHeight,
}); });
if (BI.isNumber(o.height) && o.height > 0 && BI.isNull(o.iconWidth) && BI.isNull(o.iconHeight)) { if (BI.isNumber(o.height) && o.height > 0 && BI.isNull(o.iconWidth) && BI.isNull(o.iconHeight)) {
this.element.css("lineHeight", BI.toPix(o.lineHeight || o.height)); this.element.css("lineHeight", BI.pixFormat(o.lineHeight || o.height));
BI.createWidget({ BI.createWidget({
type: "bi.default", type: "bi.default",
element: this, element: this,

5
src/base/single/tip/tip.toast.js
Unescape View File

@ -30,9 +30,8 @@ BI.Toast = BI.inherit(BI.Tip, {
render: function () { render: function () {
var self = this, o = this.options, c = this._const; var self = this, o = this.options, c = this._const;
this.element.css({ this.element.css({
// 这里直接使用px即可 minWidth: BI.pixFormat(o.closable ? c.closableMinWidth : c.minWidth),
minWidth: BI.toPix(o.closable ? c.closableMinWidth : c.minWidth), maxWidth: BI.pixFormat(o.closable ? c.closableMaxWidth : c.maxWidth),
maxWidth: BI.toPix(o.closable ? c.closableMaxWidth : c.maxWidth),
}); });
this.element.addClass("toast-" + o.level); this.element.addClass("toast-" + o.level);
function fn(e) { function fn(e) {

2
src/base/single/tip/tip.tooltip.js
Unescape View File

@ -73,7 +73,7 @@ BI.Tooltip = BI.inherit(BI.Tip, {
}, },
setWidth: function (width) { setWidth: function (width) {
this.element.width(BI.toPix(width - 2 * this._const.hgap)); this.element.width(BI.pixFormat(width - 2 * this._const.hgap));
}, },
setText: function (text) { setText: function (text) {

4
src/case/colorchooser/colorchooser.js
Unescape View File

@ -36,8 +36,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
self.trigger = _ref; self.trigger = _ref;
}, },
value: o.value, value: o.value,
width: o.el.type ? o.width : BI.pixFormat(o.width, 2), width: o.el.type ? o.width : BI.toPix(o.width, 2),
height: o.el.type ? o.height : BI.pixFormat(o.height, 2) height: o.el.type ? o.height : BI.toPix(o.height, 2)
}, o.el), }, o.el),
popup: () => ({ popup: () => ({
el: BI.extend({ el: BI.extend({

6
src/case/combo/icontextvaluecombo/combo.icontextvalue.js
Unescape View File

@ -26,7 +26,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
type: "bi.select_icon_text_trigger", type: "bi.select_icon_text_trigger",
cls: "icon-text-value-trigger", cls: "icon-text-value-trigger",
items: o.items, items: o.items,
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
text: o.text, text: o.text,
iconCls: o.iconCls, iconCls: o.iconCls,
value: o.value, value: o.value,
@ -54,8 +54,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
}); });
this.textIconCombo = BI.createWidget({ this.textIconCombo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
width: BI.pixFormat(o.width, 2), width: BI.toPix(o.width, 2),
element: this, element: this,
container: o.container, container: o.container,
direction: o.direction, direction: o.direction,

6
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
Unescape View File

@ -28,8 +28,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow", cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
container: o.container, container: o.container,
adjustLength: 2, adjustLength: 2,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
width: BI.pixFormat(o.width, 2), width: BI.toPix(o.width, 2),
ref: function () { ref: function () {
self.combo = this; self.combo = this;
}, },
@ -41,7 +41,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
self.trigger = this; self.trigger = this;
}, },
items: o.items, items: o.items,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,
value: o.value, value: o.value,

6
src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
Unescape View File

@ -27,7 +27,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
cls: "text-value-trigger", cls: "text-value-trigger",
items: o.items, items: o.items,
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
text: o.text, text: o.text,
value: o.value value: o.value
}); });
@ -50,8 +50,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
container: o.container, container: o.container,
direction: o.direction, direction: o.direction,
element: this, element: this,
width: BI.pixFormat(o.width, 2), width: BI.toPix(o.width, 2),
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
adjustLength: 2, adjustLength: 2,
el: this.trigger, el: this.trigger,
popup: { popup: {

6
src/case/combo/textvaluecombo/combo.textvalue.js
Unescape View File

@ -55,7 +55,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
ref: ref => this.trigger = ref, ref: ref => this.trigger = ref,
cls: "text-value-trigger", cls: "text-value-trigger",
items: o.items, items: o.items,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
text: o.text, text: o.text,
value: o.value, value: o.value,
title, title,
@ -116,8 +116,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
return { return {
type: "bi.combo", type: "bi.combo",
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
width: BI.pixFormat(o.width, 2), width: BI.toPix(o.width, 2),
ref: ref => this.combo = ref, ref: ref => this.combo = ref,
container: o.container, container: o.container,
direction: o.direction, direction: o.direction,

4
src/case/layer/panel.js
Unescape View File

@ -59,7 +59,7 @@ BI.Panel = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.left_right_vertical_adapt", type: "bi.left_right_vertical_adapt",
cls: "panel-title bi-header-background bi-border-bottom", cls: "panel-title bi-header-background bi-border-bottom",
height: BI.pixFormat(o.titleHeight, 1), height: BI.toPix(o.titleHeight, 1),
items: { items: {
left: [this.text], left: [this.text],
right: [this.button_group] right: [this.button_group]
@ -67,7 +67,7 @@ BI.Panel = BI.inherit(BI.Widget, {
lhgap: 10, lhgap: 10,
rhgap: 10 rhgap: 10
}, },
height: BI.pixFormat(o.titleHeight, 1) height: BI.toPix(o.titleHeight, 1)
}; };
}, },

2
src/case/linearsegment/button.linear.segment.js
Unescape View File

@ -15,7 +15,7 @@ BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
type: "bi.label", type: "bi.label",
text: o.text, text: o.text,
height: o.height, height: o.height,
textHeight: BI.pixFormat(o.height, 2), textHeight: BI.toPix(o.height, 2),
value: o.value, value: o.value,
hgap: o.hgap, hgap: o.hgap,
ref: function () { ref: function () {

2
src/case/list/list.select.js
Unescape View File

@ -192,7 +192,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0); var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0);
this.list.resetHeight ? this.list.resetHeight(h - toolHeight) : this.list.resetHeight ? this.list.resetHeight(h - toolHeight) :
this.list.element.css({"max-height": BI.toPix(h - toolHeight)}); this.list.element.css({"max-height": BI.pixFormat(h - toolHeight)});
}, },
setNotSelectedValue: function () { setNotSelectedValue: function () {

2
src/case/segment/segment.js
Unescape View File

@ -22,7 +22,7 @@ BI.Segment = BI.inherit(BI.Widget, {
value: o.value, value: o.value,
items: BI.createItems(o.items, { items: BI.createItems(o.items, {
type: "bi.segment_button", type: "bi.segment_button",
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace
}), }),
layout: [ layout: [

4
src/case/tree/treeexpander/tree.expander.popup.js
Unescape View File

@ -25,8 +25,8 @@
}); });
if (o.showLine) { if (o.showLine) {
this.popupView.element.css("margin-left", BI.toPix(-offset * (o.layer + 1))); this.popupView.element.css("margin-left", BI.pixFormat(-offset * (o.layer + 1)));
this.element.css("margin-left", BI.toPix(offset * (o.layer + 1))); this.element.css("margin-left", BI.pixFormat(offset * (o.layer + 1)));
} }
return { return {

6
src/case/trigger/trigger.editor.js
Unescape View File

@ -24,7 +24,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
var self = this, o = this.options, c = this._const; var self = this, o = this.options, c = this._const;
this.editor = BI.createWidget({ this.editor = BI.createWidget({
type: "bi.sign_editor", type: "bi.sign_editor",
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
value: o.value, value: o.value,
validationChecker: o.validationChecker, validationChecker: o.validationChecker,
quitChecker: o.quitChecker, quitChecker: o.quitChecker,
@ -57,7 +57,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
BI.createWidget({ BI.createWidget({
element: this, element: this,
type: "bi.horizontal_fill", type: "bi.horizontal_fill",
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
items: [ items: [
{ {
el: this.editor, el: this.editor,
@ -65,7 +65,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
}, { }, {
el: { el: {
type: "bi.trigger_icon_button", type: "bi.trigger_icon_button",
width: o.triggerWidth || BI.pixFormat(o.height, 2) width: o.triggerWidth || BI.toPix(o.height, 2)
}, },
width: "" width: ""
} }

2
src/case/trigger/trigger.text.select.small.js
Unescape View File

@ -20,7 +20,7 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.small_text_trigger", type: "bi.small_text_trigger",
element: this, element: this,
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
text: obj.text, text: obj.text,
cls: obj.cls, cls: obj.cls,
textHgap: o.textHgap, textHgap: o.textHgap,

4
src/core/4.widget.js
Unescape View File

@ -289,14 +289,14 @@
_initElementWidth: function () { _initElementWidth: function () {
var o = this.options; var o = this.options;
if (BI.isWidthOrHeight(o.width)) { if (BI.isWidthOrHeight(o.width)) {
this.element.css("width", BI.toPix(o.width)); this.element.css("width", BI.pixFormat(o.width));
} }
}, },
_initElementHeight: function () { _initElementHeight: function () {
var o = this.options; var o = this.options;
if (BI.isWidthOrHeight(o.height)) { if (BI.isWidthOrHeight(o.height)) {
this.element.css("height", BI.toPix(o.height)); this.element.css("height", BI.pixFormat(o.height));
} }
}, },

4
src/core/constant/var.js
Unescape View File

@ -16,7 +16,7 @@ BI._.extend(BI, {
pixUnit: "px", pixUnit: "px",
pixRatio: 1, pixRatio: 1,
// 一定返回最终的单位 // 一定返回最终的单位
toPix: function (pix, border) { pixFormat: function (pix, border) {
if (!BI.isNumber(pix)) { if (!BI.isNumber(pix)) {
return pix; return pix;
} }
@ -29,7 +29,7 @@ BI._.extend(BI, {
} }
return length; return length;
}, },
pixFormat: function (pix, border) { toPix: function (pix, border) {
if (!BI.isNumber(pix)) { if (!BI.isNumber(pix)) {
return pix; return pix;
} }

10
src/core/wrapper/layout.js
Unescape View File

@ -42,16 +42,16 @@ BI.Layout = BI.inherit(BI.Widget, {
_init4Margin: function () { _init4Margin: function () {
if (this.options.top) { if (this.options.top) {
this.element.css("top", BI.toPix(this.options.top)); this.element.css("top", BI.pixFormat(this.options.top));
} }
if (this.options.left) { if (this.options.left) {
this.element.css("left", BI.toPix(this.options.left)); this.element.css("left", BI.pixFormat(this.options.left));
} }
if (this.options.bottom) { if (this.options.bottom) {
this.element.css("bottom", BI.toPix(this.options.bottom)); this.element.css("bottom", BI.pixFormat(this.options.bottom));
} }
if (this.options.right) { if (this.options.right) {
this.element.css("right", BI.toPix(this.options.right)); this.element.css("right", BI.pixFormat(this.options.right));
} }
}, },
@ -289,7 +289,7 @@ BI.Layout = BI.inherit(BI.Widget, {
}, },
_optimiseGap: function (gap) { _optimiseGap: function (gap) {
return (gap > 0 && gap < 1) ? (gap * 100).toFixed(1) + "%" : BI.toPix(gap); return (gap > 0 && gap < 1) ? (gap * 100).toFixed(1) + "%" : BI.pixFormat(gap);
}, },
_optimiseItemLgap: function (item) { _optimiseItemLgap: function (item) {

8
src/core/wrapper/layout/layout.flow.js
Unescape View File

@ -137,16 +137,16 @@ BI.FloatRightLayout = BI.inherit(BI.Layout, {
var w = BI.FloatRightLayout.superclass._addElement.apply(this, arguments); var w = BI.FloatRightLayout.superclass._addElement.apply(this, arguments);
w.element.css({position: "relative", float: "right"}); w.element.css({position: "relative", float: "right"});
if (BI.isNotNull(item.left)) { if (BI.isNotNull(item.left)) {
w.element.css({left: BI.toPix(item.left)}); w.element.css({left: BI.pixFormat(item.left)});
} }
if (BI.isNotNull(item.right)) { if (BI.isNotNull(item.right)) {
w.element.css({right: BI.toPix(item.right)}); w.element.css({right: BI.pixFormat(item.right)});
} }
if (BI.isNotNull(item.top)) { if (BI.isNotNull(item.top)) {
w.element.css({top: BI.toPix(item.top)}); w.element.css({top: BI.pixFormat(item.top)});
} }
if (BI.isNotNull(item.bottom)) { if (BI.isNotNull(item.bottom)) {
w.element.css({bottom: BI.toPix(item.bottom)}); w.element.css({bottom: BI.pixFormat(item.bottom)});
} }
if (o.vgap + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item) !== 0) { if (o.vgap + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item) !== 0) {
var top = o.vgap / 2 + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item); var top = o.vgap / 2 + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item);

8
src/core/wrapper/layout/layout.inline.js
Unescape View File

@ -47,7 +47,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
} }
} }
if (columnSize > 0) { if (columnSize > 0) {
w.element.width(columnSize < 1 ? ((columnSize * 100).toFixed(1) + "%") : BI.toPix(columnSize)); w.element.width(columnSize < 1 ? ((columnSize * 100).toFixed(1) + "%") : BI.pixFormat(columnSize));
} }
w.element.css({ w.element.css({
position: "relative", position: "relative",
@ -69,8 +69,8 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
gap += o.hgap + o.lgap + o.rgap + this._optimiseItemLgap(o.items[k]) + this._optimiseItemRgap(o.items[k]) + this._optimiseItemHgap(o.items[k]); gap += o.hgap + o.lgap + o.rgap + this._optimiseItemLgap(o.items[k]) + this._optimiseItemRgap(o.items[k]) + this._optimiseItemHgap(o.items[k]);
length += cz; length += cz;
} }
length = length > 0 && length < 1 ? (length * 100).toFixed(1) + "%" : BI.toPix(length); length = length > 0 && length < 1 ? (length * 100).toFixed(1) + "%" : BI.pixFormat(length);
gap = gap > 0 && gap < 1 ? (gap * 100).toFixed(1) + "%" : BI.toPix(gap); gap = gap > 0 && gap < 1 ? (gap * 100).toFixed(1) + "%" : BI.pixFormat(gap);
if (columnSize === "fill") { if (columnSize === "fill") {
w.element.css("min-width", "calc((100% - " + length + " - " + gap + ")" + (fillCount > 1 ? "/" + fillCount : "") + ")"); w.element.css("min-width", "calc((100% - " + length + " - " + gap + ")" + (fillCount > 1 ? "/" + fillCount : "") + ")");
} }
@ -86,7 +86,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
if (o.verticalAlign === BI.VerticalAlign.Stretch && BI.isNull(item.height)) { if (o.verticalAlign === BI.VerticalAlign.Stretch && BI.isNull(item.height)) {
var top = o.innerVgap + o.vgap + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item), var top = o.innerVgap + o.vgap + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item),
bottom = o.innerVgap + o.vgap + o.bgap + this._optimiseItemBgap(item) + this._optimiseItemVgap(item); bottom = o.innerVgap + o.vgap + o.bgap + this._optimiseItemBgap(item) + this._optimiseItemVgap(item);
var gap = (top + bottom) > 0 && (top + bottom) < 1 ? ((top + bottom) * 100).toFixed(1) + "%" : BI.toPix(top + bottom); var gap = (top + bottom) > 0 && (top + bottom) < 1 ? ((top + bottom) * 100).toFixed(1) + "%" : BI.pixFormat(top + bottom);
w.element.css("height", "calc(100% - " + gap + ")"); w.element.css("height", "calc(100% - " + gap + ")");
} }
return w; return w;

2
src/widget/date/calendar/popup.month.js
Unescape View File

@ -68,7 +68,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
whiteSpace: "nowrap", whiteSpace: "nowrap",
once: false, once: false,
forceSelected: true, forceSelected: true,
height: BI.pixFormat(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1), height: BI.toPix(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1),
width: 30, width: 30,
value: td, value: td,
text: td, text: td,

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

@ -50,13 +50,13 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
el: { el: {
type: "bi.horizontal_fill", type: "bi.horizontal_fill",
columnSize: [this.constants.iconWidth, "fill"], columnSize: [this.constants.iconWidth, "fill"],
height: BI.pixFormat(opts.height, border), height: BI.toPix(opts.height, border),
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: BI.pixFormat(opts.height, border), width: BI.toPix(opts.height, border),
height: BI.pixFormat(opts.height, border), height: BI.toPix(opts.height, border),
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
@ -69,8 +69,8 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
format: opts.format, format: opts.format,
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark, watermark: opts.watermark,
iconWidth: BI.pixFormat(opts.height, border), iconWidth: BI.toPix(opts.height, border),
height: BI.pixFormat(opts.height, border), height: BI.toPix(opts.height, border),
value: opts.value, value: opts.value,
ref: function () { ref: function () {
self.trigger = this; self.trigger = this;

2
src/widget/dynamicdate/dynamicdate.param.item.js
Unescape View File

@ -21,7 +21,7 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.sign_editor", type: "bi.sign_editor",
cls: "bi-border bi-focus-shadow bi-border-radius", cls: "bi-border bi-focus-shadow bi-border-radius",
height: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 2), height: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 2),
validationChecker: function (v) { validationChecker: function (v) {
return BI.isNaturalNumber(v); return BI.isNaturalNumber(v);
}, },

6
src/widget/dynamicdate/dynamicdate.popup.js
Unescape View File

@ -26,7 +26,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
cls: "bi-high-light bi-split-top", cls: "bi-high-light bi-split-top",
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_Clear"), text: BI.i18nText("BI-Basic_Clear"),
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
listeners: [{ listeners: [{
eventName: BI.TextButton.EVENT_CHANGE, eventName: BI.TextButton.EVENT_CHANGE,
action: function () { action: function () {
@ -37,7 +37,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top", cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
shadow: true, shadow: true,
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
text: BI.i18nText("BI-Multi_Date_Today"), text: BI.i18nText("BI-Multi_Date_Today"),
disabled: this._checkTodayValid(), disabled: this._checkTodayValid(),
ref: function () { ref: function () {
@ -52,7 +52,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
}, { }, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-high-light bi-split-top", cls: "bi-high-light bi-split-top",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_OK"), text: BI.i18nText("BI-Basic_OK"),
listeners: [{ listeners: [{

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

@ -50,13 +50,13 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
el: { el: {
type: "bi.horizontal_fill", type: "bi.horizontal_fill",
columnSize: [this.constants.iconWidth, "fill"], columnSize: [this.constants.iconWidth, "fill"],
height: BI.pixFormat(opts.height, border), height: BI.toPix(opts.height, border),
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: this.constants.iconWidth, width: this.constants.iconWidth,
height: BI.pixFormat(opts.height, border), height: BI.toPix(opts.height, border),
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }
@ -70,7 +70,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
watermark: opts.watermark, watermark: opts.watermark,
format: opts.format, format: opts.format,
iconWidth: this.constants.iconWidth, iconWidth: this.constants.iconWidth,
height: BI.pixFormat(opts.height, border), height: BI.toPix(opts.height, border),
value: opts.value, value: opts.value,
ref: function () { ref: function () {
self.trigger = this; self.trigger = this;

6
src/widget/dynamicdatetime/dynamicdatetime.popup.js
Unescape View File

@ -25,7 +25,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
items: [[{ items: [[{
type: "bi.text_button", type: "bi.text_button",
cls: "bi-high-light bi-split-top", cls: "bi-high-light bi-split-top",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_Clear"), text: BI.i18nText("BI-Basic_Clear"),
listeners: [{ listeners: [{
@ -37,7 +37,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
}, { }, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top", cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
shadow: true, shadow: true,
text: BI.i18nText("BI-Multi_Date_Today"), text: BI.i18nText("BI-Multi_Date_Today"),
disabled: this._checkTodayValid(), disabled: this._checkTodayValid(),
@ -53,7 +53,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
}, { }, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-high-light bi-split-top", cls: "bi-high-light bi-split-top",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_OK"), text: BI.i18nText("BI-Basic_OK"),
listeners: [{ listeners: [{

4
src/widget/editor/editor.search.js
Unescape View File

@ -20,7 +20,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.editor = BI.createWidget(o.el, { this.editor = BI.createWidget(o.el, {
type: "bi.editor", type: "bi.editor",
simple: o.simple, simple: o.simple,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
watermark: o.watermark, watermark: o.watermark,
allowBlank: true, allowBlank: true,
hgap: 1, hgap: 1,
@ -44,7 +44,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
element: this, element: this,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
type: "bi.htape", type: "bi.htape",
items: [ items: [
{ {

4
src/widget/editor/editor.text.js
Unescape View File

@ -29,8 +29,8 @@ BI.TextEditor = BI.inherit(BI.Widget, {
this.editor = BI.createWidget({ this.editor = BI.createWidget({
type: "bi.editor", type: "bi.editor",
element: this, element: this,
width: BI.pixFormat(o.width, border), width: BI.toPix(o.width, border),
height: BI.pixFormat(o.height, border), height: BI.toPix(o.height, border),
simple: o.simple, simple: o.simple,
hgap: o.hgap, hgap: o.hgap,
vgap: o.vgap, vgap: o.vgap,

8
src/widget/intervalslider/intervalslider.js
Unescape View File

@ -60,8 +60,8 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
cls: "slider-editor-button", cls: "slider-editor-button",
text: this.options.unit, text: this.options.unit,
allowBlank: false, allowBlank: false,
width: BI.pixFormat(c.EDITOR_WIDTH, 2), width: BI.toPix(c.EDITOR_WIDTH, 2),
height: BI.pixFormat(c.EDITOR_HEIGHT, 2), height: BI.toPix(c.EDITOR_HEIGHT, 2),
validationChecker: function (v) { validationChecker: function (v) {
return self._checkValidation(v); return self._checkValidation(v);
} }
@ -88,8 +88,8 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
cls: "slider-editor-button", cls: "slider-editor-button",
text: this.options.unit, text: this.options.unit,
allowBlank: false, allowBlank: false,
width: BI.pixFormat(c.EDITOR_WIDTH, 2), width: BI.toPix(c.EDITOR_WIDTH, 2),
height: BI.pixFormat(c.EDITOR_HEIGHT, 2), height: BI.toPix(c.EDITOR_HEIGHT, 2),
validationChecker: function (v) { validationChecker: function (v) {
return self._checkValidation(v); return self._checkValidation(v);
} }

16
src/widget/multilayerselecttree/multilayerselecttree.combo.js
Unescape View File

@ -31,8 +31,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
if (o.allowEdit) { if (o.allowEdit) {
return { return {
type: "bi.absolute", type: "bi.absolute",
width: BI.pixFormat(o.width, 2), width: BI.toPix(o.width, 2),
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
cls, cls,
items: [ items: [
{ {
@ -54,7 +54,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
}, },
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
items: o.items, items: o.items,
value: o.value, value: o.value,
tipType: o.tipType, tipType: o.tipType,
@ -68,8 +68,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options; var self = this, o = this.options;
return { return {
type: "bi.combo", type: "bi.combo",
width: BI.pixFormat(o.width, 2), width: BI.toPix(o.width, 2),
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
container: o.container, container: o.container,
destroyWhenHide: o.destroyWhenHide, destroyWhenHide: o.destroyWhenHide,
adjustLength: 2, adjustLength: 2,
@ -133,7 +133,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
watermark: o.watermark, watermark: o.watermark,
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,
value: o.value, value: o.value,
@ -209,8 +209,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
self.triggerBtn = _ref; self.triggerBtn = _ref;
}, },
width: BI.pixFormat(o.height, 2), width: BI.toPix(o.height, 2),
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
listeners: [ listeners: [
{ {
eventName: BI.TriggerIconButton.EVENT_CHANGE, eventName: BI.TriggerIconButton.EVENT_CHANGE,

2
src/widget/multilayerselecttree/multilayerselecttree.popup.js
Unescape View File

@ -56,7 +56,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.MultiLayerSelectTreePopup.EVENT_CHANGE); self.fireEvent(BI.MultiLayerSelectTreePopup.EVENT_CHANGE);
}); });
this.tree.css("min-height", BI.toPix(o.minHeight - 10)); this.tree.css("min-height", BI.pixFormat(o.minHeight - 10));
}, },
getValue: function () { getValue: function () {

12
src/widget/multilayersingletree/multilayersingletree.combo.js
Unescape View File

@ -33,8 +33,8 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
if (o.allowEdit) { if (o.allowEdit) {
return { return {
type: "bi.absolute", type: "bi.absolute",
width: BI.pixFormat(o.width, 2), width: BI.toPix(o.width, 2),
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
cls, cls,
items: [ items: [
{ {
@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
}, },
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
items: o.items, items: o.items,
value: o.value, value: o.value,
tipType: o.tipType, tipType: o.tipType,
@ -131,7 +131,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
items: o.items, items: o.items,
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,
value: o.value, value: o.value,
@ -205,8 +205,8 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
ref: function (_ref) { ref: function (_ref) {
self.triggerBtn = _ref; self.triggerBtn = _ref;
}, },
width: BI.pixFormat(o.height, 2), width: BI.toPix(o.height, 2),
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
listeners: [ listeners: [
{ {
eventName: BI.TriggerIconButton.EVENT_CHANGE, eventName: BI.TriggerIconButton.EVENT_CHANGE,

2
src/widget/multilayersingletree/multilayersingletree.popup.js
Unescape View File

@ -55,7 +55,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Widget, {
self.fireEvent(BI.MultiLayerSingleTreePopup.EVENT_CHANGE); self.fireEvent(BI.MultiLayerSingleTreePopup.EVENT_CHANGE);
}); });
this.tree.css("min-height", BI.toPix(o.minHeight - 10)); this.tree.css("min-height", BI.pixFormat(o.minHeight - 10));
}, },
getValue: function () { getValue: function () {

2
src/widget/multiselect/multiselect.combo.js
Unescape View File

@ -45,7 +45,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,
masker: { masker: {

2
src/widget/multiselect/multiselect.combo.nobar.js
Unescape View File

@ -41,7 +41,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,
masker: { masker: {

2
src/widget/multiselect/multiselect.insert.combo.js
Unescape View File

@ -40,7 +40,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_insert_trigger", type: "bi.multi_select_insert_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
text: o.text, text: o.text,
watermark: o.watermark, watermark: o.watermark,
defaultText: o.defaultText, defaultText: o.defaultText,

2
src/widget/multiselect/multiselect.insert.combo.nobar.js
Unescape View File

@ -41,7 +41,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_insert_trigger", type: "bi.multi_select_insert_trigger",
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
text: o.text, text: o.text,
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {

2
src/widget/multitree/multi.tree.combo.js
Unescape View File

@ -27,7 +27,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,

2
src/widget/multitree/multi.tree.insert.combo.js
Unescape View File

@ -28,7 +28,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.multi_select_trigger", type: "bi.multi_select_trigger",
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,

2
src/widget/multitree/multi.tree.list.combo.js
Unescape View File

@ -32,7 +32,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,
watermark: o.watermark, watermark: o.watermark,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
masker: { masker: {
offset: { offset: {

4
src/widget/numbereditor/number.editor.js
Unescape View File

@ -27,7 +27,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
var self = this, o = this.options; var self = this, o = this.options;
this.editor = BI.createWidget({ this.editor = BI.createWidget({
type: "bi.sign_editor", type: "bi.sign_editor",
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
simple: o.simple, simple: o.simple,
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
value: o.valueFormatter(o.value), value: o.valueFormatter(o.value),
@ -87,7 +87,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
}); });
BI.createWidget({ BI.createWidget({
type: "bi.htape", type: "bi.htape",
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
element: this, element: this,
items: [this.editor, { items: [this.editor, {
el: { el: {

18
src/widget/numberinterval/numberinterval.js
Unescape View File

@ -36,7 +36,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
BI.NumberInterval.superclass._init.apply(this, arguments); BI.NumberInterval.superclass._init.apply(this, arguments);
this.smallEditor = BI.createWidget({ this.smallEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
watermark: o.watermark, watermark: o.watermark,
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
value: o.min, value: o.min,
@ -61,7 +61,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.smallTip = BI.createWidget({ this.smallTip = BI.createWidget({
type: "bi.label", type: "bi.label",
text: o.numTip, text: o.numTip,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
invisible: true invisible: true
}); });
BI.createWidget({ BI.createWidget({
@ -76,7 +76,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigEditor = BI.createWidget({ this.bigEditor = BI.createWidget({
type: "bi.number_interval_single_editor", type: "bi.number_interval_single_editor",
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
watermark: o.watermark, watermark: o.watermark,
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
value: o.max, value: o.max,
@ -99,7 +99,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
this.bigTip = BI.createWidget({ this.bigTip = BI.createWidget({
type: "bi.label", type: "bi.label",
text: o.numTip, text: o.numTip,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
invisible: true invisible: true
}); });
BI.createWidget({ BI.createWidget({
@ -114,8 +114,8 @@ 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" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right bi-border-corner-right-radius"), cls: "number-interval-small-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right bi-border-corner-right-radius"),
height: BI.pixFormat(o.height, o.simple ? 0 : 2), height: BI.toPix(o.height, o.simple ? 0 : 2),
width: BI.pixFormat(c.width, c.border), width: BI.toPix(c.width, c.border),
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
iconCls: "less-font", iconCls: "less-font",
@ -134,8 +134,8 @@ 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" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left bi-border-corner-left-radius"), cls: "number-interval-big-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left bi-border-corner-left-radius"),
height: BI.pixFormat(o.height, o.simple ? 0 : 2), height: BI.toPix(o.height, o.simple ? 0 : 2),
width: BI.pixFormat(c.width, c.border), width: BI.toPix(c.width, c.border),
items: [{ items: [{
text: "(" + BI.i18nText("BI-Less_Than") + ")", text: "(" + BI.i18nText("BI-Less_Than") + ")",
iconCls: "less-font", iconCls: "less-font",
@ -155,7 +155,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
type: "bi.label", type: "bi.label",
text: BI.i18nText("BI-Basic_Value"), text: BI.i18nText("BI-Basic_Value"),
textHeight: o.height, textHeight: o.height,
// width: BI.pixFormat(o.width, o.simple ? 0 : c.border * 2), // width: BI.toPix(o.width, o.simple ? 0 : c.border * 2),
hgap: 5, hgap: 5,
height: o.height, height: o.height,
level: "warning", level: "warning",

2
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
Unescape View File

@ -35,7 +35,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.search_multi_select_trigger", type: "bi.search_multi_select_trigger",
text: o.text, text: o.text,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {

6
src/widget/selecttree/selecttree.combo.js
Unescape View File

@ -22,7 +22,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.single_tree_trigger", type: "bi.single_tree_trigger",
text: o.text, text: o.text,
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
items: o.items, items: o.items,
value: o.value, value: o.value,
allowClear: o.allowClear, allowClear: o.allowClear,
@ -41,8 +41,8 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
width: BI.pixFormat(o.width, 2), width: BI.toPix(o.width, 2),
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
container: o.container, container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,

2
src/widget/singleselect/singleselect.combo.js
Unescape View File

@ -31,7 +31,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.single_select_trigger", type: "bi.single_select_trigger",
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
// adapter: this.popup, // adapter: this.popup,
allowNoSelect: o.allowNoSelect, allowNoSelect: o.allowNoSelect,
allowEdit: o.allowEdit, allowEdit: o.allowEdit,

2
src/widget/singleselect/singleselect.insert.combo.js
Unescape View File

@ -32,7 +32,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.single_select_trigger", type: "bi.single_select_trigger",
watermark: o.watermark, watermark: o.watermark,
height: BI.pixFormat(o.height, o.simple ? 1 : 2), height: BI.toPix(o.height, o.simple ? 1 : 2),
allowNoSelect: o.allowNoSelect, allowNoSelect: o.allowNoSelect,
allowEdit: o.allowEdit, allowEdit: o.allowEdit,
// adapter: this.popup, // adapter: this.popup,

2
src/widget/singleselect/singleselect.list.js
Unescape View File

@ -120,7 +120,7 @@ BI.SingleSelectList = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
this.list.resetHeight ? this.list.resetHeight(h) : this.list.resetHeight ? this.list.resetHeight(h) :
this.list.element.css({"max-height": BI.toPix(h - (this.options.allowNoSelect ? this._constants.itemHeight : 0))}); this.list.element.css({"max-height": BI.pixFormat(h - (this.options.allowNoSelect ? this._constants.itemHeight : 0))});
}, },
setNotSelectedValue: function () { setNotSelectedValue: function () {

4
src/widget/singleslider/singleslider.js
Unescape View File

@ -99,8 +99,8 @@ BI.SingleSlider = BI.inherit(BI.Single, {
type: "bi.sign_text_editor", type: "bi.sign_text_editor",
cls: "slider-editor-button", cls: "slider-editor-button",
text: o.unit, text: o.unit,
width: BI.pixFormat(c.EDITOR_WIDTH, 2), width: BI.toPix(c.EDITOR_WIDTH, 2),
height: BI.pixFormat(c.EDITOR_HEIGHT, 2), height: BI.toPix(c.EDITOR_HEIGHT, 2),
allowBlank: false, allowBlank: false,
textAlign: "center", textAlign: "center",
validationChecker: function (v) { validationChecker: function (v) {

2
src/widget/singleslider/singleslider.label.js
Unescape View File

@ -97,7 +97,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, {
this.label = BI.createWidget({ this.label = BI.createWidget({
type: "bi.label", type: "bi.label",
height: c.HEIGHT, height: c.HEIGHT,
width: BI.pixFormat(c.EDITOR_WIDTH, 2) width: BI.toPix(c.EDITOR_WIDTH, 2)
}); });
this._setVisible(false); this._setVisible(false);

6
src/widget/singletree/singletree.combo.js
Unescape View File

@ -24,7 +24,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
type: "bi.single_tree_trigger", type: "bi.single_tree_trigger",
text: o.text, text: o.text,
defaultText: o.defaultText, defaultText: o.defaultText,
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
items: o.items, items: o.items,
value: o.value, value: o.value,
allowClear: o.allowClear, allowClear: o.allowClear,
@ -43,8 +43,8 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
width: BI.pixFormat(o.width, 2), width: BI.toPix(o.width, 2),
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
container: o.container, container: o.container,
element: this, element: this,
adjustLength: 2, adjustLength: 2,

6
src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
Unescape View File

@ -22,7 +22,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.down_list_select_text_trigger", type: "bi.down_list_select_text_trigger",
cls: "text-value-down-list-trigger", cls: "text-value-down-list-trigger",
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
items: o.items, items: o.items,
text: o.text, text: o.text,
value: value value: value
@ -33,8 +33,8 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
element: this, element: this,
chooseType: BI.Selection.Single, chooseType: BI.Selection.Single,
adjustLength: 2, adjustLength: 2,
width: BI.pixFormat(o.width, 2), width: BI.toPix(o.width, 2),
height: BI.pixFormat(o.height, 2), height: BI.toPix(o.height, 2),
el: this.trigger, el: this.trigger,
value: BI.isNull(value) ? [] : [value], value: BI.isNull(value) ? [] : [value],
items: BI.deepClone(o.items) items: BI.deepClone(o.items)

4
src/widget/time/time.combo.js
Unescape View File

@ -72,10 +72,10 @@
el: { el: {
type: "bi.horizontal_fill", type: "bi.horizontal_fill",
columnSize: ["fill", this.constants.iconWidth], columnSize: ["fill", this.constants.iconWidth],
height: BI.pixFormat(opts.height, 2), height: BI.toPix(opts.height, 2),
items: [{ items: [{
type: "bi.time_trigger", type: "bi.time_trigger",
height: BI.pixFormat(opts.height, 2), height: BI.toPix(opts.height, 2),
allowEdit: opts.allowEdit, allowEdit: opts.allowEdit,
watermark: opts.watermark, watermark: opts.watermark,
format: opts.format, format: opts.format,

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

@ -23,7 +23,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
simple: o.simple, simple: o.simple,
min: o.minDate, min: o.minDate,
max: o.maxDate, max: o.maxDate,
height: BI.pixFormat(o.height, border), height: BI.toPix(o.height, border),
value: o.value || "", value: o.value || "",
watermark: o.watermark watermark: o.watermark
}); });
@ -143,7 +143,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button", cls: "bi-trigger-icon-button",
width: this._const.iconWidth, width: this._const.iconWidth,
height: BI.pixFormat(o.height, border), height: BI.toPix(o.height, border),
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }

6
src/widget/year/popup.year.js
Unescape View File

@ -32,7 +32,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
items: [[{ items: [[{
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-top bi-high-light", cls: "bi-split-top bi-high-light",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_Clear"), text: BI.i18nText("BI-Basic_Clear"),
listeners: [{ listeners: [{
@ -43,7 +43,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}] }]
}, { }, {
type: "bi.text_button", type: "bi.text_button",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
cls: "bi-split-left bi-split-right bi-high-light bi-split-top", cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_Current_Year"), text: BI.i18nText("BI-Basic_Current_Year"),
@ -60,7 +60,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
}, { }, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-top bi-high-light", cls: "bi-split-top bi-high-light",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_OK"), text: BI.i18nText("BI-Basic_OK"),
listeners: [{ listeners: [{

2
src/widget/yearmonth/card.static.yearmonth.js
Unescape View File

@ -19,7 +19,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
whiteSpace: "nowrap", whiteSpace: "nowrap",
once: false, once: false,
forceSelected: true, forceSelected: true,
height: BI.pixFormat(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1), height: BI.toPix(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1),
width: 38, width: 38,
value: td, value: td,
text: td, text: td,

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

@ -22,7 +22,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
simple: o.simple, simple: o.simple,
min: o.minDate, min: o.minDate,
max: o.maxDate, max: o.maxDate,
height: BI.pixFormat(o.height, border), height: BI.toPix(o.height, border),
value: o.value || "", value: o.value || "",
watermark: o.watermark, watermark: o.watermark,
}); });
@ -142,8 +142,8 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
el: { el: {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button", cls: "bi-trigger-icon-button",
width: BI.pixFormat(o.height, border), width: BI.toPix(o.height, border),
height: BI.pixFormat(o.height, border), height: BI.toPix(o.height, border),
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }

6
src/widget/yearmonth/popup.yearmonth.js
Unescape View File

@ -32,7 +32,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
items: [[{ items: [[{
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-top bi-high-light", cls: "bi-split-top bi-high-light",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_Clear"), text: BI.i18nText("BI-Basic_Clear"),
listeners: [{ listeners: [{
@ -44,7 +44,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, { }, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top", cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_Current_Month"), text: BI.i18nText("BI-Basic_Current_Month"),
disabled: this._checkTodayValid(), disabled: this._checkTodayValid(),
@ -60,7 +60,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
}, { }, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-top bi-high-light", cls: "bi-split-top bi-high-light",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_OK"), text: BI.i18nText("BI-Basic_OK"),
listeners: [{ listeners: [{

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

@ -25,7 +25,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
simple: o.simple, simple: o.simple,
min: o.minDate, min: o.minDate,
max: o.maxDate, max: o.maxDate,
height: BI.pixFormat(o.height, border), height: BI.toPix(o.height, border),
value: o.value || "", value: o.value || "",
watermark: o.watermark, watermark: o.watermark,
}); });
@ -146,7 +146,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
type: "bi.icon_button", type: "bi.icon_button",
cls: "bi-trigger-icon-button", cls: "bi-trigger-icon-button",
width: this._consts.iconWidth, width: this._consts.iconWidth,
height: BI.pixFormat(o.height, border), height: BI.toPix(o.height, border),
ref: function () { ref: function () {
self.changeIcon = this; self.changeIcon = this;
} }

6
src/widget/yearquarter/popup.yearquarter.js
Unescape View File

@ -27,7 +27,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-top bi-high-light", cls: "bi-split-top bi-high-light",
shadow: true, shadow: true,
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
text: BI.i18nText("BI-Basic_Clear"), text: BI.i18nText("BI-Basic_Clear"),
listeners: [{ listeners: [{
eventName: BI.TextButton.EVENT_CHANGE, eventName: BI.TextButton.EVENT_CHANGE,
@ -38,7 +38,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
}, { }, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-left bi-split-right bi-high-light bi-split-top", cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
shadow: true, shadow: true,
text: BI.i18nText("BI-Basic_Current_Quarter"), text: BI.i18nText("BI-Basic_Current_Quarter"),
disabled: this._checkTodayValid(), disabled: this._checkTodayValid(),
@ -55,7 +55,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
type: "bi.text_button", type: "bi.text_button",
cls: "bi-split-top bi-high-light", cls: "bi-split-top bi-high-light",
shadow: true, shadow: true,
textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1), textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
text: BI.i18nText("BI-Basic_OK"), text: BI.i18nText("BI-Basic_OK"),
listeners: [{ listeners: [{
eventName: BI.TextButton.EVENT_CHANGE, eventName: BI.TextButton.EVENT_CHANGE,

Write Preview
Loading…
Cancel
Save