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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 58de929..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 {
@@ -271,7 +272,7 @@
}
.luckysheet-cols-menu {
- z-index: 9004;
+ z-index: 9000;
}
.luckysheet-input-box {z-index:3000}
@@ -284,6 +285,10 @@
visibility: hidden;
}
+ .el-loading-mask{
+ z-index: 9990;
+ }
+
/* 鍏ㄥ眬杈撳叆妗嗘牱寮� */
/* 鍏ㄥ眬鎸夐挳鏍峰紡 */
</style>
--
Gitblit v1.9.3