From 716e7cfabbd3759b66aa1aceba4c4914512d50d4 Mon Sep 17 00:00:00 2001 From: yuxc <yuxc@vci-tech.com> Date: 星期三, 08 一月 2025 15:08:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-ui/src/styles/ui.scss | 87 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 83 insertions(+), 4 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 5bed0d1..7842105 100644 --- a/Source/plt-web/plt-web-ui/src/styles/ui.scss +++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss @@ -409,13 +409,24 @@ min-height: 26px; } .avue-crud .avue-crud__menu .el-button{ - margin-bottom: 5px; + } .avue-crud .avue-crud__menu .el-button--text{ padding: 2px 6px; } .avue-crud table td{ line-height: 22px; +} +/**宸︿晶鎿嶄綔鏍�**/ +.avue-crud__left{ + display: flex; + align-items: center; +} +/**琛ㄥ唴鎿嶄綔鏍�**/ +.avue-crud .avue-crud__menu{ + min-height: 22px; + display: flex; + justify-content: space-around; } .el-table--small, .el-table__expand-icon{ font-size: 14px; @@ -453,7 +464,31 @@ .el-table .sort-caret.descending{ bottom: 0; } +/****澶勭悊鍥哄畾鍒楅敊琛岄棶棰�****/ +.el-table th.el-table__cell .cell{ + display: flex; + justify-content:flex-start; +} +.el-table th.el-table__cell.is-center .cell{ + justify-content:center; +} +.el-table th.el-table__cell.is-right .cell{ + justify-content: flex-end; +} +.el-table th.el-table__cell .cell span:first-child{ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.el-table .el-table__fixed,.el-table .el-table__fixed-right{ + height: 100% !important; +} +.el-table__fixed .el-table__fixed-body-wrapper,.el-table__fixed-right .el-table__fixed-body-wrapper{ + height: calc(100% - 47px) !important; + top:35px !important; + padding-bottom: 12px !important; +} /* 鍒嗛〉 */ @@ -493,7 +528,12 @@ .UI-dynamic > .avue-crud{ height: 100%; } - +/* +svg鍥炬爣 + */ +.iconShow svg{ + fill: currentColor; +} /* 琛ㄥ崟 */ @@ -508,7 +548,9 @@ } -/***鎸夐挳妗�****/ +/*** +鎸夐挳 +****/ .tree-buttons .el-button{ margin: 0 5px 5px 0; } @@ -530,6 +572,41 @@ text-align: center; padding-left: 4.5px; } +/*鏄剧ずsvg鍥炬爣鐨勬寜閽�*/ +.el-button--small.button-custom-icon{ + padding: 7px 12px; +} +.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: 12px !important; + width: 12px !important; + height: 12px !important; + margin-right: 6px; +} + +.el-table td.el-table__cell div.iconShow{ + font-size: 14px !important; + width: 14px !important; + height: 14px !important; + margin-top: -1px; + margin-right: 3px; +} + +.avue-crud .avue-crud__menu .el-button--text >span { + display: flex; +} /* 鏍� @@ -538,6 +615,7 @@ .el-tree .el-tree-node__loading-icon{ display: none !important; } +/*鍥炬爣**/ .el-tree-node__label .iconShow{ display: inline-block; width: 14px !important; @@ -545,7 +623,7 @@ margin-right: 3px; } .el-tree-node__label [class*=" el-icon-"],.el-tree-node__label [class^=el-icon-]{ - font-size: 14px;margin-top: 3px; + font-size: 14px;margin-top: 4px; margin-right: 3px; } .el-select{ @@ -574,6 +652,7 @@ content: ''; } + .font14{font-size: 14px;width: 12px;height: 12px;display: inline-block;} .font16{font-size: 16px;width: 14px;height: 14px;display: inline-block;} -- Gitblit v1.9.3