From cd0252da419d4065e322b945da2d836796bc0e1f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 11:23:46 +0800
Subject: [PATCH] 合并冲突
---
src/App.vue | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 1706364..834f3fb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -299,4 +299,17 @@
/* 鍏ㄥ眬杈撳叆妗嗘牱寮� */
/* 鍏ㄥ眬鎸夐挳鏍峰紡 */
+ /* 鍏ㄥ眬鎹㈣婧㈠嚭鏍峰紡 */
+ .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