From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/App.vue |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 58de929..834f3fb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -102,6 +102,7 @@
 		padding: 6px 10px;
 		min-width: 0;
 		border-radius: 6px;
+    z-index: 9999999999 !important;
 	}
 
 	table {
@@ -109,8 +110,16 @@
 	}
 
 	.el-popover {
+    max-height: 80vh;
+    overflow-y: auto;
+    overflow-x: hidden;
 		padding: 0;
+		z-index: 9999 !important;
 	}
+
+  .el-popover::-webkit-scrollbar{
+    width: 0;
+  }
 
 	.el-popper .popper__arrow {
 		display: none;
@@ -271,7 +280,7 @@
 	}
 
 	.luckysheet-cols-menu {
-	  z-index: 9004;
+	  z-index: 9000;
 	}
 
 	.luckysheet-input-box {z-index:3000}
@@ -284,6 +293,23 @@
 		visibility: hidden;
 	}
 
+	.el-loading-mask{
+		z-index: 9990;
+	}
+
 	/* 鍏ㄥ眬杈撳叆妗嗘牱寮� */
 	/* 鍏ㄥ眬鎸夐挳鏍峰紡 */
+  /* 鍏ㄥ眬鎹㈣婧㈠嚭鏍峰紡 */
+  .ellipsis-multiline {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2; /* 瀹氫箟鏂囨湰鐨勮鏁� */
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .el-cascader-menu__wrap{
+    height: 300px;
+  }
+
 </style>

--
Gitblit v1.9.3