From 71c4ece010f68a74eeff5e986caecb9a0bb2e36c Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/App.vue | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index ddf8283..786039a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,8 +25,8 @@
};
</script>
<style>
- @import url("../static/alifont/iconfont.css");
- /* @import url("//at.alicdn.com/t/c/font_4379269_2wteluxhkyd.css"); */
+ /* @import url("../static/alifont/iconfont.css"); */
+ @import url("//at.alicdn.com/t/c/font_4457508_5ubi3w3kng.css");
* {
margin: 0;
@@ -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;
@@ -265,11 +274,37 @@
.el-divider {
margin: 10px 0;
}
-
+
.required-span{
color: red;
}
+ .luckysheet-cols-menu {
+ z-index: 9000;
+ }
+
+ .luckysheet-input-box {z-index:3000}
+
+ .luckysheet-wa-editor{
+ z-index: 9004 !important;
+ }
+
+ .luckysheet-share-logo,.luckysheet_info_detail_save,.luckysheet_info_detail_update{
+ visibility: hidden;
+ }
+
+ .el-loading-mask{
+ z-index: 9990;
+ }
+
/* 鍏ㄥ眬杈撳叆妗嗘牱寮� */
/* 鍏ㄥ眬鎸夐挳鏍峰紡 */
-</style>
\ No newline at end of file
+ /* 鍏ㄥ眬鎹㈣婧㈠嚭鏍峰紡 */
+ .ellipsis-multiline {
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2; /* 瀹氫箟鏂囨湰鐨勮鏁� */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+</style>
--
Gitblit v1.9.3