Merge branch 'master' of https://code.fineres.com/scm/~guyi/fineui

bi.lessconfig.json

@@ -8,7 +8,7 @@
   "@color-light-gray": "#ECEEF3",
   "@color-light-gray-theme-dark": "#292F45",
   "@border-color-dark-line": "#2E3A4D",
-  "@color-sliver-theme-dark": "363E55",
+  "@color-sliver-theme-dark": "#363E55",
   "@border-color-disabled": "#E7E8EB",
 
   "@color-bi-background-active-radio": "transparent",
@@ -18,6 +18,7 @@
   "@color-bi-background-disabled-active-checkbox-content": "#D0D4DA",
   "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479",
   "@color-bi-background-tooltip-success": "#2E3A4D",
+  "@color-bi-text-header-background": "#647185",
   "@color-bi-border-tooltip-success": "#2E3A4D",
   "@color-bi-background-toast-success": "#FFFFFF",
   "@color-bi-background-toast-warning": "#FFFFFF",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20220228152213",
+  "version": "2.0.20220301113302",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

src/base/layer/layer.popover.js

@@ -27,7 +27,7 @@ BI.Popover = BI.inherit(BI.Widget, {
             footerHeight: 44,
             closable: true, // BI-40839 是否显示右上角的关闭按钮
             bodyHgap: BI.SIZE_CONSANTS.H_GAP_SIZE,
-            bodyTgap: 10
+            bodyTgap: BI.SIZE_CONSANTS.V_GAP_SIZE
         };
     },
 
@@ -109,10 +109,10 @@ BI.Popover = BI.inherit(BI.Widget, {
                 },
                 items: [{
                     el: o.body
-                }]
+                }],
-            },
                 hgap: o.bodyHgap,
                 tgap: o.bodyTgap
+            }
         } : {
             el: {
                 type: "bi.absolute",
@@ -143,7 +143,6 @@ BI.Popover = BI.inherit(BI.Widget, {
         }
 
         return BI.extend({
-            type: o.logic.dynamic ? "bi.vertical" : "bi.vtape",
             items: items,
             width: this._getSuitableWidth(size.width)
         }, o.logic.dynamic ? {

src/less/resource/font.less

@@ -83,7 +83,7 @@
 
 //toast
 .font(toast-error-font, @font-tip-error, @color-bi-color-toast-error);
-.font(toast-success-font, @font-tip-success, @color-bi-color-toast-error);
+.font(toast-success-font, @font-tip-success, @color-bi-color-toast-success);
 .font(toast-warning-font, @font-tip-warning, @color-bi-color-toast-warning);
 .font(toast-message-font, @font-tip-message, @color-bi-color-toast-normal);