diff --git a/dist/base.js b/dist/base.js
index 7933f14573..82e1394ab8 100644
--- a/dist/base.js
+++ b/dist/base.js
@@ -18568,7 +18568,7 @@ BI.Editor = BI.inherit(BI.Single, {
}
if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
- adjustTop: 2
+ adjustYOffset: 2
});
this._checkToolTip();
return BI.Bubbles.get(this.getName());
diff --git a/dist/bundle.css b/dist/bundle.css
index ecaaf054d6..52513a665d 100644
--- a/dist/bundle.css
+++ b/dist/bundle.css
@@ -4267,6 +4267,12 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 2px;
border-radius: 2px;
}
+.bi-number-editor .pull-down-font {
+ font-size: 12px;
+}
+.bi-number-editor .pull-up-font {
+ font-size: 12px;
+}
.bi-number-interval .number-interval-small-editor {
-moz-border-radius-topleft: 2px;
-webkit-border-top-left-radius: 2px;
@@ -5839,6 +5845,30 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e6dd";
color: #13cd66;
}
+.add-up-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.add-up-font .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.add-up-font.disabled .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.minus-down-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.minus-down-font .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
+.minus-down-font.disabled .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
.tree-collapse-icon-type1 .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/tree_collapse_1.png') no-repeat center center;
diff --git a/dist/bundle.js b/dist/bundle.js
index a8e12f016b..cee0b97e51 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -26766,10 +26766,8 @@ BI.BubblesController = BI.inherit(BI.Controller, {
var container = opt.container || context;
var offsetStyle = opt.offsetStyle || {};
var level = opt.level || "error";
- var adjustTop = opt.adjustTop || 0;
- var adjustRight = opt.adjustRight || 0;
- var adjustLeft = opt.adjustLeft || 0;
- var adjustBottom = opt.adjustBottom || 0;
+ var adjustYOffset = opt.adjustYOffset || 0;
+ var adjustXOffset = opt.adjustXOffset || 0;
if (!this.storeBubbles[name]) {
this.storeBubbles[name] = {};
}
@@ -26785,9 +26783,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 + adjustLeft, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isTopSpaceEnough(context, this.get(name), adjustTop)) {
+ if (!$.isTopSpaceEnough(context, this.get(name), adjustYOffset)) {
if (!this.storeBubbles[name]["left"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30);
}
@@ -26800,9 +26798,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 - adjustLeft, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left - adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isLeftSpaceEnough(context, this.get(name), adjustLeft)) {
+ if (!$.isLeftSpaceEnough(context, this.get(name), adjustXOffset)) {
if (!this.storeBubbles[name]["right"]) {
this.storeBubbles[name]["right"] = this._createBubble("right", text, level, 30);
}
@@ -26815,9 +26813,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 + adjustRight, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isRightSpaceEnough(context, this.get(name), adjustLeft)) {
+ if (!$.isRightSpaceEnough(context, this.get(name), adjustXOffset)) {
if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
}
@@ -26830,7 +26828,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 + adjustLeft, top: position.top + adjustBottom});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top + adjustYOffset});
this.get(name).invisible();
}
}
@@ -54377,7 +54375,7 @@ BI.Editor = BI.inherit(BI.Single, {
}
if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
- adjustTop: 2
+ adjustYOffset: 2
});
this._checkToolTip();
return BI.Bubbles.get(this.getName());
@@ -102053,7 +102051,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
type: "bi.icon_button",
forceNotSelected: true,
trigger: "lclick,",
- cls: "pull-up-font top-button bi-border-left bi-list-item-active3"
+ cls: "add-up-font top-button bi-border-left bi-list-item-active3"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(o.step);
@@ -102064,7 +102062,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
type: "bi.icon_button",
trigger: "lclick,",
forceNotSelected: true,
- cls: "pull-down-font bottom-button bi-border-left bi-list-item-active3"
+ cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(-o.step);
@@ -102145,7 +102143,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
less: 0,
less_equal: 1,
numTip: "",
- adjustTop: 2
+ adjustYOffset: 2
},
_defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
@@ -102432,19 +102430,19 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
default :
@@ -102481,7 +102479,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._checkValidation();
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
});
@@ -102495,14 +102493,14 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
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",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
@@ -102520,19 +102518,19 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
default :
diff --git a/dist/core.js b/dist/core.js
index 7a5b9e2ec8..9479831849 100644
--- a/dist/core.js
+++ b/dist/core.js
@@ -26766,10 +26766,8 @@ BI.BubblesController = BI.inherit(BI.Controller, {
var container = opt.container || context;
var offsetStyle = opt.offsetStyle || {};
var level = opt.level || "error";
- var adjustTop = opt.adjustTop || 0;
- var adjustRight = opt.adjustRight || 0;
- var adjustLeft = opt.adjustLeft || 0;
- var adjustBottom = opt.adjustBottom || 0;
+ var adjustYOffset = opt.adjustYOffset || 0;
+ var adjustXOffset = opt.adjustXOffset || 0;
if (!this.storeBubbles[name]) {
this.storeBubbles[name] = {};
}
@@ -26785,9 +26783,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 + adjustLeft, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isTopSpaceEnough(context, this.get(name), adjustTop)) {
+ if (!$.isTopSpaceEnough(context, this.get(name), adjustYOffset)) {
if (!this.storeBubbles[name]["left"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30);
}
@@ -26800,9 +26798,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 - adjustLeft, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left - adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isLeftSpaceEnough(context, this.get(name), adjustLeft)) {
+ if (!$.isLeftSpaceEnough(context, this.get(name), adjustXOffset)) {
if (!this.storeBubbles[name]["right"]) {
this.storeBubbles[name]["right"] = this._createBubble("right", text, level, 30);
}
@@ -26815,9 +26813,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 + adjustRight, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isRightSpaceEnough(context, this.get(name), adjustLeft)) {
+ if (!$.isRightSpaceEnough(context, this.get(name), adjustXOffset)) {
if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
}
@@ -26830,7 +26828,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 + adjustLeft, top: position.top + adjustBottom});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top + adjustYOffset});
this.get(name).invisible();
}
}
diff --git a/dist/fineui.css b/dist/fineui.css
index 5a6efbce09..e029adbdb3 100644
--- a/dist/fineui.css
+++ b/dist/fineui.css
@@ -4267,6 +4267,12 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 2px;
border-radius: 2px;
}
+.bi-number-editor .pull-down-font {
+ font-size: 12px;
+}
+.bi-number-editor .pull-up-font {
+ font-size: 12px;
+}
.bi-number-interval .number-interval-small-editor {
-moz-border-radius-topleft: 2px;
-webkit-border-top-left-radius: 2px;
@@ -5839,6 +5845,30 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e6dd";
color: #13cd66;
}
+.add-up-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.add-up-font .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.add-up-font.disabled .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.minus-down-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.minus-down-font .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
+.minus-down-font.disabled .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
.tree-collapse-icon-type1 .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/tree_collapse_1.png') no-repeat center center;
diff --git a/dist/fineui.js b/dist/fineui.js
index c029d2bda3..03bd87ea29 100644
--- a/dist/fineui.js
+++ b/dist/fineui.js
@@ -27015,10 +27015,8 @@ BI.BubblesController = BI.inherit(BI.Controller, {
var container = opt.container || context;
var offsetStyle = opt.offsetStyle || {};
var level = opt.level || "error";
- var adjustTop = opt.adjustTop || 0;
- var adjustRight = opt.adjustRight || 0;
- var adjustLeft = opt.adjustLeft || 0;
- var adjustBottom = opt.adjustBottom || 0;
+ var adjustYOffset = opt.adjustYOffset || 0;
+ var adjustXOffset = opt.adjustXOffset || 0;
if (!this.storeBubbles[name]) {
this.storeBubbles[name] = {};
}
@@ -27034,9 +27032,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 + adjustLeft, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isTopSpaceEnough(context, this.get(name), adjustTop)) {
+ if (!$.isTopSpaceEnough(context, this.get(name), adjustYOffset)) {
if (!this.storeBubbles[name]["left"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30);
}
@@ -27049,9 +27047,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 - adjustLeft, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left - adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isLeftSpaceEnough(context, this.get(name), adjustLeft)) {
+ if (!$.isLeftSpaceEnough(context, this.get(name), adjustXOffset)) {
if (!this.storeBubbles[name]["right"]) {
this.storeBubbles[name]["right"] = this._createBubble("right", text, level, 30);
}
@@ -27064,9 +27062,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 + adjustRight, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isRightSpaceEnough(context, this.get(name), adjustLeft)) {
+ if (!$.isRightSpaceEnough(context, this.get(name), adjustXOffset)) {
if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
}
@@ -27079,7 +27077,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 + adjustLeft, top: position.top + adjustBottom});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top + adjustYOffset});
this.get(name).invisible();
}
}
@@ -54626,7 +54624,7 @@ BI.Editor = BI.inherit(BI.Single, {
}
if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
- adjustTop: 2
+ adjustYOffset: 2
});
this._checkToolTip();
return BI.Bubbles.get(this.getName());
@@ -102302,7 +102300,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
type: "bi.icon_button",
forceNotSelected: true,
trigger: "lclick,",
- cls: "pull-up-font top-button bi-border-left bi-list-item-active3"
+ cls: "add-up-font top-button bi-border-left bi-list-item-active3"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(o.step);
@@ -102313,7 +102311,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
type: "bi.icon_button",
trigger: "lclick,",
forceNotSelected: true,
- cls: "pull-down-font bottom-button bi-border-left bi-list-item-active3"
+ cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(-o.step);
@@ -102394,7 +102392,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
less: 0,
less_equal: 1,
numTip: "",
- adjustTop: 2
+ adjustYOffset: 2
},
_defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
@@ -102681,19 +102679,19 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
default :
@@ -102730,7 +102728,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._checkValidation();
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
});
@@ -102744,14 +102742,14 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
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",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
@@ -102769,19 +102767,19 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
default :
diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot
index f7bdec7412..4320c03590 100644
Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ
diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg
index cbcbcc1b82..d88f9d2a1d 100644
--- a/dist/font/iconfont.svg
+++ b/dist/font/iconfont.svg
@@ -36,25 +36,25 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
+
-
+
-
+
-
+
-
+
-
+
@@ -108,7 +108,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
+
@@ -126,16 +126,16 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
+
-
+
-
+
@@ -144,19 +144,19 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
+
-
+
-
+
@@ -204,22 +204,22 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
+
-
+
-
+
-
+
-
+
@@ -246,7 +246,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
+
@@ -312,7 +312,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
+
@@ -531,7 +531,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
+
@@ -948,13 +948,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
-
-
-
-
-
-
+
@@ -975,19 +969,19 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
+
-
+
-
+
-
+
-
+
@@ -1026,7 +1020,7 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
-
+
@@ -1077,6 +1071,93 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf
index f03d92df2b..b1a25c61ad 100644
Binary files a/dist/font/iconfont.ttf and b/dist/font/iconfont.ttf differ
diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff
index d3c3036561..3a68c28506 100644
Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ
diff --git a/dist/resource.css b/dist/resource.css
index 8ddbab7024..5381029b82 100644
--- a/dist/resource.css
+++ b/dist/resource.css
@@ -1293,6 +1293,30 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e6dd";
color: #13cd66;
}
+.add-up-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.add-up-font .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.add-up-font.disabled .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.minus-down-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.minus-down-font .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
+.minus-down-font.disabled .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
.tree-collapse-icon-type1 .x-icon {
display: block;
background: url('images/2x/icon/tree_collapse_1.png') no-repeat center center;
diff --git a/dist/widget.css b/dist/widget.css
index 9b622e391c..ec50b0d866 100644
--- a/dist/widget.css
+++ b/dist/widget.css
@@ -180,6 +180,12 @@
-moz-border-radius: 2px;
border-radius: 2px;
}
+.bi-number-editor .pull-down-font {
+ font-size: 12px;
+}
+.bi-number-editor .pull-up-font {
+ font-size: 12px;
+}
.bi-number-interval .number-interval-small-editor {
-moz-border-radius-topleft: 2px;
-webkit-border-top-left-radius: 2px;
diff --git a/dist/widget.js b/dist/widget.js
index 26272dae95..ccb04c50b7 100644
--- a/dist/widget.js
+++ b/dist/widget.js
@@ -14243,7 +14243,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
type: "bi.icon_button",
forceNotSelected: true,
trigger: "lclick,",
- cls: "pull-up-font top-button bi-border-left bi-list-item-active3"
+ cls: "add-up-font top-button bi-border-left bi-list-item-active3"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(o.step);
@@ -14254,7 +14254,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
type: "bi.icon_button",
trigger: "lclick,",
forceNotSelected: true,
- cls: "pull-down-font bottom-button bi-border-left bi-list-item-active3"
+ cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(-o.step);
@@ -14335,7 +14335,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
less: 0,
less_equal: 1,
numTip: "",
- adjustTop: 2
+ adjustYOffset: 2
},
_defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
@@ -14622,19 +14622,19 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
default :
@@ -14671,7 +14671,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._checkValidation();
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
});
@@ -14685,14 +14685,14 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
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",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
@@ -14710,19 +14710,19 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
default :
diff --git a/public/css/font.css b/public/css/font.css
index 868b865990..0262f7f5df 100644
--- a/public/css/font.css
+++ b/public/css/font.css
@@ -957,3 +957,27 @@
content: "\e6dd";
color: #13cd66;
}
+.add-up-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.add-up-font .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.add-up-font.disabled .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.minus-down-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.minus-down-font .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
+.minus-down-font.disabled .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js
index 85d394d672..58ab9cd6e6 100644
--- a/src/base/single/editor/editor.js
+++ b/src/base/single/editor/editor.js
@@ -227,7 +227,7 @@ BI.Editor = BI.inherit(BI.Single, {
}
if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
- adjustTop: 2
+ adjustYOffset: 2
});
this._checkToolTip();
return BI.Bubbles.get(this.getName());
diff --git a/src/core/controller/controller.bubbles.js b/src/core/controller/controller.bubbles.js
index 14407a2269..f02be0930a 100644
--- a/src/core/controller/controller.bubbles.js
+++ b/src/core/controller/controller.bubbles.js
@@ -112,10 +112,8 @@ BI.BubblesController = BI.inherit(BI.Controller, {
var container = opt.container || context;
var offsetStyle = opt.offsetStyle || {};
var level = opt.level || "error";
- var adjustTop = opt.adjustTop || 0;
- var adjustRight = opt.adjustRight || 0;
- var adjustLeft = opt.adjustLeft || 0;
- var adjustBottom = opt.adjustBottom || 0;
+ var adjustYOffset = opt.adjustYOffset || 0;
+ var adjustXOffset = opt.adjustXOffset || 0;
if (!this.storeBubbles[name]) {
this.storeBubbles[name] = {};
}
@@ -131,9 +129,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 + adjustLeft, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isTopSpaceEnough(context, this.get(name), adjustTop)) {
+ if (!$.isTopSpaceEnough(context, this.get(name), adjustYOffset)) {
if (!this.storeBubbles[name]["left"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30);
}
@@ -146,9 +144,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 - adjustLeft, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left - adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isLeftSpaceEnough(context, this.get(name), adjustLeft)) {
+ if (!$.isLeftSpaceEnough(context, this.get(name), adjustXOffset)) {
if (!this.storeBubbles[name]["right"]) {
this.storeBubbles[name]["right"] = this._createBubble("right", text, level, 30);
}
@@ -161,9 +159,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 + adjustRight, top: position.top - adjustTop});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
this.get(name).invisible();
- if (!$.isRightSpaceEnough(context, this.get(name), adjustLeft)) {
+ if (!$.isRightSpaceEnough(context, this.get(name), adjustXOffset)) {
if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
}
@@ -176,7 +174,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 + adjustLeft, top: position.top + adjustBottom});
+ this.get(name).element.css({left: position.left + adjustXOffset, top: position.top + adjustYOffset});
this.get(name).invisible();
}
}
diff --git a/src/css/resource/font.css b/src/css/resource/font.css
index 6745892a30..3b39794d25 100644
--- a/src/css/resource/font.css
+++ b/src/css/resource/font.css
@@ -957,3 +957,27 @@
content: "\e6dd";
color: #13cd66;
}
+.add-up-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.add-up-font .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.add-up-font.disabled .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.minus-down-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.minus-down-font .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
+.minus-down-font.disabled .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
diff --git a/src/css/widget/numbereditor/number.css b/src/css/widget/numbereditor/number.css
index 577fd87e9d..7063f9f972 100644
--- a/src/css/widget/numbereditor/number.css
+++ b/src/css/widget/numbereditor/number.css
@@ -3,3 +3,9 @@
-moz-border-radius: 2px;
border-radius: 2px;
}
+.bi-number-editor .pull-down-font {
+ font-size: 12px;
+}
+.bi-number-editor .pull-up-font {
+ font-size: 12px;
+}
diff --git a/src/less/resource/font.less b/src/less/resource/font.less
index c58cd392e1..70392b71ea 100644
--- a/src/less/resource/font.less
+++ b/src/less/resource/font.less
@@ -113,4 +113,7 @@
.font(toast-warning-font, @font-tip-warning);
.font(toast-message-font, @font-tip-message);
-.font(text-add-tip-font, @font-add, @color-bi-text-success);
\ No newline at end of file
+.font(text-add-tip-font, @font-add, @color-bi-text-success);
+
+.font(add-up-font, @font-up-triangle, inherit, @font-size-12);
+.font(minus-down-font, @font-down-triangle, inherit, @font-size-12);
\ No newline at end of file
diff --git a/src/less/widget/numbereditor/number.editor.less b/src/less/widget/numbereditor/number.editor.less
index d62d16538a..8272c808b7 100644
--- a/src/less/widget/numbereditor/number.editor.less
+++ b/src/less/widget/numbereditor/number.editor.less
@@ -2,8 +2,10 @@
.bi-number-editor {
.border-radius(2px);
- & .top-button {
+ & .pull-down-font {
+ font-size: 12px;
}
- & .bottom-button {
+ & .pull-up-font {
+ font-size: 12px;
}
}
\ No newline at end of file
diff --git a/src/widget/numbereditor/number.editor.js b/src/widget/numbereditor/number.editor.js
index 91bcc47e7a..a3b29c801e 100644
--- a/src/widget/numbereditor/number.editor.js
+++ b/src/widget/numbereditor/number.editor.js
@@ -42,7 +42,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
type: "bi.icon_button",
forceNotSelected: true,
trigger: "lclick,",
- cls: "pull-up-font top-button bi-border-left bi-list-item-active3"
+ cls: "add-up-font top-button bi-border-left bi-list-item-active3"
});
this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(o.step);
@@ -53,7 +53,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
type: "bi.icon_button",
trigger: "lclick,",
forceNotSelected: true,
- cls: "pull-down-font bottom-button bi-border-left bi-list-item-active3"
+ cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3"
});
this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () {
self._finetuning(-o.step);
diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js
index b2b425be58..8ec5e90a53 100644
--- a/src/widget/numberinterval/numberinterval.js
+++ b/src/widget/numberinterval/numberinterval.js
@@ -18,7 +18,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
less: 0,
less_equal: 1,
numTip: "",
- adjustTop: 2
+ adjustYOffset: 2
},
_defaultConfig: function () {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
@@ -305,19 +305,19 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
default :
@@ -354,7 +354,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
self._checkValidation();
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
});
@@ -368,14 +368,14 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
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",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
self.fireEvent(BI.NumberInterval.EVENT_ERROR);
break;
@@ -393,19 +393,19 @@ BI.NumberInterval = BI.inherit(BI.Single, {
case c.typeError:
BI.Bubbles.show(c.typeError, BI.i18nText("BI-Numerical_Interval_Input_Data"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.numberError:
BI.Bubbles.show(c.numberError, BI.i18nText("BI-Numerical_Interval_Number_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
case c.signalError:
BI.Bubbles.show(c.signalError, BI.i18nText("BI-Numerical_Interval_Signal_Value"), self, {
offsetStyle: "left",
- adjustTop: c.adjustTop
+ adjustYOffset: c.adjustYOffset
});
break;
default :
diff --git a/ui/css/font.css b/ui/css/font.css
index ba6eef79a6..fd1b6b5d50 100644
--- a/ui/css/font.css
+++ b/ui/css/font.css
@@ -957,3 +957,27 @@
content: "\e6dd";
color: #13cd66;
}
+.add-up-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.add-up-font .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.add-up-font.disabled .b-font:before {
+ content: "\e70a";
+ color: inherit;
+}
+.minus-down-font .b-font {
+ font-size: 12px;
+ *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.minus-down-font .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}
+.minus-down-font.disabled .b-font:before {
+ content: "\e70b";
+ color: inherit;
+}