Merge remote-tracking branch 'upstream/master'

fungleo

2020-08-04 107672419e484d7893ecf624d4af2101cc72d890

 ruoyi-ui/src/components/IconSelect/index.vue

@@ -25,10 +25,9 @@
  },

  methods: {

    filterIcons() {

      this.iconList = icons

      if (this.name) {

        this.iconList = this.iconList.filter(item => item.includes(this.name))

      } else {

        this.iconList = icons

      }

    },

    selectedIcon(name) {