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

疯狂的狮子li

2020-04-29 1dae7c9bc944880863e81438d46f36ccb6865ca0

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


 Conflicts:

	ruoyi-ui/src/assets/styles/ruoyi.scss

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/store/modules/permission.js

	ruoyi-ui/src/views/tool/gen/index.vue

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java

	ruoyi/src/main/resources/vm/java/domain.java.vm

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

 README.md

@@ -81,4 +81,4 @@

## 若依前后端分离交流群

QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC)点击按钮入群。
QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) 点击按钮入群。

 ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -53,7 +53,7 @@
    margin-left: 20px;
}

.el-dialog {
.el-dialog:not(.is-fullscreen){
    margin-top: 6vh !important;
}

@@ -138,7 +138,7 @@
    padding-left: 15px;
    margin-bottom: 10px;
}

  
/* text color */
.text-navy {
    color: #1ab394;
@@ -189,10 +189,9 @@
    overflow: hidden;
}


/* 拖拽列样式 */
.sortable-ghost{
    opacity: .8;
    color: #fff!important;
    background: #42b983!important;
}
}

 ruoyi-ui/src/router/index.js

@@ -33,23 +33,23 @@
    children: [
      {
        path: '/redirect/:path(.*)',
        component: () => import('@/views/redirect')
        component: (resolve) => require(['@/views/redirect'], resolve)
      }
    ]
  },
  {
    path: '/login',
    component: () => import('@/views/login'),
    component: (resolve) => require(['@/views/login'], resolve),
    hidden: true
  },
  {
    path: '/404',
    component: () => import('@/views/error/404'),
    component: (resolve) => require(['@/views/error/404'], resolve),
    hidden: true
  },
  {
    path: '/401',
    component: () => import('@/views/error/401'),
    component: (resolve) => require(['@/views/error/401'], resolve),
    hidden: true
  },
  {
@@ -59,7 +59,7 @@
    children: [
      {
        path: 'index',
        component: () => import('@/views/index'),
        component: (resolve) => require(['@/views/index'], resolve),
        name: '首页',
        meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
      }
@@ -73,7 +73,7 @@
    children: [
      {
        path: 'profile',
        component: () => import('@/views/system/user/profile/index'),
        component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
        name: 'Profile',
        meta: { title: '个人中心', icon: 'user' }
      }
@@ -86,7 +86,7 @@
    children: [
      {
        path: 'type/data/:dictId(\\d+)',
        component: () => import('@/views/system/dict/data'),
        component: (resolve) => require(['@/views/system/dict/data'], resolve),
        name: 'Data',
        meta: { title: '字典数据', icon: '' }
      }
@@ -99,7 +99,7 @@
    children: [
      {
        path: 'log',
        component: () => import('@/views/monitor/job/log'),
        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
        name: 'JobLog',
        meta: { title: '调度日志' }
      }
@@ -112,7 +112,7 @@
    children: [
      {
        path: 'edit',
        component: () => import('@/views/tool/gen/editTable'),
        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
        name: 'GenEdit',
        meta: { title: '修改生成配置' }
      }

 ruoyi-ui/src/store/modules/permission.js

@@ -48,7 +48,7 @@
}

export const loadView = (view) => { // 路由懒加载
  return () => import(`@/views/${view}`)
  return (resolve) =>  require([`@/views/${view}`], resolve)
}

export default permission

 ruoyi-ui/src/views/tool/gen/index.vue

@@ -80,7 +80,11 @@

    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55"></el-table-column>
      <el-table-column label="序号" align="center" prop="tableId" width="60px" />
      <el-table-column label="序号" type="index" width="50" align="center">
        <template slot-scope="scope">
          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
        </template>
      </el-table-column>
      <el-table-column
        label="表名称"
        align="center"
@@ -284,4 +288,4 @@
    }
  }
};
</script>
</script>

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

@@ -174,7 +174,7 @@
            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
            {
                Cell cell = heard.getCell(i);
                if (StringUtils.isNotNull(cell != null))
                if (StringUtils.isNotNull(cell))
                {
                    String value = this.getCellValue(heard, i).toString();
                    cellMap.put(value, i);
@@ -827,7 +827,7 @@
        try
        {
            Cell cell = row.getCell(column);
            if (cell != null)
            if (StringUtils.isNotNull(cell))
            {
                if (cell.getCellTypeEnum() == CellType.NUMERIC || cell.getCellTypeEnum() == CellType.FORMULA)
                {

 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java

@@ -11,6 +11,7 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
import com.ruoyi.project.system.domain.SysRole;
import com.ruoyi.project.system.domain.SysRoleDept;
@@ -82,7 +83,7 @@
     */
    public List<SysRole> selectRoleAll()
    {
        return roleMapper.selectRoleAll();
        return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
    }

    /**

 ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java

@@ -196,6 +196,7 @@
            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
            {
                importList.add("java.util.Date");
                importList.add("com.fasterxml.jackson.annotation.JsonFormat");
            }
            else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
            {

 ruoyi/src/main/resources/vm/java/domain.java.vm

@@ -23,7 +23,7 @@

/**
 * ${functionName}对象 ${tableName}
 *
 * 
 * @author ${author}
 * @date ${datetime}
 */

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

@@ -88,7 +88,7 @@
#elseif($column.list && $column.htmlType == "datetime")

      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">

        <template slot-scope="scope">

          <span>{{ parseTime(scope.row.${javaField}) }}</span>

          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>

        </template>

      </el-table-column>

#elseif($column.list && "" != $column.dictType)


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

@@ -112,7 +112,7 @@
#elseif($column.list && $column.htmlType == "datetime")
      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.${javaField}) }}</span>
          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
#elseif($column.list && "" != $column.dictType)