~fuyongxin/sgd.git

forked from sgd

parent: 15240050 | patch | commit | ignore whitespace

RuoYi

2020-08-22 f5cee45345d4571b356902ecfef26f64d507c59c

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

4 files modified

	ruoyi-ui/package.json	2 ●●●●● patch \| view \| raw \| blame \| history
	ruoyi-ui/src/components/HeaderSearch/index.vue	2 ●●●●● patch \| view \| raw \| blame \| history
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue	2 ●●●●● patch \| view \| raw \| blame \| history
	ruoyi-ui/src/utils/ruoyi.js	2 ●●●●● patch \| view \| raw \| blame \| history

 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",


 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;


 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;

    }


 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))

    //循环所有项

			@@ -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",

			@@ -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;

			@@ -82,7 +82,7 @@
			position: relative;
			overflow: hidden;
			width: 100%;
			::v-deep {
			/deep/ {
			.el-scrollbar__bar {
			bottom: 0px;
			}

			@@ -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))
			//循环所有项