Merge remote-tracking branch 'origin/master'

src/components/Chart.vue

@@ -430,6 +430,12 @@ export const colorBase2 = [
 		}
 
 		.overlay {
+			position: absolute;
+			left: 0;
+			top: 0;
+			bottom: 0;
+			right: 0;
+			pointer-events: none;
 			&.overlayTopLevel {
 				pointer-events: unset;
 			}
@@ -447,13 +453,6 @@ export const colorBase2 = [
 					background: #fff;
 				}
 			}
-
-			position: absolute;
-			left: 0;
-			top: 0;
-			bottom: 0;
-			right: 0;
-			pointer-events: none;
 		}
 	}
 }

src/components/packages/theme/formEditor/ConfigTypeComponent.scss

@@ -26,6 +26,7 @@
         }
       }
       @include when(Selected) {
+		    border-color: $primary-color;
         .ER-icon {
           color: $primary-color;
           //path.1{}
@@ -34,7 +35,6 @@
             fill: #BAE3FF;
           }
         }
-        border-color: $primary-color;
       }
       @include when(Disabled) {
         background: #F2F2F2;

src/components/packages/theme/formEditor/Fields.scss

@@ -21,19 +21,6 @@
     justify-content: space-between;
     flex-wrap: wrap;
     li {
-      @include when(new) {
-        &::after {
-          content: 'new';
-          position: absolute;
-          top: -6px;
-          right: 0;
-          color: #fff;
-          background-color: #f00;
-          font-size: 12px;
-          padding: 0 6px;
-          border-radius: 10px;
-        }
-      }
       position: relative;
       border-radius: 4px;
       margin: 4px;
@@ -61,6 +48,19 @@
       &[draggable="true"] {
         cursor: grabbing;
       }
+			@include when(new) {
+				&::after {
+					content: 'new';
+					position: absolute;
+					top: -6px;
+					right: 0;
+					color: #fff;
+					background-color: #f00;
+					font-size: 12px;
+					padding: 0 6px;
+					border-radius: 10px;
+				}
+			}
     }
   }
 }

src/components/packages/theme/formEditor/Main.scss

@@ -17,16 +17,16 @@
     position: relative;
     z-index: 3;
     .ER-icon {
+			border-radius: 4px;
+			width: 24px;
+			height: 24px;
+			display: inline-flex;
+			justify-content: center;
+			align-items: center;
       &:hover {
         color: $primary-color;
         background: #ECF6FF;
       }
-      border-radius: 4px;
-      width: 24px;
-      height: 24px;
-      display: inline-flex;
-      justify-content: center;
-      align-items: center;
     }
   }
   @include e(container) {

src/layout/LayoutLeftMix/index.scss

@@ -31,6 +31,14 @@
         flex: 1;
         .split-item {
 					--el-menu-base-level-padding: 4px;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					height: 70px;
+					line-height: unset;
+					cursor: pointer;
+					transition: all 0.3s ease;
 					&::before {
 						left: 2px;
 						right: 2px;
@@ -41,14 +49,7 @@
 							background-color: inherit;
 						}
 					}
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          justify-content: center;
-          height: 70px;
-					line-height: unset;
-          cursor: pointer;
-          transition: all 0.3s ease;
+
 					.#{$prefix}pick-icon {
 						//font-size: 18px;
 						margin-right: 0;

src/layout/components/Tabs/index.vue

@@ -393,6 +393,9 @@ $transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s, color 0.1
 							padding: 0 20px;
 							//padding: 0 !important;
 							border: 0;
+							&:hover {
+								color: var(--el-color-primary);
+							}
 
 							.le-tabs__item {
 								height: 100%;
@@ -426,10 +429,6 @@ $transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s, color 0.1
 								}
 							}
 
-							&:hover {
-								color: var(--el-color-primary);
-							}
-
 							&.is-active {
 								color: var(--el-color-primary) !important;
 								background: var(--el-color-primary-light-9);
@@ -456,6 +455,14 @@ $transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s, color 0.1
 						.el-tabs__nav {
 							.el-tabs__item {
 								margin-left: -12px;
+								margin-top: 6px;
+								//height: 36px;
+								height: calc(var(--el-tabs-header-height) - 6px);
+								mask: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANoAAAAkCAYAAADvhSSyAAAACXBIWXMAAAsTAAALEwEAmpwYAAABbUlEQVR4nO3d4U3CUBSG4beJA9QNcAJhAtnAOoGOwCaOoBvoCDgBOIHdQDbAH7cJMaHtxcJB6/skJ6Thptw/H+cSktOCn5kCc+AWKJtraaxqYA28A8/N9cktgE9ga1n/tBYcqDhw/QtQHfoh0gitgdkpbrzg/N8klvWbKruz5Xa0CbAi/R6TtDMjdbdOF5k3qzBk0j4VRwzazbC9SKN1nbMo9+j4QTo+SvpuA1z2LcoN2nbYXqRR681R7tFR0gAGTQpg0KQABk0KYNCkAAZNCmDQpAAGTQpg0KQABk0KYNCkAAZNCmDQpAAGTQpg0KQABk0KYNCkAAZNGq4kjTRolRM0x31L3Sb0TMLKCZqTiaVu9/QErW+oyAQHp0p9NqRBqnXbgq6glcATdjQpRw1ctb3ZFrQSeAQejr8fabRegbvcxXPScfHcDxCwrL9YK/Y0qILdgwSnpNHfHhWl4ZbAW/O6LEgplHRC/mEtBfgClkhxraFbr7gAAAAASUVORK5CYII=);
+								//mask-size: 100% 100%;
+								mask-size: 100% calc(100% + 1px);
+								mask-repeat: no-repeat;
+								//mask-position: bottom;
 								/*border-bottom: 0;
                 &::before {
                   display: none;
@@ -470,15 +477,6 @@ $transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s, color 0.1
 									color: var(--el-color-primary-light-3);
 								}
 
-								margin-top: 6px;
-								//height: 36px;
-								height: calc(var(--el-tabs-header-height) - 6px);
-								mask: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANoAAAAkCAYAAADvhSSyAAAACXBIWXMAAAsTAAALEwEAmpwYAAABbUlEQVR4nO3d4U3CUBSG4beJA9QNcAJhAtnAOoGOwCaOoBvoCDgBOIHdQDbAH7cJMaHtxcJB6/skJ6Thptw/H+cSktOCn5kCc+AWKJtraaxqYA28A8/N9cktgE9ga1n/tBYcqDhw/QtQHfoh0gitgdkpbrzg/N8klvWbKruz5Xa0CbAi/R6TtDMjdbdOF5k3qzBk0j4VRwzazbC9SKN1nbMo9+j4QTo+SvpuA1z2LcoN2nbYXqRR681R7tFR0gAGTQpg0KQABk0KYNCkAAZNCmDQpAAGTQpg0KQABk0KYNCkAAZNCmDQpAAGTQpg0KQABk0KYNCkAAZNGq4kjTRolRM0x31L3Sb0TMLKCZqTiaVu9/QErW+oyAQHp0p9NqRBqnXbgq6glcATdjQpRw1ctb3ZFrQSeAQejr8fabRegbvcxXPScfHcDxCwrL9YK/Y0qILdgwSnpNHfHhWl4ZbAW/O6LEgplHRC/mEtBfgClkhxraFbr7gAAAAASUVORK5CYII=);
-								//mask-size: 100% 100%;
-								mask-size: 100% calc(100% + 1px);
-								mask-repeat: no-repeat;
-								//mask-position: bottom;
-
 								&.is-active {
 									background: var(--el-color-primary-light-9);
 
@@ -503,7 +501,10 @@ $transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s, color 0.1
 								border: 1px solid var(--el-border-color);
 								border-radius: 4px;
 								margin-left: 4px;
-
+								margin-top: 6px;
+								//height: 36px;
+								height: calc(var(--el-tabs-header-height) - 12px);
+								padding: 0 4px;
 								&:first-child {
 									margin-left: 0;
 								}
@@ -513,24 +514,18 @@ $transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s, color 0.1
 									border-color: var(--el-color-primary-light-7);
 								}
 
-								margin-top: 6px;
-								//height: 36px;
-								height: calc(var(--el-tabs-header-height) - 12px);
-								padding: 0 4px;
 								/*.le-tabs__item {
                   padding: 0 4px;
                 }*/
 								&.is-active {
 									background-color: var(--el-color-primary-light-9);
-
+									color: var(--el-color-primary);
+									border-color: var(--el-color-primary-light-5);
 									.is-icon-close {
 										&:hover {
 											background-color: var(--el-color-primary);
 										}
 									}
-
-									color: var(--el-color-primary);
-									border-color: var(--el-color-primary-light-5);
 								}
 							}
 						}
@@ -564,19 +559,18 @@ $transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s, color 0.1
 								}
 
 								&:hover {
+									//background: var(--el-color-primary-light-9);
+									background: var(--el-border-color-light);
+									//color: var(--el-color-primary-light-3);
 									&::before {
 										width: 100%;
 										transition: $transition;
 									}
-
-									//background: var(--el-color-primary-light-9);
-									background: var(--el-border-color-light);
-									//color: var(--el-color-primary-light-3);
 								}
 
 								&.is-active {
 									background: var(--el-color-primary-light-9);
-
+									color: var(--el-color-primary);
 									&::before {
 										width: 100%;
 										border-bottom-color: var(--el-color-primary);
@@ -587,8 +581,6 @@ $transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), border 0s, color 0.1
 											background-color: var(--el-color-primary);
 										}
 									}
-
-									color: var(--el-color-primary);
 								}
 							}
 						}

src/views/dashboard/index.vue

@@ -505,13 +505,13 @@ const tableOpts = ref({
 	}
 }
 :deep(.info-wrap) {
+	min-height: 120px;
+	background: var(--el-bg-color) linear-gradient(120deg, var(--el-color-primary-light-9) 10%, var(--el-bg-color)) no-repeat;
 	.el-card__body {
 		display: flex;
 		align-items: center;
 		justify-content: center;
 	}
-	min-height: 120px;
-	background: var(--el-bg-color) linear-gradient(120deg, var(--el-color-primary-light-9) 10%, var(--el-bg-color)) no-repeat;
 	.header {
 		//font-size: var(--el-font-size-bigger);
 		font-size: 18px;