Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/App.vue

@@ -106,29 +106,29 @@ body {
 }
 @-webkit-keyframes rotateplane {
   0% {
-    -webkit-transform: perspective(120px);
+    -webkit-transform: translateZ(120px);
   }
   50% {
-    -webkit-transform: perspective(120px) rotateY(180deg);
+    -webkit-transform: translateZ(120px) rotateY(180deg);
   }
   100% {
-    -webkit-transform: perspective(120px) rotateY(180deg);
+    -webkit-transform: translateZ(120px) rotateY(180deg);
   }
 }
 
 @keyframes rotateplane {
   0% {
-    transform: perspective(120px) rotateY(0deg);
-    -webkit-transform: perspective(120px) rotateY(0deg);
+    transform: translateZ(120px) rotateY(0deg);
+    -webkit-transform: translateZ(120px) rotateY(0deg);
   }
 
   50% {
-    transform: perspective(120px) rotateY(-179.9deg);
-    -webkit-transform: perspective(120px) rotateY(-179.9deg);
+    transform: translateZ(120px) rotateY(-179.9deg);
+    -webkit-transform: translateZ(120px) rotateY(-179.9deg);
   }
   100% {
-    transform: perspective(120px) rotateY(0deg);
-    -webkit-transform: perspective(120px) rotateY(0deg);
+    transform: translateZ(120px) rotateY(0deg);
+    -webkit-transform: translateZ(120px) rotateY(0deg);
   }
 }
 .el-table {

src/components/select-all/index.vue

@@ -65,6 +65,7 @@ export default {
 
           let labelStr = "";
           if (newVal && newVal.length > 0 && selected) {
+
             labelStr = selected
               .map((item) => (item.label ? item.label : item.value))
               .join(",");
@@ -72,6 +73,7 @@ export default {
             this.isShow =
               (this.$refs?.select?.disabled || false) &&
               this.labelStr?.length > 0;
+                 console.log(this.isShow)
           } else {
             this.labelStr = "";
             this.isShow =
@@ -130,7 +132,7 @@ export default {
   width: 100%;
   position: absolute;
   z-index: 1000;
-  // height: 40px;
+  min-height: 40px;
   .showDev {
     width: 100%;
   }