Merge remote-tracking branch 'origin/StableVersion' into develop

src/assets/style/style.less

@@ -10,6 +10,10 @@ html,body,#app{
 	--aida-fsize1-8: calc(1.8rem*1.2);
 	--aida-fsize1-6: calc(1.6rem*1.2);
 	--aida-fsize1-4: calc(1.4rem*1.2);
+	--antd-wave-shadow-color:#39215b;
+}
+::selection{
+	background-color: #1890ff;
 }
 input{
 	outline:none;
@@ -359,6 +363,9 @@ input:focus{
 	cursor: pointer;
 	pointer-events: auto !important;
 }
+.ant-popover-placement-top{
+	z-index: 9999;
+}
 .ant-drawer{
 	z-index: 9999;
 }
@@ -1600,7 +1607,7 @@ textarea:focus{
 	outline: none; /* 清除默认焦点样式 */
 }
 //设计input和上传按钮样式
-.collection_modal_body,.design_detail_modal_component,.library_page,.productImg_modal,.accountEdit_page{
+.collection_modal_body,.design_detail_modal_component,.library_page,.productImg_modal,.accountEdit_page,.generalMenu_printModel_upload{
 	.input_border{
 		z-index: 2;
 		display: flex;
@@ -1680,6 +1687,7 @@ textarea:focus{
 			width: var(--width);
 			display: flex;
 			float: left;
+			align-items: center;
 			.ant-spin-text{
 				font-size: 1.2rem;
 			}