CN-1551 feat: element-plus版本升级内容合并至主分支

This commit is contained in:
chenjinsong
2024-03-07 19:18:18 +08:00
parent f5926b265b
commit fa758db6db
58 changed files with 868 additions and 323 deletions

View File

@@ -96,8 +96,7 @@
background: $--select-bg-color-1;
box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
position: absolute;
right: 0;
top: 32px;
right: 10px !important;
z-index: 2;
.date-range-panel-content-left {

View File

@@ -51,7 +51,7 @@
color: #0091FF;
}
}
.el-button--mini.cn-button {
.el-button--small.cn-button {
span {
font-size: 14px;
color: #2C72C6;
@@ -65,7 +65,7 @@
}
}
}
.el-button--mini{
.el-button--small{
padding: 4px 6px !important;
min-height: 28px !important;
height: 28px !important;

View File

@@ -7,7 +7,7 @@
// max-height: 42px;
// padding-right: 0;
// }
// .pagination-size-select .el-input--mini .el-input__inner{
// .pagination-size-select .el-input--small .el-input__inner{
// height: 20px;
// line-height: 20px;
// margin: 5px 0 5px 5px;

View File

@@ -276,21 +276,11 @@
.search-input{
width:100%;
padding: 4px 4px 0px 4px;
.el-input__wrapper {
border: 1px solid #C5C5C5;
box-shadow: -1px 1px 10px -1px rgba(205,205,205,0.85);
}
.el-input__inner{
//padding:0px 4px;
//background: #FFFFFF;
//border: 1px solid #C5C5C5;
//box-shadow: -1px 1px 10px -1px rgba(205,205,205,0.85);
border-radius: 2px;
font-size: 12px;
/*color: rgba(87,87,87,0.60);*/
letter-spacing: 0;
font-weight: 400;
margin-left: -7px;
}
}
.breadcrumb-button{

View File

@@ -14,7 +14,7 @@
.pop-title {
margin: 10px 0;
}
.el-button--mini{
.el-button--small{
padding: 5px 7px;
}
}

View File

@@ -75,6 +75,3 @@
}
}
}
.el-popper.is-pure {
margin-top: 0;
}

View File

@@ -47,14 +47,16 @@
.el-form .el-form-item {
margin-bottom: 0;
padding:4px 0;
font-size: 14px!important;
.el-form-item__label {
color: #262626 !important;
font-weight: bold;
font-size: 14px;
}
.el-form-item__content {
color: #262626 !important;
font-weight: 400;
font-size: 14px;
}
}
}

View File

@@ -64,10 +64,11 @@
}
.line-date-right {
margin-right: 20px;
margin-right: 10px;
}
.entity-detail-date-time-range {
margin-right: 10px;
height: 24px;
line-height: 24px;
border: 1px solid #DCDFE6;

View File

@@ -293,7 +293,7 @@
.el-input__wrapper {
border-radius: 14px;
font-size: 12px;
.el-input.el-input--mini {
.el-input.el-input--small {
.el-input__inner {
font-size: 12px !important;
//background: #FFFFFF;

View File

@@ -123,6 +123,7 @@
}
.tab-table__average {
border: 1px solid $--border-color;
border-bottom: none;
border-radius: 4px 4px 0 0;
//padding: 1px;
.data-click:hover{
@@ -507,13 +508,8 @@
width:100%;
padding: 4px 4px 0px 4px;
.el-input__inner{
//padding:0px 4px;
//background: #FFFFFF;
//border: 1px solid #C5C5C5;
//box-shadow: -1px 1px 10px -1px rgba(205,205,205,0.85);
border-radius: 2px;
font-size: 12px;
/*color: rgba(87,87,87,0.60);*/
letter-spacing: 0;
font-weight: 400;
}

View File

@@ -68,6 +68,7 @@
}
.app-table.el-table {
border: 1px solid #E2E5EC;
border-bottom: none;
.el-table__header-wrapper {
tr th {
padding: 5px 0;

View File

@@ -30,12 +30,6 @@
font-size: 12px;
padding: 0;
}
.el-select__popper.map-select-down {
top: 32px !important;
.el-popper__arrow {
display: none;
}
}
.el-select__placeholder {
padding-left: 16px;
color: #2c72c6;

View File

@@ -48,7 +48,6 @@
font-weight: 400;
}
.el-select__suffix {
margin-right: -7px;
i {
color: #575757 !important;
}

View File

@@ -90,9 +90,6 @@
color: #353636;
background-color: #FFFFFF;
}
.common-select {
top: 32px !important;
}
}
.panel__time {
display: flex;

View File

@@ -116,7 +116,7 @@
.form-setting__select {
width: 620px !important;
.el-input--mini .el-input__inner {
.el-input--small .el-input__inner {
height: 24px !important;
line-height: 24px !important;
}
@@ -170,7 +170,7 @@
}
}
.el-input--mini .el-input__inner {
.el-input--small .el-input__inner {
height: 24px !important;
line-height: 24px !important;
}
@@ -280,7 +280,7 @@
width: 170px;
}
.el-input--mini .el-input__inner {
.el-input--small .el-input__inner {
height: 24px;
line-height: 24px;
}

View File

@@ -2,7 +2,6 @@
padding: 20px;
.detection-form-header {
font-family: NotoSansHans-Black;
font-size: 24px;
color: #353636;
font-weight: 900;
@@ -72,7 +71,6 @@
}
.form-collapse-header-title {
font-family: NotoSansHans-Medium;
font-size: 16px;
color: #333333;
font-weight: 500;
@@ -90,7 +88,6 @@
border: 1px #E2E5EC solid;
display: flex;
flex-direction: column;
font-family: NotoSansSChineseRegular;
font-size: 14px;
color: #353636;
font-weight: 400;
@@ -109,7 +106,7 @@
}
}
.el-input--mini .el-input__inner {
.el-input--small .el-input__inner {
width: 112px;
margin: 0 12px;
}
@@ -148,7 +145,7 @@
}
}
.el-input--mini, .el-input--mini .el-input__inner {
.el-input--small, .el-input--small .el-input__inner {
height: 24px !important;
line-height: 24px !important;
border-radius: 2px !important;
@@ -168,4 +165,116 @@
align-items: center;
justify-content: center;
}
.el-overlay-message-box, .el-message-box {
padding: 0 !important;
}
.el-overlay-message-box {
text-align: center !important;
}
.is-message-box .el-overlay-message-box {
display: flex;
justify-content: center;
align-items: center;
}
.el-switch {
--el-switch-on-color: #38ACD2;
--el-switch-off-color: #C0CEDB;
}
.del-model {
&.el-message-box {
max-width: 480px !important;
}
display: flex;
flex-direction: column;
padding-bottom: 0 !important;
width: 480px !important;
height: 190px;
.el-message-box__header {
display: flex;
flex-direction: row;
border-bottom: 1px solid #eee;
height: 42px;
background: #F7F7F7;
box-shadow: 0 1px 0 0 rgba(53, 54, 54, 0.08);
padding-left: 21px;
padding-top: 10px;
padding-bottom: 14px;
.el-message-box__headerbtn {
display: flex !important;
flex-direction: row-reverse;
justify-content: center;
align-items: center;
font-size: 10px;
line-height: 10px;
padding-right: 10px !important;
i {
width: 10px;
height: 10px;
}
}
.el-message-box__title {
font-size: 14px !important;
color: #353636;
letter-spacing: 0;
font-weight: 400;
}
}
.el-message-box__content {
height: 96px;
font-size: 14px;
color: #353636;
letter-spacing: 0;
line-height: 22px;
font-weight: 400;
padding-top: 9px;
padding-right: 20px;
padding-left: 21px;
.el-message-box__message {
padding-left: 0 !important;
padding-right: 0 !important;
}
}
.el-message-box__btns {
height: 52px;
border-top: 1px solid #eee;
box-shadow: inset 0 -1px 0 0 rgba(0, 0, 0, 0.07);
padding: 13px 1px 12px 0 !important;
.el-button {
font-size: 12px;
}
.el-button--small {
padding: 8px 21px !important;
line-height: 12px;
font-size: 12px;
font-weight: 500;
min-height: 28px;
}
.el-button:nth-child(1) {
margin-right: 20px;
width: 80px;
height: 28px;
color: #353636;
}
.el-button:nth-child(2) {
width: 80px;
height: 28px;
margin-right: 20px;
margin-left: 0 !important;
background-color: #2d8cf0;
border-color: #2d8cf0;
}
}
}
}

View File

@@ -149,7 +149,6 @@
.new-filter-content-checkbox {
line-height: 16px;
margin-bottom: 13.6px;
font-family: NotoSansSChineseRegular;
font-size: 14px;
color: #353636;
font-weight: 400;
@@ -171,6 +170,10 @@
background: #FFFFFF;
border-radius: 1px;
}
.el-checkbox__inner::after {
top: 2px;
left: 5px;
}
.el-checkbox__input.is-checked {
.el-checkbox__inner {
border-color: #38ACD2;
@@ -185,7 +188,6 @@
}
.el-checkbox__label {
font-family: NotoSansSChineseRegular;
font-size: 14px;
color: #353636;
font-weight: 400;

View File

@@ -2,9 +2,6 @@
.el-table td, .el-table th {
padding: 12px 0;
}
.el-table .el-table__cell.is-center {
padding-top: 4px;
}
.el-table th > .cell, .el-table .cell {
padding-left: 0 !important;
padding-right: 0 !important;
@@ -17,7 +14,6 @@
color: #353636;
}
.el-table--border th {
font-family: NotoSansHans-Medium;
font-weight: 500;
padding: 0;
}
@@ -29,7 +25,6 @@
}
.el-table__body td {
font-family: NotoSansSChineseRegular;
font-weight: 400;
}

View File

@@ -35,7 +35,7 @@
&>div {
padding: 0 0 0 10px;
}
.el-button--mini{
.el-button--small{
padding: 4px 6px !important;
min-height: 28px !important;
&.active i {

View File

@@ -36,8 +36,10 @@
flex: 1;
.list-page .main-container {
padding: 0;
.cn-table {
height: calc(100% - 62px) !important;
.el-table--fit.el-table--border {
height: calc(100% - 55px) !important;
}
@@ -48,6 +50,9 @@
border-left: none;
display: none;
}
.el-scrollbar__bar.is-vertical {
z-index: 1000;
}
.el-table__row .el-table-column--selection .cell {
padding: 0;
}
@@ -59,7 +64,6 @@
.el-table__body-wrapper {
.el-table__expanded-cell {
z-index: 100;
border-top: 1px solid #E7EAED;
}
}
.el-table__fixed,

View File

@@ -545,7 +545,7 @@
.el-button {
color: #575757;
}
.el-button--mini{
.el-button--small {
padding: 7px 9px !important;
min-height: 28px !important;
&.active i {