From f7d1696ab1a3943d33236d5d666b55a83fbfb2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:32:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20layer=20=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8A=A8=E7=94=BB=E5=BC=B9=E5=87=BA=E5=B1=82?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=85=A5=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=87=BA=E7=8E=B0=E5=BE=80=E4=B8=8A=E5=81=8F=E7=A7=BB?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/css/modules/layer.css | 10 +++++-----
 src/modules/layer.js      |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/css/modules/layer.css b/src/css/modules/layer.css
index 5b45dd7a..8052b8a1 100644
--- a/src/css/modules/layer.css
+++ b/src/css/modules/layer.css
@@ -13,7 +13,7 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 .layui-layer-content{position:relative;}
 .layui-layer-border{border: 1px solid #B2B2B2; border: 1px solid rgba(0,0,0,.1); box-shadow: 1px 1px 5px rgba(0,0,0,.2);}
 .layui-layer-setwin span,
-.layui-layer-btn a{display:inline-block; *display:inline; *zoom:1; vertical-align:top;}
+.layui-layer-btn a{display: inline-block; vertical-align: middle; *display: inline; *zoom:1; }
 
 .layui-layer-move{display: none; position: fixed; *position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; cursor: move; opacity: 0; filter:alpha(opacity=0); background-color: #fff; z-index: 2147483647;}
 .layui-layer-resize{position: absolute; width: 15px; height: 15px; right: 0; bottom: 0; cursor: se-resize;}
@@ -120,8 +120,8 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 /* 标题栏 */
 .layui-layer-title{padding: 0 81px 0 16px; height: 50px; line-height: 50px; border-bottom:1px solid #F0F0F0; font-size: 14px; color:#333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; border-radius: 2px 2px 0 0;}
 .layui-layer-setwin{position:absolute; right: 15px; *right:0; top: 16px; font-size:0; line-height: initial;}
-.layui-layer-setwin span{position:relative; width: 16px; height: 16px; line-height: 18px; margin-left: 10px; text-align: center; font-size: 16px; cursor: pointer; color: #000; _overflow:hidden;}
-.layui-layer-setwin .layui-layer-min:before{content: ''; position: absolute; width: 12px; height: 1px; left: 50%; top: 50%; margin: -0.5px 0 0 -6px; background-color: #2E2D3C; cursor: pointer; _overflow:hidden;}
+.layui-layer-setwin span{position:relative; width: 16px; height: 16px; line-height: 18px; margin-left: 10px; text-align: center; font-size: 16px; cursor: pointer; color: #000; _overflow: hidden; box-sizing: border-box;}
+.layui-layer-setwin .layui-layer-min:before{content: ''; position: absolute; width: 12px; border-bottom: 1px solid #2E2D3C; left: 50%; top: 50%; margin: -0.5px 0 0 -6px; cursor: pointer; _overflow:hidden;}
 .layui-layer-setwin .layui-layer-min:hover:before{background-color: #2D93CA}
 .layui-layer-setwin .layui-layer-max:before,
 .layui-layer-setwin .layui-layer-max:after{content: ''; position: absolute; left: 50%; top: 50%; z-index: 1; width: 9px; height: 9px; margin: -5px 0 0 -5px; border: 1px solid #2E2D3C;}
@@ -138,10 +138,10 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 
 /* 按钮栏 */
 .layui-layer-btn{text-align: right; padding: 0 15px 12px; pointer-events: auto; user-select: none; -webkit-user-select: none;}
-.layui-layer-btn a{height: 28px; line-height: 28px; margin: 5px 5px 0; padding: 0 15px; border: 1px solid #dedede; background-color:#fff; color: #333; border-radius: 2px; font-weight:400; cursor:pointer; text-decoration: none;}
+.layui-layer-btn a{height: 30px; line-height: 30px; margin: 5px 5px 0; padding: 0 16px; border: 1px solid #dedede; background-color: #fff; color: #333; border-radius: 2px; font-weight: 400; cursor: pointer; text-decoration: none; box-sizing: border-box;}
 .layui-layer-btn a:hover{opacity: 0.9; text-decoration: none;}
 .layui-layer-btn a:active{opacity: 0.8;}
-.layui-layer-btn .layui-layer-btn0{border-color: #1E9FFF; background-color: #1E9FFF; color:#fff;}
+.layui-layer-btn .layui-layer-btn0{border-color: transparent; background-color: #1E9FFF; color:#fff;}
 .layui-layer-btn-l{text-align: left;}
 .layui-layer-btn-c{text-align: center;}
 
diff --git a/src/modules/layer.js b/src/modules/layer.js
index 4c0f4b5d..b3d774ac 100644
--- a/src/modules/layer.js
+++ b/src/modules/layer.js
@@ -377,7 +377,11 @@ Class.pt.vessel = function(conType, callback){
         for(var i = 0, len = config.btn.length; i < len; i++){
           button += '<a class="'+ doms[6] +''+ i +'">'+ config.btn[i] +'</a>'
         }
-        return '<div class="'+ doms[6] +' layui-layer-btn-'+ (config.btnAlign||'') +'">'+ button +'</div>'
+        return '<div class="'+ function(){
+          var className = [doms[6]];
+          if(config.btnAlign) className.push(doms[6] + '-' + config.btnAlign);
+          return className.join(' ');
+        }() +'">'+ button +'</div>'
       }() : '')
       + (config.resize ? '<span class="layui-layer-resize"></span>' : '')
     + '</div>'