From a4fe88ca611435ee33a6c872734c6f9da7489928 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期日, 23 四月 2023 14:53:45 +0800
Subject: [PATCH] !707 恢复翻页/切换路由滚动功能 Merge pull request !707 from 也曾为你像超人/master
---
ruoyi-ui/src/components/IconSelect/index.vue | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/ruoyi-ui/src/components/IconSelect/index.vue
index 2404321..8dadc02 100644
--- a/ruoyi-ui/src/components/IconSelect/index.vue
+++ b/ruoyi-ui/src/components/IconSelect/index.vue
@@ -5,16 +5,14 @@
<i slot="suffix" class="el-icon-search el-input__icon" />
</el-input>
<div class="icon-list">
- <el-scrollbar>
- <div class="list-container">
- <div v-for="(item, index) in iconList" class="icon-item-wrapper" :key="index" @click="selectedIcon(item)">
- <div :class="['icon-item', { active: activeIcon === item }]">
- <svg-icon :icon-class="item" class-name="icon" style="height: 30px;width: 16px;" />
- <span :title="item">{{ item }}</span>
- </div>
+ <div class="list-container">
+ <div v-for="(item, index) in iconList" class="icon-item-wrapper" :key="index" @click="selectedIcon(item)">
+ <div :class="['icon-item', { active: activeIcon === item }]">
+ <svg-icon :icon-class="item" class-name="icon" style="height: 25px;width: 16px;"/>
+ <span>{{ item }}</span>
</div>
</div>
- </el-scrollbar>
+ </div>
</div>
</div>
</template>
@@ -63,27 +61,21 @@
}
.icon-list {
height: 200px;
- ::v-deep .el-scrollbar {
- height: 100%;
- .el-scrollbar__wrap {
- overflow-x: hidden;
- }
- }
+ overflow: auto;
.list-container {
display: flex;
flex-wrap: wrap;
.icon-item-wrapper {
width: calc(100% / 3);
- height: 30px;
- line-height: 30px;
- margin-bottom: -5px;
+ height: 25px;
+ line-height: 25px;
cursor: pointer;
display: flex;
.icon-item {
display: flex;
max-width: 100%;
height: 100%;
- padding: 0 2px;
+ padding: 0 5px;
&:hover {
background: #ececec;
border-radius: 5px;
--
Gitblit v1.9.2