From f5cee45345d4571b356902ecfef26f64d507c59c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 22 Aug 2020 14:49:47 +0800
Subject: [PATCH] 修改sass为node-sass，避免el-icon图标乱码
---
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue | 2 +-
ruoyi-ui/package.json | 2 +-
ruoyi-ui/src/components/HeaderSearch/index.vue | 2 +-
ruoyi-ui/src/utils/ruoyi.js | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 6f7f959..5038c9c 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -86,7 +86,7 @@
"mockjs": "1.0.1-beta3",
"plop": "2.3.0",
"runjs": "4.3.2",
- "sass": "1.26.10",
+ "node-sass": "4.14.1",
"sass-loader": "8.0.2",
"script-ext-html-webpack-plugin": "2.1.3",
"script-loader": "0.7.2",
diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue
index 114ae04..6fe5fd6 100644
--- a/ruoyi-ui/src/components/HeaderSearch/index.vue
+++ b/ruoyi-ui/src/components/HeaderSearch/index.vue
@@ -167,7 +167,7 @@
display: inline-block;
vertical-align: middle;
- ::v-deep .el-input__inner {
+ /deep/ .el-input__inner {
border-radius: 0;
border: 0;
padding-left: 0;
diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
index c110bf1..dd4b77f 100644
--- a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
@@ -82,7 +82,7 @@
position: relative;
overflow: hidden;
width: 100%;
- ::v-deep {
+ /deep/ {
.el-scrollbar__bar {
bottom: 0px;
}
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index d33ec7f..899459b 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -131,7 +131,7 @@
id = id || 'id'
parentId = parentId || 'parentId'
children = children || 'children'
- rootId = rootId || Math.min.apply(Math,data.map(item => { return item[parentId] })) || 0
+ rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
//对源数据深度克隆
const cloneData = JSON.parse(JSON.stringify(data))
//循环所有项
--
Gitblit v1.9.3