瀏覽代碼

修改sass为node-sass,避免el-icon图标乱码

RuoYi 5 年之前
父節點
當前提交
f5cee45345

+ 1 - 1
ruoyi-ui/package.json

@@ -86,7 +86,7 @@
86 86
     "mockjs": "1.0.1-beta3",
87 87
     "plop": "2.3.0",
88 88
     "runjs": "4.3.2",
89
-    "sass": "1.26.10",
89
+    "node-sass": "4.14.1",
90 90
     "sass-loader": "8.0.2",
91 91
     "script-ext-html-webpack-plugin": "2.1.3",
92 92
     "script-loader": "0.7.2",

+ 1 - 1
ruoyi-ui/src/components/HeaderSearch/index.vue

@@ -167,7 +167,7 @@ export default {
167 167
     display: inline-block;
168 168
     vertical-align: middle;
169 169
 
170
-    ::v-deep .el-input__inner {
170
+    /deep/ .el-input__inner {
171 171
       border-radius: 0;
172 172
       border: 0;
173 173
       padding-left: 0;

+ 1 - 1
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue

@@ -82,7 +82,7 @@ export default {
82 82
   position: relative;
83 83
   overflow: hidden;
84 84
   width: 100%;
85
-  ::v-deep {
85
+  /deep/ {
86 86
     .el-scrollbar__bar {
87 87
       bottom: 0px;
88 88
     }

+ 1 - 1
ruoyi-ui/src/utils/ruoyi.js

@@ -131,7 +131,7 @@ export function handleTree(data, id, parentId, children, rootId) {
131 131
 	id = id || 'id'
132 132
 	parentId = parentId || 'parentId'
133 133
 	children = children || 'children'
134
-	rootId = rootId || Math.min.apply(Math,data.map(item => { return item[parentId] })) || 0
134
+	rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
135 135
 	//对源数据深度克隆
136 136
 	const cloneData = JSON.parse(JSON.stringify(data))
137 137
 	//循环所有项