Merge branch 'v4' of github.com:jumpserver/lina into v4

This commit is contained in:
ibuler
2024-05-17 16:31:27 +08:00
2 changed files with 5 additions and 12 deletions

View File

@@ -197,18 +197,12 @@ export default {
// 复合型输入框
.el-input.el-input-group {
.el-input-group__prepend {
border-right: 0 !important;
.el-select {
border-bottom-right-radius: 0 !important;
border-top-right-radius: 0 !important;
.el-input__inner {
border: none;
}
.el-input-group__prepend .el-select {
.el-input__inner {
border: none;
height: 28px;
}
}
}
.el-input__inner {
border-radius: 0;

View File

@@ -119,7 +119,6 @@ export default {
.action-bar {
position: relative;
height: 0;
border: 1px solid #dcdfe6;
border-bottom: none;
z-index: 999;
.action {