From 17ba8e005e8f01a0d11c70413a337fe0f1288871 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 30 五月 2025 10:19:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/zd-before into dev
---
src/assets/styles/sidebar.scss | 2 +-
src/main.js | 1 +
src/layout/components/TagsView/index.vue | 25 +++++++------------------
3 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 3135b4e..4b7b34e 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -42,7 +42,7 @@
}
.el-scrollbar {
- height: 100%;
+ height: 92%;
}
&.has-logo {
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 15fa13b..0839b2a 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -272,14 +272,14 @@
display: inline-block;
position: relative;
cursor: pointer;
- height: 26px;
+ height: 30px;
line-height: 26px;
- border: 1px solid var(--tags-item-border, #d8dce5);
+ //border: 1px solid var(--tags-item-border, #d8dce5);
color: var(--tags-item-text, #495060);
background: var(--tags-item-bg, #fff);
- padding: 0 8px;
+ padding: 2px 16px;
font-size: 12px;
- margin-left: 5px;
+ //margin-left: 5px;
margin-top: 4px;
&:first-of-type {
@@ -291,20 +291,9 @@
}
&.active {
- background-color: #42b983;
- color: #fff;
- border-color: #42b983;
-
- &::before {
- content: '';
- background: #fff;
- display: inline-block;
- width: 8px;
- height: 8px;
- border-radius: 50%;
- position: relative;
- margin-right: 5px;
- }
+ border-radius: 10px 10px 0px 0px;
+ background-color: #F2F2F4 !important;
+ color: #165DFF;
}
}
}
diff --git a/src/main.js b/src/main.js
index 0994583..f059fe0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -78,5 +78,6 @@
// 鏀寔 large銆乨efault銆乻mall
size: Cookies.get('size') || 'default'
})
+app._context.components.ElDialog.props.closeOnClickModal.default = false
app.mount('#app')
--
Gitblit v1.9.3