REPORT-97636 fix: 修改popover取消按钮样式、增加按钮高度可配

packages/fineui/src/base/foundation/message.js

@@ -3,7 +3,22 @@
  * 弹出提示消息框，用于模拟阻塞操作（通过回调函数实现）
  * @class Msg
  */
-import { Widget, isString, isNull, isFunction, createWidget, remove, each, emptyFn, delay, zIndex_tip, i18nText, KeyCode, isPlainObject, SIZE_CONSANTS } from "../../core";
+import {
+    Widget,
+    isString,
+    isNull,
+    isFunction,
+    createWidget,
+    remove,
+    each,
+    emptyFn,
+    delay,
+    zIndex_tip,
+    i18nText,
+    KeyCode,
+    isPlainObject,
+    SIZE_CONSANTS
+} from "../../core";
 import { Toast } from "../single";
 
 export const Msg = (() => {
@@ -13,12 +28,16 @@ export const Msg = (() => {
 
     const toastStack = [];
 
+    const defaultConfig = {
+        buttonHeight: 24,
+    };
+
     return {
-        alert (title, message, callback) {
+        alert(title, message, callback, config = defaultConfig) {
-            this._show(false, title, message, callback);
+            this._show(false, title, message, callback, config);
         },
-        confirm (title, message, callback) {
+        confirm(title, message, callback, config = defaultConfig) {
-            this._show(true, title, message, callback);
+            this._show(true, title, message, callback, config);
         },
         prompt(title, message, value, callback, min_width) {
             // Msg.prompt(title, message, value, callback, min_width);
@@ -82,7 +101,7 @@ export const Msg = (() => {
                 toast.destroy?.();
             };
         },
-        _show (hasCancel, title, message, callback) {
+        _show(hasCancel, title, message, callback, config) {
             isNull($mask) &&
             ($mask = Widget._renderEngine
                 .createElement("<div class=\"bi-z-index-mask\">")
@@ -107,6 +126,7 @@ export const Msg = (() => {
                     bottom: 0,
                 })
                 .appendTo("body");
+
             function close() {
                 messageShows[messageShows.length - 1].destroy();
                 messageShows.pop();
@@ -115,13 +135,15 @@ export const Msg = (() => {
                     $mask = null;
                 }
             }
+
             const controlItems = [];
             if (hasCancel === true) {
                 controlItems.push({
                     el: {
                         type: "bi.button",
+                        height: config.buttonHeight,
                         text: i18nText("BI-Basic_Cancel"),
-                        level: "ignore",
+                        light: true,
                         handler() {
                             close();
                             if (isFunction(callback)) {
@@ -134,6 +156,7 @@ export const Msg = (() => {
             controlItems.push({
                 el: {
                     type: "bi.button",
+                    height: config.buttonHeight,
                     text: i18nText("BI-Basic_OK"),
                     handler() {
                         close();
@@ -170,7 +193,8 @@ export const Msg = (() => {
                             });
                             try {
                                 this.element.focus();
-                            } catch (e) {}
+                            } catch (e) {
+                            }
                         },
                         cls: "bi-card",
                         items: {

packages/fineui/src/base/layer/layer.popover.js

@@ -46,6 +46,7 @@ export class Popover extends Widget {
             body: null,
             footer: null,
             footerHeight: 44,
+            footerButtonHeight: 24,
             closable: true, // BI-40839 是否显示右上角的关闭按钮
             bodyHgap: SIZE_CONSANTS.H_GAP_SIZE,
             bodyTgap: SIZE_CONSANTS.V_GAP_SIZE,
@@ -213,6 +214,7 @@ export class Popover extends Widget {
                 }
         );
     }
+
     // mounted之后绑定事件
     mounted() {
         this.dragger.element.mousedown(e => {
@@ -273,11 +275,13 @@ export class Popover extends Widget {
             type: sizeValue.type || "default",
         };
     }
+
     setDraggable(b) {
         this.options.draggable = b;
     }
 
-    hide() {}
+    hide() {
+    }
 
     open() {
         this.show();
@@ -305,7 +309,7 @@ export class BarPopover extends Popover {
     }
 
     beforeCreate() {
-        const { footer, warningTitle } = this.options;
+        const { footer, warningTitle, footerButtonHeight } = this.options;
         footer ||
         (this.options.footer = {
             type: RightVerticalAdaptLayout.xtype,
@@ -313,9 +317,10 @@ export class BarPopover extends Popover {
             items: [
                 {
                     type: Button.xtype,
+                    height: footerButtonHeight,
                     text: this.options.btns[1],
                     value: 1,
-                        level: "ignore",
+                    light: true,
                     handler: v => {
                         this.fireEvent(Popover.EVENT_CANCEL, v);
                         this.close(v);
@@ -323,6 +328,7 @@ export class BarPopover extends Popover {
                 },
                 {
                     type: Button.xtype,
+                    height: footerButtonHeight,
                     text: this.options.btns[0],
                     warningTitle,
                     value: 0,

packages/fineui/src/case/combo/bubblecombo/popup.bubble.js

@@ -33,7 +33,7 @@ export class BubblePopupBarView extends BubblePopupView {
             buttons: [{
                 value: false,
                 text: i18nText("BI-Basic_Cancel"),
-                level: "ignore",
+                light: true,
             }, {
                 text: i18nText(i18nText("BI-Basic_OK")),
                 value: true,