caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

去Bubble中的固定值 && 去action && 去set方法中的get方法

es6
windy 6 years ago
parent
2a02e9263b
commit
2f6807b0fb
14 changed files with 144 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      dist/base.js
  2. 59
      dist/bundle.js
  3. 9
      dist/case.js
  4. 15
      dist/core.js
  5. 59
      dist/fineui.js
  6. 31
      dist/widget.js
  7. 4
      src/base/single/editor/editor.js
  8. 6
      src/case/colorchooser/colorpicker/editor.colorpicker.js
  9. 1
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  10. 1
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  11. 1
      src/case/combo/textvaluecombo/combo.textvalue.js
  12. 1
      src/component/treevaluechooser/combo.treevaluechooser.js
  13. 15
      src/core/controller/controller.bubbles.js
  14. 30
      src/widget/numberinterval/numberinterval.js

4
dist/base.js vendored
Unescape View File

@ -18567,7 +18567,9 @@ BI.Editor = BI.inherit(BI.Single, {
errorText = errorText(this.editor.getValue());
}
if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this);
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
adjustLength: 2
});
this._checkToolTip();
return BI.Bubbles.get(this.getName());
}

59
dist/bundle.js vendored
Unescape View File

@ -26766,6 +26766,7 @@ BI.BubblesController = BI.inherit(BI.Controller, {
var container = opt.container || context;
var offsetStyle = opt.offsetStyle || {};
var level = opt.level || "error";
var adjustLength = opt.adjustLength || 0;
if (!this.storeBubbles[name]) {
this.storeBubbles[name] = {};
}
@ -26781,9 +26782,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["top"]);
var position = this._getTopPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left, top: position.top - 2});
this.get(name).element.css({left: position.left, top: position.top - adjustLength});
this.get(name).invisible();
if (!$.isTopSpaceEnough(context, this.get(name), 2)) {
if (!$.isTopSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["left"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30);
}
@ -26796,9 +26797,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["left"]);
var position = this._getLeftPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left - 2, top: position.top});
this.get(name).element.css({left: position.left - adjustLength, top: position.top});
this.get(name).invisible();
if (!$.isLeftSpaceEnough(context, this.get(name), 2)) {
if (!$.isLeftSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["right"]) {
this.storeBubbles[name]["right"] = this._createBubble("right", text, level, 30);
}
@ -26811,9 +26812,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["right"]);
var position = this._getRightPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left + 2, top: position.top});
this.get(name).element.css({left: position.left + adjustLength, top: position.top});
this.get(name).invisible();
if (!$.isRightSpaceEnough(context, this.get(name), 2)) {
if (!$.isRightSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
}
@ -26826,7 +26827,7 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["bottom"]);
var position = this._getBottomPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left, top: position.top + 2});
this.get(name).element.css({left: position.left, top: position.top + adjustLength});
this.get(name).invisible();
}
}
@ -54372,7 +54373,9 @@ BI.Editor = BI.inherit(BI.Single, {
errorText = errorText(this.editor.getValue());
}
if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this);
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
adjustLength: 2
});
this._checkToolTip();
return BI.Bubbles.get(this.getName());
}
@ -77203,7 +77206,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
_setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this._showPreColor(this.getValue());
this._showPreColor(this._isEmptyRGB() && this.transparent.isSelected() ? "transparent" : BI.DOM.rgb2hex(BI.DOM.json2rgb({
r: this.storeValue.r,
g: this.storeValue.g,
b: this.storeValue.b
})));
},
setValue: function (color) {
@ -78500,7 +78507,6 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.trigger = BI.createWidget({
type: "bi.select_icon_text_trigger",
action: o.action,
items: o.items,
height: o.height,
text: o.text,
@ -78666,7 +78672,6 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
ref: function () {
self.trigger = this;
},
action: o.action,
items: o.items,
height: o.height - 2,
text: o.text,
@ -79256,7 +79261,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.trigger = BI.createWidget({
type: "bi.select_text_trigger",
action: o.action,
items: o.items,
height: o.height,
text: o.text,
@ -102140,7 +102144,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
border: 1,
less: 0,
less_equal: 1,
numTip: ""
numTip: "",
adjustLength: 2
},
_defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
@ -102426,17 +102431,20 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
default :
@ -102472,7 +102480,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
w.on(BI.Editor.EVENT_ERROR, function () {
self._checkValidation();
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
});
@ -102485,13 +102494,15 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
@ -102508,17 +102519,20 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
default :
@ -113055,7 +113069,6 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_tree_combo",
trigger: o.trigger,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),

9
dist/case.js vendored
Unescape View File

@ -4638,7 +4638,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
_setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this._showPreColor(this.getValue());
this._showPreColor(this._isEmptyRGB() && this.transparent.isSelected() ? "transparent" : BI.DOM.rgb2hex(BI.DOM.json2rgb({
r: this.storeValue.r,
g: this.storeValue.g,
b: this.storeValue.b
})));
},
setValue: function (color) {
@ -5935,7 +5939,6 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.trigger = BI.createWidget({
type: "bi.select_icon_text_trigger",
action: o.action,
items: o.items,
height: o.height,
text: o.text,
@ -6101,7 +6104,6 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
ref: function () {
self.trigger = this;
},
action: o.action,
items: o.items,
height: o.height - 2,
text: o.text,
@ -6691,7 +6693,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.trigger = BI.createWidget({
type: "bi.select_text_trigger",
action: o.action,
items: o.items,
height: o.height,
text: o.text,

15
dist/core.js vendored
Unescape View File

@ -26766,6 +26766,7 @@ BI.BubblesController = BI.inherit(BI.Controller, {
var container = opt.container || context;
var offsetStyle = opt.offsetStyle || {};
var level = opt.level || "error";
var adjustLength = opt.adjustLength || 0;
if (!this.storeBubbles[name]) {
this.storeBubbles[name] = {};
}
@ -26781,9 +26782,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["top"]);
var position = this._getTopPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left, top: position.top - 2});
this.get(name).element.css({left: position.left, top: position.top - adjustLength});
this.get(name).invisible();
if (!$.isTopSpaceEnough(context, this.get(name), 2)) {
if (!$.isTopSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["left"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30);
}
@ -26796,9 +26797,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["left"]);
var position = this._getLeftPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left - 2, top: position.top});
this.get(name).element.css({left: position.left - adjustLength, top: position.top});
this.get(name).invisible();
if (!$.isLeftSpaceEnough(context, this.get(name), 2)) {
if (!$.isLeftSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["right"]) {
this.storeBubbles[name]["right"] = this._createBubble("right", text, level, 30);
}
@ -26811,9 +26812,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["right"]);
var position = this._getRightPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left + 2, top: position.top});
this.get(name).element.css({left: position.left + adjustLength, top: position.top});
this.get(name).invisible();
if (!$.isRightSpaceEnough(context, this.get(name), 2)) {
if (!$.isRightSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
}
@ -26826,7 +26827,7 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["bottom"]);
var position = this._getBottomPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left, top: position.top + 2});
this.get(name).element.css({left: position.left, top: position.top + adjustLength});
this.get(name).invisible();
}
}

59
dist/fineui.js vendored
Unescape View File

@ -27015,6 +27015,7 @@ BI.BubblesController = BI.inherit(BI.Controller, {
var container = opt.container || context;
var offsetStyle = opt.offsetStyle || {};
var level = opt.level || "error";
var adjustLength = opt.adjustLength || 0;
if (!this.storeBubbles[name]) {
this.storeBubbles[name] = {};
}
@ -27030,9 +27031,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["top"]);
var position = this._getTopPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left, top: position.top - 2});
this.get(name).element.css({left: position.left, top: position.top - adjustLength});
this.get(name).invisible();
if (!$.isTopSpaceEnough(context, this.get(name), 2)) {
if (!$.isTopSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["left"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30);
}
@ -27045,9 +27046,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["left"]);
var position = this._getLeftPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left - 2, top: position.top});
this.get(name).element.css({left: position.left - adjustLength, top: position.top});
this.get(name).invisible();
if (!$.isLeftSpaceEnough(context, this.get(name), 2)) {
if (!$.isLeftSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["right"]) {
this.storeBubbles[name]["right"] = this._createBubble("right", text, level, 30);
}
@ -27060,9 +27061,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["right"]);
var position = this._getRightPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left + 2, top: position.top});
this.get(name).element.css({left: position.left + adjustLength, top: position.top});
this.get(name).invisible();
if (!$.isRightSpaceEnough(context, this.get(name), 2)) {
if (!$.isRightSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
}
@ -27075,7 +27076,7 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["bottom"]);
var position = this._getBottomPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left, top: position.top + 2});
this.get(name).element.css({left: position.left, top: position.top + adjustLength});
this.get(name).invisible();
}
}
@ -54621,7 +54622,9 @@ BI.Editor = BI.inherit(BI.Single, {
errorText = errorText(this.editor.getValue());
}
if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this);
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
adjustLength: 2
});
this._checkToolTip();
return BI.Bubbles.get(this.getName());
}
@ -77452,7 +77455,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
_setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this._showPreColor(this.getValue());
this._showPreColor(this._isEmptyRGB() && this.transparent.isSelected() ? "transparent" : BI.DOM.rgb2hex(BI.DOM.json2rgb({
r: this.storeValue.r,
g: this.storeValue.g,
b: this.storeValue.b
})));
},
setValue: function (color) {
@ -78749,7 +78756,6 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.trigger = BI.createWidget({
type: "bi.select_icon_text_trigger",
action: o.action,
items: o.items,
height: o.height,
text: o.text,
@ -78915,7 +78921,6 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
ref: function () {
self.trigger = this;
},
action: o.action,
items: o.items,
height: o.height - 2,
text: o.text,
@ -79505,7 +79510,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.trigger = BI.createWidget({
type: "bi.select_text_trigger",
action: o.action,
items: o.items,
height: o.height,
text: o.text,
@ -102389,7 +102393,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
border: 1,
less: 0,
less_equal: 1,
numTip: ""
numTip: "",
adjustLength: 2
},
_defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
@ -102675,17 +102680,20 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
default :
@ -102721,7 +102729,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
w.on(BI.Editor.EVENT_ERROR, function () {
self._checkValidation();
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
});
@ -102734,13 +102743,15 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
@ -102757,17 +102768,20 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
default :
@ -113304,7 +113318,6 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_tree_combo",
trigger: o.trigger,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),

31
dist/widget.js vendored
Unescape View File

@ -14334,7 +14334,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
border: 1,
less: 0,
less_equal: 1,
numTip: ""
numTip: "",
adjustLength: 2
},
_defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
@ -14620,17 +14621,20 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
default :
@ -14666,7 +14670,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
w.on(BI.Editor.EVENT_ERROR, function () {
self._checkValidation();
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
});
@ -14679,13 +14684,15 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
@ -14702,17 +14709,20 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
default :
@ -25249,7 +25259,6 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_tree_combo",
trigger: o.trigger,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),

4
src/base/single/editor/editor.js
Unescape View File

@ -226,7 +226,9 @@ BI.Editor = BI.inherit(BI.Single, {
errorText = errorText(this.editor.getValue());
}
if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this);
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
adjustLength: 2
});
this._checkToolTip();
return BI.Bubbles.get(this.getName());
}

6
src/case/colorchooser/colorpicker/editor.colorpicker.js
Unescape View File

@ -192,7 +192,11 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
_setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this._showPreColor(this.getValue());
this._showPreColor(this._isEmptyRGB() && this.transparent.isSelected() ? "transparent" : BI.DOM.rgb2hex(BI.DOM.json2rgb({
r: this.storeValue.r,
g: this.storeValue.g,
b: this.storeValue.b
})));
},
setValue: function (color) {

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

@ -18,7 +18,6 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.trigger = BI.createWidget({
type: "bi.select_icon_text_trigger",
action: o.action,
items: o.items,
height: o.height,
text: o.text,

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

@ -29,7 +29,6 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
ref: function () {
self.trigger = this;
},
action: o.action,
items: o.items,
height: o.height - 2,
text: o.text,

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

@ -20,7 +20,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.trigger = BI.createWidget({
type: "bi.select_text_trigger",
action: o.action,
items: o.items,
height: o.height,
text: o.text,

1
src/component/treevaluechooser/combo.treevaluechooser.js
Unescape View File

@ -25,7 +25,6 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_tree_combo",
trigger: o.trigger,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),

15
src/core/controller/controller.bubbles.js
Unescape View File

@ -112,6 +112,7 @@ BI.BubblesController = BI.inherit(BI.Controller, {
var container = opt.container || context;
var offsetStyle = opt.offsetStyle || {};
var level = opt.level || "error";
var adjustLength = opt.adjustLength || 0;
if (!this.storeBubbles[name]) {
this.storeBubbles[name] = {};
}
@ -127,9 +128,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["top"]);
var position = this._getTopPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left, top: position.top - 2});
this.get(name).element.css({left: position.left, top: position.top - adjustLength});
this.get(name).invisible();
if (!$.isTopSpaceEnough(context, this.get(name), 2)) {
if (!$.isTopSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["left"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30);
}
@ -142,9 +143,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["left"]);
var position = this._getLeftPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left - 2, top: position.top});
this.get(name).element.css({left: position.left - adjustLength, top: position.top});
this.get(name).invisible();
if (!$.isLeftSpaceEnough(context, this.get(name), 2)) {
if (!$.isLeftSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["right"]) {
this.storeBubbles[name]["right"] = this._createBubble("right", text, level, 30);
}
@ -157,9 +158,9 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["right"]);
var position = this._getRightPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left + 2, top: position.top});
this.get(name).element.css({left: position.left + adjustLength, top: position.top});
this.get(name).invisible();
if (!$.isRightSpaceEnough(context, this.get(name), 2)) {
if (!$.isRightSpaceEnough(context, this.get(name), adjustLength)) {
if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
}
@ -172,7 +173,7 @@ BI.BubblesController = BI.inherit(BI.Controller, {
});
this.set(name, this.storeBubbles[name]["bottom"]);
var position = this._getBottomPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left, top: position.top + 2});
this.get(name).element.css({left: position.left, top: position.top + adjustLength});
this.get(name).invisible();
}
}

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

@ -17,7 +17,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
border: 1,
less: 0,
less_equal: 1,
numTip: ""
numTip: "",
adjustLength: 2
},
_defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
@ -303,17 +304,20 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
default :
@ -349,7 +353,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
w.on(BI.Editor.EVENT_ERROR, function () {
self._checkValidation();
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
});
@ -362,13 +367,15 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
@ -385,17 +392,20 @@ BI.NumberInterval = BI.inherit(BI.Single, {
switch (self._checkValidation()) {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left"
offsetStyle: "left",
adjustLength: c.adjustLength
});
break;
default :

Write Preview
Loading…
Cancel
Save