diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot index 3d24af9f9..a13eda98a 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 6114b5cb8..83d254d99 100644 --- a/dist/font/iconfont.svg +++ b/dist/font/iconfont.svg @@ -20,6 +20,15 @@ Created by iconfont /> + + + + + + + + + @@ -1292,9 +1301,6 @@ Created by iconfont - - - diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf index 2cac4b2b6..72a03a2d5 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 bd641a43b..b5e37e02e 100644 Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ diff --git a/dist/font/iconfont.woff2 b/dist/font/iconfont.woff2 index ff54ea316..b098aaa37 100644 Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ diff --git a/src/base/single/editor/editor.textarea.js b/src/base/single/editor/editor.textarea.js index 91274d7af..7a89545f8 100644 --- a/src/base/single/editor/editor.textarea.js +++ b/src/base/single/editor/editor.textarea.js @@ -10,6 +10,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, { baseCls: "bi-textarea-editor", value: "", errorText: "", + adjustYOffset: 2, + adjustXOffset: 0, + offsetStyle: "left", validationChecker: function () { return true; }, @@ -137,7 +140,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, { } if (!this.disabledError && BI.isKey(errorText)) { BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, { - adjustYOffset: 2 + adjustYOffset: o.adjustYOffset, + adjustXOffset: o.adjustXOffset, + offsetStyle: o.offsetStyle, }); return BI.Bubbles.get(this.getName()); } diff --git a/src/widget/multilayerdownlist/popup.downlist.js b/src/widget/multilayerdownlist/popup.downlist.js index aea707d1b..837d551fd 100644 --- a/src/widget/multilayerdownlist/popup.downlist.js +++ b/src/widget/multilayerdownlist/popup.downlist.js @@ -111,7 +111,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { }; self._createChildren(item); } else { - item.type = "bi.down_list_item"; + item.type = item.type || "bi.down_list_item"; item.title = item.title || item.text; item.textRgap = 10; item.isNeedAdjustWidth = false; @@ -159,7 +159,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { var fatherValue = BI.deepClone(self._formatEL(item).el.value); var childValue = BI.deepClone(child.value); self.singleValues.push(child.value); - child.type = "bi.down_list_item"; + child.type = child.type || "bi.down_list_item"; child.extraCls = " child-down-list-item"; child.title = child.title || child.text; child.textRgap = 10;