From 3defe8e0363bc3511169cc2432bcfe1a02b820db Mon Sep 17 00:00:00 2001 From: 田源 <tianyuan@vci-tech.com> Date: 星期四, 02 一月 2025 17:33:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-ui/src/styles/ui.scss | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/Source/plt-web/plt-web-ui/src/styles/ui.scss b/Source/plt-web/plt-web-ui/src/styles/ui.scss index bc94532..ff4eb74 100644 --- a/Source/plt-web/plt-web-ui/src/styles/ui.scss +++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss @@ -390,6 +390,10 @@ .el-dialog__footer{ border-top: 1px solid #e9e7e7; padding: 10px 20px 10px; + z-index: 10000; +} +.avue-dialog__footer{ + z-index: 10000; } /* @@ -489,7 +493,12 @@ .UI-dynamic > .avue-crud{ height: 100%; } - +/* +svg鍥炬爣 + */ +.iconShow svg{ + fill: currentColor; +} /* 琛ㄥ崟 */ @@ -504,7 +513,9 @@ } -/***鎸夐挳妗�****/ +/*** +鎸夐挳 +****/ .tree-buttons .el-button{ margin: 0 5px 5px 0; } @@ -526,7 +537,29 @@ text-align: center; padding-left: 4.5px; } - +/*鏄剧ずsvg鍥炬爣鐨勬寜閽�*/ +.el-button--small.button-custom-icon{ + padding: 7px 14px; +} +.el-button--small.button-custom-icon > span{ + height: 16px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; +} +/*鍥炬爣**/ +.el-button--small.button-custom-icon > span .iconShow{ + font-size: 16px !important; + width: 16px !important; + height: 16px !important; + margin-right: 6px; +} /* 鏍� */ @@ -534,6 +567,7 @@ .el-tree .el-tree-node__loading-icon{ display: none !important; } +/*鍥炬爣**/ .el-tree-node__label .iconShow{ display: inline-block; width: 14px !important; -- Gitblit v1.9.3