diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot index 224ca0343..e56e41dd6 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 268b5cb8d..89f2dc635 100644 --- a/dist/font/iconfont.svg +++ b/dist/font/iconfont.svg @@ -14,6 +14,54 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -104,7 +152,7 @@ - + @@ -216,7 +264,7 @@ - + @@ -394,11 +442,11 @@ - + - + @@ -416,9 +464,9 @@ - + - + @@ -452,9 +500,9 @@ - + - + @@ -586,9 +634,9 @@ - + - + @@ -1306,7 +1354,7 @@ - + @@ -1504,7 +1552,7 @@ - + @@ -2114,7 +2162,7 @@ - + diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf index 743021ccc..bcc7a160b 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 ada633840..20647a0f5 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 2a5f9019d..06ee43b3a 100644 Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ diff --git a/src/base/foundation/message.js b/src/base/foundation/message.js index 380e12039..b94dfbbcd 100644 --- a/src/base/foundation/message.js +++ b/src/base/foundation/message.js @@ -10,12 +10,16 @@ BI.Msg = ((function () { var toastStack = []; + var defaultConfig = { + buttonHeight: 24, + }; + return { - alert: function (title, message, callback) { - this._show(false, title, message, callback); + alert: function (title, message, callback, config = defaultConfig) { + this._show(false, title, message, callback, config); }, - confirm: function (title, message, callback) { - this._show(true, title, message, callback); + confirm: function (title, message, callback, config = defaultConfig) { + this._show(true, title, message, callback, config); }, prompt: function (title, message, value, callback, min_width) { // BI.Msg.prompt(title, message, value, callback, min_width); @@ -74,7 +78,7 @@ BI.Msg = ((function () { toast.destroy?.(); }; }, - _show: function (hasCancel, title, message, callback) { + _show: function (hasCancel, title, message, callback, config) { BI.isNull($mask) && ($mask = BI.Widget._renderEngine.createElement("
").css({ position: "absolute", zIndex: BI.zIndex_tip - 2, @@ -105,8 +109,9 @@ BI.Msg = ((function () { controlItems.push({ el: { type: "bi.button", + height: config.buttonHeight, text: BI.i18nText("BI-Basic_Cancel"), - level: "ignore", + light: true, handler: function () { close(); if (BI.isFunction(callback)) { @@ -119,6 +124,7 @@ BI.Msg = ((function () { controlItems.push({ el: { type: "bi.button", + height: config.buttonHeight, text: BI.i18nText("BI-Basic_OK"), handler: function () { close(); diff --git a/src/base/layer/layer.popover.js b/src/base/layer/layer.popover.js index 4244a1efb..063c2724c 100644 --- a/src/base/layer/layer.popover.js +++ b/src/base/layer/layer.popover.js @@ -25,6 +25,7 @@ BI.Popover = BI.inherit(BI.Widget, { body: null, footer: null, footerHeight: 44, + footerButtonHeight: 24, closable: true, // BI-40839 是否显示右上角的关闭按钮 bodyHgap: BI.SIZE_CONSANTS.H_GAP_SIZE, bodyTgap: BI.SIZE_CONSANTS.V_GAP_SIZE, @@ -249,15 +250,17 @@ BI.BarPopover = BI.inherit(BI.Popover, { lgap: 10, items: [{ type: "bi.button", + height: o.footerButtonHeight, text: this.options.btns[1], value: 1, - level: "ignore", + light: true, handler: function (v) { self.fireEvent(BI.Popover.EVENT_CANCEL, v); self.close(v); }, }, { type: "bi.button", + height: o.footerButtonHeight, text: this.options.btns[0], warningTitle: o.warningTitle, value: 0, diff --git a/src/case/combo/bubblecombo/popup.bubble.js b/src/case/combo/bubblecombo/popup.bubble.js index 6826a99f5..26cff20b6 100644 --- a/src/case/combo/bubblecombo/popup.bubble.js +++ b/src/case/combo/bubblecombo/popup.bubble.js @@ -32,7 +32,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, { buttons: [{ value: false, text: BI.i18nText("BI-Basic_Cancel"), - level: "ignore" + light: true, }, { text: BI.i18nText(BI.i18nText("BI-Basic_OK")), value: true diff --git a/src/core/2.base.js b/src/core/2.base.js index dc94a3d98..ba7bc06b2 100644 --- a/src/core/2.base.js +++ b/src/core/2.base.js @@ -640,15 +640,15 @@ var result = []; var used = []; for (var b in object) { - if (this.has(object, b)) { - if (!this.isEqual(object[b], other[b])) { + if (BI.has(object, b)) { + if (!BI.isEqual(object[b], other[b])) { result.push(b); } used.push(b); } } for (var b in other) { - if (this.has(other, b) && !BI.contains(used, b)) { + if (BI.has(other, b) && !BI.contains(used, b)) { result.push(b); } } diff --git a/src/widget/multiselect/loader.js b/src/widget/multiselect/loader.js index 3ea50472f..0101d8908 100644 --- a/src/widget/multiselect/loader.js +++ b/src/widget/multiselect/loader.js @@ -158,6 +158,11 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, { this.next.setEnd(); } } + // cacheGroup渲染的是全量的,如果这次加载更多add的items是从cacheItems里面拿的,那不用再add了 + if (this.cachItems.length > 0) { + this.button_group.addItems(...arguments); + return; + } var renderEngine = BI.Widget._renderEngine; BI.Widget.registerRenderEngine(BI.Element.renderEngine); this.cachGroup.addItems.apply(this.cachGroup, arguments); @@ -183,13 +188,6 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, { this.times = 1; this.count = 0; this.count += items.length; - if (BI.isObject(this.next)) { - if (this.hasNext()) { - this.next.setLoaded(); - } else { - this.next.invisible(); - } - } return true; }, @@ -205,6 +203,15 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, { this.cachGroup.populate.call(this.cachGroup, items, keyword); BI.Widget.registerRenderEngine(renderEngine); this.button_group.populate.call(this.button_group, items.slice(0, firstItemsCount), keyword); + + // hasNext依赖的是cacheItems计算,所以从_populate挪到populate里面 + if (BI.isObject(this.next)) { + if (this.hasNext()) { + this.next.setLoaded(); + } else { + this.next.invisible(); + } + } } },