From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突
---
src/App.vue | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 0c035f8..99d5e8d 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 {
@@ -265,11 +266,29 @@
.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
+</style>
--
Gitblit v1.9.3