Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-08-13 6473d4d8be63f2d18db9a8f7c4b0096ee4dd6d55

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev


 Conflicts:

	bin/clean.bat

	bin/run.bat

	ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

	ruoyi-ui/bin/run-web.bat

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

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/views/index.vue

 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -108,7 +108,7 @@
          plain
          icon="el-icon-download"
          size="mini"
          :loading="exportLoading"
          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['${moduleName}:${businessName}:export']"
        >导出</el-button>
@@ -585,19 +585,18 @@
    /** ${subTable.functionName}删除按钮操作 */
    handleDelete${subClassName}() {
      if (this.checked${subClassName}.length == 0) {
        this.$alert("请先选择要删除的${subTable.functionName}数据", "提示", { confirmButtonText: "确定", });
        this.msgError("请先选择要删除的${subTable.functionName}数据");
      } else {
        this.${subclassName}List.splice(this.checked${subClassName}[0].index - 1, 1);
        const ${subclassName}List = this.${subclassName}List;
        const checked${subClassName} = this.checked${subClassName};
        this.${subclassName}List = ${subclassName}List.filter(function(item) {
          return checked${subClassName}.indexOf(item.index) == -1
        });
      }
    },
    /** 单选框选中数据 */
    /** 复选框选中数据 */
    handle${subClassName}SelectionChange(selection) {
      if (selection.length > 1) {
        this.$refs.${subclassName}.clearSelection();
        this.$refs.${subclassName}.toggleRowSelection(selection.pop());
      } else {
        this.checked${subClassName} = selection;
      }
      this.checked${subClassName} = selection.map(item => item.index)
    },
#end
    /** 导出按钮操作 */

 ruoyi-ui/bin/run-web.bat

@@ -1,6 +1,6 @@
@echo off
echo.
echo [信息] 使用 Vue 运行 Web 工程。
echo [��Ϣ] ʹ�� Vue CLI �������� Web ���̡�
echo.

%~d0
@@ -9,4 +9,4 @@
cd ..
npm run dev

pause
pause

 ruoyi-ui/src/router/index.js

@@ -66,8 +66,8 @@
      {
        path: 'index',
        component: (resolve) => require(['@/views/index'], resolve),
        name: '首页',
        meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
        name: 'Index',
        meta: { title: '首页', icon: 'dashboard', affix: true }
      }
    ]
  },

 ruoyi-ui/src/utils/request.js

@@ -64,7 +64,7 @@
          location.href = '/index';
        })
      }).catch(() => {});
      return Promise.reject()
      return Promise.reject('令牌验证失败')
    } else if (code === 500) {
      Message({
        message: msg,

 ruoyi-ui/src/views/index.vue

@@ -336,7 +336,7 @@
import config from '../../package.json'

export default {
  name: "index",
  name: "Index",
  data() {
    return {
      // 版本号

 ruoyi-ui/src/views/system/role/selectUser.vue

@@ -64,7 +64,7 @@
  props: {

    // 角色编号

    roleId: {

      type: Number

      type: [Number, String]

    }

  },

  data() {