Merge pull request #240364 in DEC/fineui from final/11.0 to persist/11.0

* commit '26de2e9e212873ae16b143a3f81b359eb8260d27':
  BI-128988 fix: 【来源PT项目】文本过滤组件文本列表勾选状态异常 - 提交final
  无JIRA update font
  BI-128856 fix: 【6.0.11.1final】仪表板编辑界面，复合过滤组件设置过滤不能实时生效
  REPORT-97636 fix: 修改popover取消按钮样式、增加按钮高度可配

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("<div class=\"bi-z-index-mask\">").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();

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,

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

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);
                 }
             }

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();
+                }
+            }
         }
     },