Merge remote-tracking branch 'origin/master'

boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysFile.java

@@ -20,6 +20,16 @@ public class SysFile
      */
     private String url;
 
+    /**
+     * vue上传组件带的 为了取的时候不要来回去转，直接用此接受
+     */
+    private String status;
+
+    /**
+     * vue上传组件带的
+     */
+    private String uid;
+
     public String getName()
     {
         return name;
@@ -40,11 +50,29 @@ public class SysFile
         this.url = url;
     }
 
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("name", getName())
             .append("url", getUrl())
+            .append("uid", getUid())
+            .append("status", getStatus())
             .toString();
     }
 }

boman-api/boman-domain/src/main/java/com.boman.domain/exception/UnknownColumnException.java

@@ -0,0 +1,20 @@
+package com.boman.domain.exception;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author shiqian
+ * @date 2021年04月21日 15:44
+ **/
+public class UnknownColumnException extends RuntimeException{
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnknownColumnException.class);
+
+    public UnknownColumnException(){}
+
+    public UnknownColumnException(String errorMsg){
+        super(errorMsg);
+    }
+
+}

boman-common/boman-common-core/src/main/java/com/boman/common/core/utils/obj/ObjectUtils.java

@@ -132,6 +132,10 @@ public class ObjectUtils {
         return input != null && !input.isEmpty();
     }
 
+    public static boolean isEmpty(JSONObject input){
+        return !isNotEmpty(input);
+    }
+
     public static boolean isNotEmpty(JSONArray input){
         return input != null && !input.isEmpty();
     }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDictDataServiceImpl.java

@@ -1,12 +1,15 @@
 package com.boman.system.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.boman.domain.SysDictData;
 import com.boman.system.mapper.SysDictDataMapper;
 import com.boman.system.service.ISysDictDataService;
+import com.boman.system.service.ISysDictTypeService;
 import com.boman.system.utils.DictUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 字典 业务层处理
@@ -18,6 +21,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService
 {
     @Autowired
     private SysDictDataMapper dictDataMapper;
+    @Resource
+    private ISysDictTypeService dictTypeService;
 
     /**
      * 根据条件分页查询字典数据
@@ -39,9 +44,15 @@ public class SysDictDataServiceImpl implements ISysDictDataService
      * @return 字典标签
      */
     @Override
-    public String selectDictLabel(String dictType, String dictValue)
-    {
-        return dictDataMapper.selectDictLabel(dictType, dictValue);
+    public String selectDictLabel(String dictType, String dictValue) {
+        List<SysDictData> datas = dictTypeService.selectDictDataByType(dictType);
+        for (SysDictData data : datas) {
+            if (data.getDictValue().equalsIgnoreCase(dictValue)) {
+                return data.getDictLabel();
+            }
+        }
+
+        return null;
     }
 
     /**

boman-web-core/src/main/java/com/boman/web/core/controller/ObjController.java

@@ -170,24 +170,24 @@ public class ObjController {
         return tableServiceCmdService.getQueryParam(condition);
     }
 
-
-    /**
-     * 功能描述: 获取表单表头
-     * 注意: 都是从redis中拿的，如果数据库和redis不一致，则需刷新一下redis
-     * 刷新的入口为 {@link MyController#loadTable(com.boman.gen.domain.GenTable)}
-     *
-     *                    eg:{
-     *                          "table": "sys_config"
-     *                        }
-     *
-     * @param condition condition
-     * @return com.boman.common.core.web.domain.AjaxResult
-     */
-    @ApiOperation(value = "获取表单表头")
-    @PostMapping("/getTableHead")
-    public AjaxResult getTableHead(@RequestBody FormDataDto condition) {
-        return tableServiceCmdService.getTableHead(condition);
-    }
+//
+//    /**
+//     * 功能描述: 获取表单表头
+//     * 注意: 都是从redis中拿的，如果数据库和redis不一致，则需刷新一下redis
+//     * 刷新的入口为 {@link MyController#loadTable(com.boman.gen.domain.GenTable)}
+//     *
+//     *                    eg:{
+//     *                          "table": "sys_config"
+//     *                        }
+//     *
+//     * @param condition condition
+//     * @return com.boman.common.core.web.domain.AjaxResult
+//     */
+//    @ApiOperation(value = "获取表单表头")
+//    @PostMapping("/getTableHead")
+//    public AjaxResult getTableHead(@RequestBody FormDataDto condition) {
+//        return tableServiceCmdService.getTableHead(condition);
+//    }
 
     /**
      * 功能描述: 获取表单按钮

boman-web-core/src/main/java/com/boman/web/core/mapper/StandardlyMapper.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 import java.util.function.Consumer;
 
-import static com.boman.common.core.utils.obj.ObjectUtils.escapeStr;
+import static com.boman.common.core.utils.obj.ObjectUtils.*;
 import static com.boman.web.core.constant.FormDataConstant.*;
 
 /**
@@ -124,7 +124,7 @@ public interface StandardlyMapper {
     @SelectProvider(type = SqlProvider.class, method = "selectByIdList")
     List<JSONObject> selectByIdList(@Param("tableName") String tableName
             , @Param("pkName") String pkName, @Param("idList") List<Long> idList
-            , @Param("showData") JSONArray showData);
+            , @Param("showData") List<String> showData);
 
     /**
      * 功能描述: 自定义查询，需要查询的字段和value都在condition中
@@ -529,7 +529,7 @@ public interface StandardlyMapper {
             packCondition(packCondition, wholeSql);
 
             wholeSql.append(" order by ").append(orderBy).append(" limit ").append(limit);
-            if (ObjectUtils.isNotEmpty(offset)) {
+            if (isNotEmpty(offset)) {
                 wholeSql.append(", ").append(offset);
             }
 
@@ -542,13 +542,20 @@ public interface StandardlyMapper {
             JSONObject param = (JSONObject) para.get("param");
             String tableName = (String) para.get("tableName");
 
+            String result;
             StringBuilder wholeSql = new StringBuilder();
-            wholeSql.append("select * from ").append(tableName).append(" where ");
-            for (Map.Entry<String, Object> entry : param.entrySet()) {
-                wholeSql.append(entry.getKey()).append(" = ").append(entry.getValue()).append(" and ");
+            wholeSql.append("select * from ").append(tableName);
+            if (isEmpty(param)) {
+                result = wholeSql.toString();
+            } else {
+                wholeSql.append(" where ");
+                for (Map.Entry<String, Object> entry : param.entrySet()) {
+                    wholeSql.append(entry.getKey()).append(" = ").append(entry.getValue()).append(" and ");
+                }
+
+                result = StringUtils.substringBeforeLast(wholeSql.toString(), "and");
             }
 
-            String result = StringUtils.substringBeforeLast(wholeSql.toString(), "and");
             LOGGER.info("查询拼出的sql语句为：{}", result);
             return result;
         }
@@ -557,15 +564,14 @@ public interface StandardlyMapper {
             String tableName = (String) para.get("tableName");
             String pkName = (String) para.get("pkName");
             List<Long> idList = (List<Long>) para.get(ID_LIST);
-            JSONArray showData = (JSONArray) para.get("showData");
+            List<String> showData = (List<String>) para.get("showData");
 
             StringBuilder wholeSql = new StringBuilder();
             wholeSql.append("select ");
             // showData
             StringBuilder showDataSql = new StringBuilder();
-            if (ObjectUtils.isNotEmpty(showData)) {
-                for (Object columnObj : showData) {
-                    String columnName = (String) columnObj;
+            if (isNotEmpty(showData)) {
+                for (String columnName : showData) {
                     showDataSql.append(columnName).append(", ");
                 }
                 wholeSql.append(StringUtils.substringBeforeLast(showDataSql.toString(), ","));
@@ -610,7 +616,7 @@ public interface StandardlyMapper {
          * @param wholeSql      sql
          */
         private void packCondition(JSONObject packCondition, StringBuilder wholeSql) {
-            if (ObjectUtils.isNotEmpty(packCondition)) {
+            if (isNotEmpty(packCondition)) {
                 wholeSql.append(" where ");
                 StringBuilder conditionSql = new StringBuilder();
                 for (Map.Entry<String, Object> entry : packCondition.entrySet()) {

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -3,6 +3,7 @@ package com.boman.web.core.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.boman.common.core.constant.GenConstants;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.SecurityUtils;
@@ -33,7 +34,6 @@ import com.boman.web.core.service.update.IBaseUpdateService;
 import com.boman.web.core.utils.IdUtils;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,12 +45,10 @@ import java.sql.Timestamp;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import static com.boman.common.core.utils.obj.ObjectUtils.*;
 import static com.boman.web.core.constant.FormDataConstant.*;
 import static com.boman.web.core.utils.ColumnUtils.*;
-import static com.boman.web.core.utils.ColumnUtils.handlerBlobWithJSONObject;
 
 /**
  * @author shiqian
@@ -196,21 +194,21 @@ public class TableServiceCmdService {
     public AjaxResult queryList(FormDataDto dto) {
         requireNonNull(dto.getTable(), "tableName = [" + dto.getTable() + "] 此表不存在");
 
-        // 拿到每个字段对应的查询类型，=、 like、 >、 <
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, dto.getTable());
-        JSONObject fixedData = dto.getFixedData();
-        fixedData = ifNullSetEmpty(fixedData);
+        JSONObject fixedData = ifNullSetEmpty(dto.getFixedData());
+        List<GenTableColumn> columns = genTable.getColumns();
 
         // 查询条件
         JSONObject condition = ifNullSetEmpty(fixedData.getJSONObject(CONDITION));
-        checkColumn(condition, genTable.getColumns());
-        List<GenTableColumn> columns = genTable.getColumns();
+        // 检查列
+        checkColumn(condition, columns);
         // 封装好以后的查询条件
         JSONObject packCondition = ifNullSetEmpty(packColCondition(columns, condition));
-        JSONArray jsonArray = fixedData.getJSONArray(SHOW_DATA);
-        checkColumn(jsonArray, genTable.getColumns());
+        JSONArray showData = fixedData.getJSONArray(SHOW_DATA);
+        // 检查列
+        checkColumn(showData, genTable.getColumns());
         // 需要返回到前台的列, 需要判断是否是列表展示, 4为判断列表是否可见
-        JSONArray showData = filterData(columns, 4, jsonArray, MaskConstant.LIST_VISIBLE::equals);
+        showData = filterData(columns, 4, showData, MaskConstant.LIST_VISIBLE::equals);
 
         JSONObject rows = new JSONObject();
         int total = selectService.countByCondition(genTable.getTableName(), condition, packCondition);
@@ -223,7 +221,9 @@ public class TableServiceCmdService {
 
         List<JSONObject> result = selectService.selectByCondition(genTable.getTableName(), condition, packCondition
                 , showData, dto.getOrderBy(), dto.getLimit(), dto.getOffset());
+        // 处理blob
         handlerBlobWithJSONObject(genTable.getIsContainsBlob(), result);
+        // 处理日期、外键、字典值
         handler(result =  filter(result, ObjectUtils::isNotEmpty), columns);
         // 定制接口
         result = isCustomized(dto.getTable(),result,"trigger_retrieve");
@@ -304,7 +304,10 @@ public class TableServiceCmdService {
         for (JSONObject jsonObject : result) {
             for (GenTableColumn column : columns) {
                 if (jsonObject.containsKey(column.getColumnName()) && NEED_CONVERT_DATE_LIST.contains(column.getColumnType())) {
-                    getStrByTimeStamp(jsonObject, column.getColumnName());
+                    Date date = jsonObject.getTimestamp(column.getColumnName());
+                    if (null != date) {
+                        jsonObject.put(column.getColumnName(), DateUtils.dateTime(date));
+                    }
                 }
             }
         }
@@ -325,17 +328,8 @@ public class TableServiceCmdService {
             for (GenTableColumn column : columns) {
                 if (jsonObject.containsKey(column.getColumnName())) {
                     String value = jsonObject.getString(column.getColumnName());
-                    JSONArray fileList = JSON.parseArray(value);
-                    ArrayList<SysFile> files = Lists.newArrayListWithCapacity(fileList.size());
-                    for (Object obj : fileList) {
-                        JSONObject fileItem = (JSONObject) obj;
-                        SysFile file = new SysFile();
-                        file.setName(fileItem.getString(SINGLE_OBJ_NAME));
-                        file.setUrl(fileItem.getString(URL));
-                        files.add(file);
-                    }
-
-                    jsonObject.put(column.getColumnName(), files);
+                    List<SysFile> fileList = JSON.parseObject(value, new TypeReference<List<SysFile>>(){}.getType());
+                    jsonObject.put(column.getColumnName(), fileList);
                 }
             }
         }
@@ -367,20 +361,6 @@ public class TableServiceCmdService {
         }
     }
 
-    /**
-     * 功能描述: 把jsonObject中时间类型转为string，再放到jsonObject中，类型为: yyyy-mm-dd
-     *
-     * @param jsonObject jsonObject
-     * @param columnType create_time update_time...
-     */
-    private void getStrByTimeStamp(JSONObject jsonObject, String columnType) {
-        Date date = jsonObject.getTimestamp(columnType);
-        if (null != date) {
-            jsonObject.put(columnType, DateUtils.dateTime(date));
-        }
-    }
-
-
     /**
      * 功能描述: 获取单表单数据
      *
@@ -389,14 +369,11 @@ public class TableServiceCmdService {
      */
     public AjaxResult getObject(FormDataDto dto) {
         String tableName = requireNonNull(dto.getTable(), "tableName = [" + dto.getTable() + "] 此表不存在");
-
-        GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, tableName);
-        String pkName = IdUtils.getPkName(genTable.getColumns());
-        JSONObject fixedData = dto.getFixedData();
-        Long id = fixedData.getLong(FormDataConstant.ID);
-        requireNonNull(id, "如果是回显，则传参为此行记录的id， 如为新增，则传-1，传null可不行");
         Boolean isUi = requireNonNull(dto.getIsUi(), "未传isUi这个参数");
+        Long id = dto.getFixedData().getLong(FormDataConstant.ID);
+        requireNonNull(id, "如果是回显，则传参为此行记录的id， 如为新增，则传-1，传null可不行");
 
+        GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, tableName);
         List<GenTableColumn> columns = genTable.getColumns();
         // id = -1时，查询该表单对应的字段名称
         if (ltZero(id)) {
@@ -404,8 +381,10 @@ public class TableServiceCmdService {
         }
 
         // 默认查所有字段，不支持自定义
+        String pkName = IdUtils.getPkName(genTable.getColumns());
         JSONObject json = selectService.selectById(tableName, pkName, id);
         requireNonNull(json, "id 为[" + id + "]的数据不存在, 表名为[" + tableName + "]");
+        // 处理blob
         handlerBlobWithJSONObject(genTable.getIsContainsBlob(), Collections.singletonList(json));
         List<GenTableColumn> parentColumns = filterHrAndSort(columns);
 
@@ -434,51 +413,11 @@ public class TableServiceCmdService {
         }
 
         JSONObject result = new JSONObject();
-//        result.put(SHOW_DATA, packSingleObj(json, columns));
         result.put(SHOW_DATA, parentColumns);
         result.put(BUTTON_LIST, getButton(tableName));
         return AjaxResult.success(result);
     }
 
-    /**
-     * 功能描述: 单对象查询，封装成此类型返给前台：name=username, value=zhangsan, type=input, types=[{},{}]
-     *
-     * @param jsonObject 数据库查出的字段名称对应字段值
-     * @param columns    该表对应的所有的字段的信息
-     * @return java.util.List<com.alibaba.fastjson.JSONObject>
-     */
-    private List<JSONObject> packSingleObj(JSONObject jsonObject, List<GenTableColumn> columns) {
-        if (MapUtils.isEmpty(jsonObject)) {
-            return Collections.emptyList();
-        }
-
-        List<JSONObject> result = Lists.newArrayListWithCapacity(jsonObject.size());
-
-            for (GenTableColumn column : columns) {
-                JSONObject map = new JSONObject();
-                for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
-                    if (column.getColumnName().equalsIgnoreCase(entry.getKey())) {
-                        map.put(SINGLE_OBJ_NAME, column.getColumnName());
-                        map.put(SINGLE_OBJ_VALUE, entry.getValue());
-                        String htmlType = column.getHtmlType();
-                        map.put(SINGLE_OBJ_TYPE, htmlType);
-                        if (NEED_QUERY_DICT_LIST.contains(htmlType)) {
-                            String dictType = column.getDictType();
-                            try {
-                                map.put(SINGLE_OBJ_TYPES, remoteDictDataService.listByType(dictType));
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                        }
-
-                        result.add(map);
-                    }
-                }
-            }
-
-        return result;
-    }
-
     /**
      * 功能描述: 封装成查询条件 key: 列名，  value：查询条件_查询类别
      * eg: [{"config_name": ["系统配置", "EQ", "varchar(100)"]}]
@@ -544,7 +483,7 @@ public class TableServiceCmdService {
         // genTable.getMenuRole() 暂时数据库没有数据，
         jsonObject.put(FormDataConstant.BUTTON_LIST, Strings.nullToEmpty(genTable.getMenuRole()));
 
-         jsonObject.put(ViewConst.VIEW_TYPE, genTable.getTplCategory());
+         jsonObject.put(ViewConst.VIEW_TYPE, Strings.nullToEmpty(genTable.getTplCategory()));
         return AjaxResult.success(jsonObject);
     }
 
@@ -578,23 +517,6 @@ public class TableServiceCmdService {
         return AjaxResult.success(queryList);
     }
 
-    /**
-     * 功能描述: 获取表单表头
-     * 注意: 都是从redis中拿的，如果数据库和redis不一致，则需刷新一下redis
-     * 刷新的入口为 {@link MyController#loadTable(com.boman.gen.domain.GenTable)}
-     *
-     *                    eg:{
-     *                          "table": "sys_config"
-     *                        }
-     *
-     * @param condition condition
-     * @return com.boman.common.core.web.domain.AjaxResult
-     */
-    public AjaxResult getTableHead(FormDataDto condition) {
-        GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, condition.getTable());
-        return AjaxResult.success(getTableHeadList(genTable));
-    }
-
     /**
      * 功能描述:  单独获取按钮
      * 注意: 都是从redis中拿的，如果数据库和redis不一致，则需刷新一下redis
@@ -638,27 +560,6 @@ public class TableServiceCmdService {
         return AjaxResult.success(jsonObject);
     }
 
-    public String getChildColumnNameByParentTableName(GenTable parentGenTable, Long childTableTableId){
-        requireNonNull(parentGenTable.getTableName(), "主表名称为空");
-//        GenTable primaryTable = redisService.getCacheObject(RedisKey.TABLE_INFO + genTable.getTableName());
-        Long parentTableId = parentGenTable.getTableId();
-        List<GenTableRelation> relations = redisService.getCacheObject(RedisKey.RELATION_INFO);
-        relations = relations.stream()
-                .filter(relation -> relation.getRelationParentId().equals(parentTableId))
-                .collect(Collectors.toList());
-
-        for (GenTableRelation relation : relations) {
-            if (relation.getRelationChildId().equals(6L)) {
-               // tableColumnService.selectGenTableColumnListByTableId(childTableTableId);
-//                return
-            }
-        }
-
-
-        return "";
-
-    }
-
     /**
      * 功能描述: 表单提交接口
      *
@@ -675,12 +576,9 @@ public class TableServiceCmdService {
         String pkName = IdUtils.getPkName(genTable.getColumns());
 
         // 先去查出之前的状态
-        List<Long> idList = commitData.stream().map(jsonObject -> jsonObject.getLong(FormDataConstant.ID))
-                .collect(Collectors.toList());
-        JSONArray showData = new JSONArray();
-        showData.add(FormDataConstant.STATUS);
-        showData.add(pkName);
-        List<JSONObject> beforeList = selectService.selectByIdList(tableName, pkName, idList, showData);
+        List<Long> idList = map(commitData, jsonObject -> jsonObject.getLong(FormDataConstant.ID));
+
+        List<JSONObject> beforeList = selectService.selectByIdList(tableName, pkName, idList, Lists.newArrayList(pkName, STATUS));
         requireNonNull(beforeList);
 
         for (JSONObject commitDatum : commitData) {
@@ -800,32 +698,13 @@ public class TableServiceCmdService {
     }
 
     /**
-     * 功能描述: 根据表名获取表信息、表字段和表字段对应的字典值
-     *                {
-     *                    "table": "sys_config",
-     *                }
+     * 功能描述: 根据表名封装列的对应关系, 同时封装好字典值
      *
-     *
-     * @param condition condition
+     * @param tableName  tableName
+     * @param allColumns allColumns
+     * @param isUi       带折叠true, 不带折叠false
      * @return com.boman.common.core.web.domain.AjaxResult
      */
-//    public AjaxResult getByTableName(BaseTableSaveDTO condition) {
-//        requireNonNull(condition.getTable(), "tableName = [" + condition.getTable() + "] 此表不存在");
-//        requireNonNull(condition.getIsUi(), "根据表名获取表字段，未传 isUi 这个字段");
-//        GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, condition.getTable());
-//        List<GenTableColumn> allColumns = genTable.getColumns();
-//        // 把新增可见的列过滤出来
-////        List<GenTableColumn> returnData = ColumnUtils.filterNeedShowData(allColumns, 0, INSERT_VISIBLE::equals);
-//        // 普通的展示，不带折叠的
-//        if (BooleanUtils.isFalse(condition.getIsUi())) {
-//            packDictDataToColumns(allColumns, ObjectUtils::isNotEmpty);
-//            return AjaxResult.success(genTable);
-//        } else {
-//            // 带折叠的展示
-//            return getByTableName(genTable.getTableName(), allColumns, true);
-//        }
-//    }
-
     public AjaxResult getByTableName(String tableName, List<GenTableColumn> allColumns, Boolean isUi) {
         List<GenTableColumn> resultCols;
         List<GenTableColumn> parentColumns = filterHrAndSort(allColumns);

boman-web-core/src/main/java/com/boman/web/core/service/select/BaseSelectServiceImpl.java

@@ -109,8 +109,7 @@ public class BaseSelectServiceImpl implements IBaseSelectService {
      * @return com.alibaba.fastjson.JSONObject
      */
     @Override
-    public List<JSONObject> selectByIdList(String tableName, String pkName
-            , List<Long> idList, JSONArray showData) {
+    public List<JSONObject> selectByIdList(String tableName, String pkName, List<Long> idList, List<String> showData) {
         requireNonNull(tableName, "表名为空");
         requireNonNull(pkName, "主键名称为空");;
         requireNonNull(idList);

boman-web-core/src/main/java/com/boman/web/core/service/select/IBaseSelectService.java

@@ -64,5 +64,5 @@ public interface IBaseSelectService {
      * @param showData  需要展示的列,若为空，查所有
      * @return com.alibaba.fastjson.JSONObject
      */
-    List<JSONObject> selectByIdList(String tableName, String pkName, List<Long> idList, JSONArray showData);
+    List<JSONObject> selectByIdList(String tableName, String pkName, List<Long> idList, List<String> showData);
 }

boman-web-core/src/main/java/com/boman/web/core/utils/ColumnUtils.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.gen.domain.GenTableColumn;
+import com.boman.domain.exception.UnknownColumnException;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.ArrayUtils;
@@ -125,8 +126,8 @@ public class ColumnUtils {
                 }
 
                 String columnName = allColumn.getColumnName();
-//                String columnName = allColumn.getColumnName().toUpperCase();
-                String[] maskArray = requireNonNull(allColumn.getMask(), "mask is empty").split("");
+                String mask = requireNonNull(allColumn.getMask(), "mask is empty, columnName = [" + allColumn.getColumnName() + "]");
+                String[] maskArray = mask.split("");
                 assert maskArray.length == 6;
                 String maskValue = maskArray[sort];
                 if (predicate.test(maskValue)) {
@@ -137,12 +138,12 @@ public class ColumnUtils {
             // data不为空，拿出前端传过来的列中可见的
             for (GenTableColumn allColumn : allColumns) {
                 String columnName = allColumn.getColumnName();
-//                String columnName = allColumn.getColumnName().toUpperCase();
                 if (HR.equalsIgnoreCase(allColumn.getHtmlType())) {
                     continue;
                 }
                 if (data.contains(columnName.toUpperCase()) || data.contains(columnName.toLowerCase())) {
-                    String[] maskArray = requireNonNull(allColumn.getMask(), "mask is empty").split("");
+                    String mask = requireNonNull(allColumn.getMask(), "mask is empty, columnName = [" + allColumn.getColumnName() + "]");
+                    String[] maskArray = mask.split("");
                     assert maskArray.length == 6;
                     String maskValue = maskArray[sort];
                     if (predicate.test(maskValue)) {
@@ -176,7 +177,7 @@ public class ColumnUtils {
         for (Map.Entry<String, Object> entry : target.entrySet()) {
             String columnName = entry.getKey();
             if (!all.contains(columnName.toLowerCase())) {
-                throw new IllegalArgumentException("此表 [" + tableName + "]中没有 [" + columnName + "] 字段");
+                throw new UnknownColumnException("此表 [" + tableName + "]中没有 [" + columnName + "] 字段");
             }
         }
     }
@@ -197,7 +198,7 @@ public class ColumnUtils {
         for (Object obj : target) {
             String columnName = (String) obj;
             if (!all.contains(columnName.toLowerCase()) || !all.contains(columnName.toUpperCase())) {
-                throw new IllegalArgumentException("此表 [" + tableName + "]中没有 [" + columnName + "] 字段");
+                throw new UnknownColumnException("此表 [" + tableName + "]中没有 [" + columnName + "] 字段");
             }
         }
     }

ruoyi-ui/src/api/tool/gen.js

@@ -207,3 +207,21 @@ export function getLoadTable() {
     method: 'get',
   })
 }
+
+// 获取快速查询  查询框数据/ */
+export function tableQuery(data) {
+  return request({
+    url: '/boman-web-core/p/cs/getTableQuery',
+    method: 'POST',
+    data
+  })
+}
+
+// 快速查询列表
+export function listIndexfou(data) {
+  return request({
+    url: '/boman-web-core/p/cs/queryList',
+    method: 'post',
+    data: data
+  })
+}

ruoyi-ui/src/views/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container home">
     <el-row :gutter="5">
-      <el-col :sm="24" :lg="17" style="padding-left: 15px">
+      <el-col :sm="24" :lg="17" >
         <div class="index_heade">
           <img src="../assets/images/icon_more.png" alt="" class="index_headerImg">
           <p class="index_headetab">
@@ -25,7 +25,7 @@
                          layout="prev, pager, next, jumper"
                          :total="total">
                     </el-pagination>
-                    <span>共 {{total}} 条  每页显示 8 条  </span>
+                    <span>共 {{total}} 条  每页显示 10 条  </span>
                   </div>
                 </div>
         </div>
@@ -489,72 +489,15 @@ export default {
           let setre = []
           this.truew = []
           console.log(this.calendarData)
-          // console.log(data,37645)
-
           for (var i = 0 ; i < this.calendarData.length; i++) {
+            if(this.calendarData[i].schedule_content !== undefined){
+           this.calendarData[i].schedule_content = this.calendarData[i].schedule_content.replace(/<\/?[^>]*>/g, '')
+            }
             if(data == this.calendarData[i].remind_time){
-              
+              content  = content  + this.calendarData[i].schedule_content + '、'
+              console.log(i,this.calendarData.length)
             }
-            // if (date === this.calendarData[i].begin_time) {
-              // console.log(this.calendarData[i])
-              // if(this.calendarData[i].remind_time !== undefined){
-                // console.log(this.calendarData[i].all_date.includes(data))
-                // 多个时间
-                // if(this.calendarData[i].remind_time.includes(data) == true){
-                 // console.log(this.calendarData[i].all_date.includes(data))
-                 // 多个时间
-                 // this.truew.push(this.calendarData[i].remind_time.includes(data))
-                 // console.log(this.truew)
-                 // 多个时间
-                 // if(this.truew.length >1){
-                   // 多个时间
-                    // content  = content + ',' + this.calendarData[i].schedule_content
-                    // nujeug = content.split(',')
-                    // for(var i = 0 ; i < nujeug.length; i++){
-                    //   if (setre.indexOf(nujeug[i]) === -1) {
-                    //      setre.push(nujeug[i])
-                    //      }
-                    // }
-                    // content = setre.join(',')
-                    // setre = [...new set(nujeug)]
-                    // conert = setre.join(',')
-                 // }else{
-                   // if(datase == date){
-                   //   content  =  this.calendarData[i].schedule_content + content + ','
-                   //   console.log(1234567543)
-                   // }else{
-                   //    content  = this.calendarData[i].schedule_content
-                   //   console.log(1239545)
-                   // }
-                   // content  = this.calendarData[i].schedule_content
-                 // }
-
-                  // content  = this.calendarData[i].schedule_content
-                  // return content
-                // }
                 console.log(content)
-                //  if(this.calendarData[i].all_date.includes(data) == false){
-                //    console.log(this.calendarData[i].all_date.includes(data))
-                //   // this.rjtu.push(this.calendarData[i].schedule_content)
-                //   // content  = this.calendarData[i].schedule_content
-
-                // }
-                //
-                // }
-                // return content
-              // }
-                // that.ary.push(route)
-
-              // if(this.calendarData[i].schedule_content !== undefined){
-              //   nujue = nujue +1
-              //   if(this.calendarData[i].schedule_content !== this.calendarData[nujue].schedule_content){
-              //     // this.rjtu.push(this.calendarData[i].schedule_content)
-              //   }
-              //   // content = this.rjtu.join(',')
-
-              // }
-
-            // }
           }
           console.log(content)
           // console.log(this.rjtu,12345)

ruoyi-ui/src/views/system/role/fz-index.vue

@@ -0,0 +1,685 @@
+<template>
+  <div class="app-container">
+    <el-row class="roleBox">
+      <el-col :span="24" class="roleCol">
+        <div class="roleH"></div>
+        <span>功能权限</span>
+      </el-col>
+      <el-col :span="24" class="roleBot">
+        <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" style="background-color: #2AC1CA;color: #fff;border: none;" plain icon="el-icon-plus"
+            @click="handleAdd" v-hasPermi="['system:role:add']">新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="primary" style="background-color: #FF9639;color: #fff;border: none;" plain icon="el-icon-refresh"
+            @click="handleAdd" v-hasPermi="['system:role:list']">刷新</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="primary" style="background-color: #3C8DBC;color: #fff;border: none;" plain icon="el-icon-my-export"
+            @click="handleAdd" v-hasPermi="['system:role:edit']">保存</el-button>
+        </el-col>
+        </el-row>
+      </el-col>
+      </el-row>
+    <el-row style="margin-top: 18px;">
+      <el-col :span="5" class="searBoxs">
+        <div class="searBox">
+          <div class="searInput">
+            <input type="text" placeholder="请输入角色">
+          </div>
+          <div class="searBtn">
+            <img src="@/assets/images/icon_sr_ss@2x.png" alt="" class="icon">
+          </div>
+        </div>
+        <div class="searList">
+          <div class="searItem" v-for="item in roleList" :class="{'active': false}">
+            {{item.roleName}}
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="19" class="roleContr">
+        <div class="roleContrBox">
+          <el-col :span="7">
+            <div class="searContLeft">
+              <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+            </div>
+          </el-col>
+          <el-col :span="17">
+            <div class="searContRight">
+              <div class="searTitle">
+                <div class="searName">
+                  功能
+                </div>
+                <div class="searItem" v-for="item in 8">
+                  <el-checkbox :label="'新增'+item"></el-checkbox>
+                </div>
+              </div>
+              <div class="searCont" v-for="items in 12" @click="searIndex = item" :class="{'active': searIndex == item}">
+                <div class="searName">
+                  功能功能{{items}}
+                </div>
+                <div class="searItem" v-for="item in 8">
+                  <el-checkbox></el-checkbox>
+                </div>
+              </div>
+            </div>
+          </el-col>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from "@/api/system/role";
+  import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+  import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
+
+  export default {
+    name: "Role",
+    data() {
+      return {
+        searIndex: '',
+        data: [{
+          label: '一级 1',
+          children: [{
+            label: '二级 1-1',
+            children: [{
+              label: '三级 1-1-1'
+            }]
+          }]
+        }, {
+          label: '一级 2',
+          children: [{
+            label: '二级 2-1',
+            children: [{
+              label: '三级 2-1-1'
+            }]
+          }, {
+            label: '二级 2-2',
+            children: [{
+              label: '三级 2-2-1'
+            }]
+          }]
+        }, {
+          label: '一级 3',
+          children: [{
+            label: '二级 3-1',
+            children: [{
+              label: '三级 3-1-1'
+            }]
+          }, {
+            label: '二级 3-2',
+            children: [{
+              label: '三级 3-2-1'
+            }]
+          }]
+        }],
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        },
+        indexs: 3,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 角色表格数据
+        roleList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 是否显示弹出层（数据权限）
+        openDataScope: false,
+        menuExpand: false,
+        menuNodeAll: false,
+        deptExpand: true,
+        deptNodeAll: false,
+        // 日期范围
+        dateRange: [],
+        // 状态数据字典
+        statusOptions: [],
+        // 数据范围选项
+        dataScopeOptions: [{
+            value: "1",
+            label: "全部数据权限"
+          },
+          {
+            value: "2",
+            label: "自定数据权限"
+          },
+          {
+            value: "3",
+            label: "本部门数据权限"
+          },
+          {
+            value: "4",
+            label: "本部门及以下数据权限"
+          },
+          {
+            value: "5",
+            label: "仅本人数据权限"
+          }
+        ],
+        // 菜单列表
+        menuOptions: [],
+        // 部门列表
+        deptOptions: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          roleName: undefined,
+          roleKey: undefined,
+          status: undefined
+        },
+        // 表单参数
+        form: {},
+        defaultProps: {
+          children: "children",
+          label: "label"
+        },
+        // 表单校验
+        rules: {
+          roleName: [{
+            required: true,
+            message: "角色名称不能为空",
+            trigger: "blur"
+          }],
+          roleKey: [{
+            required: true,
+            message: "权限字符不能为空",
+            trigger: "blur"
+          }],
+          roleSort: [{
+            required: true,
+            message: "角色顺序不能为空",
+            trigger: "blur"
+          }]
+        }
+      };
+    },
+    created() {
+      this.getList();
+      this.getDicts("sys_normal_disable").then(response => {
+        this.statusOptions = response.data;
+      });
+    },
+    methods: {
+      handleNodeClick() {
+        console.log(221)
+      },
+      /** 查询角色列表 */
+      getList() {
+        this.loading = true;
+        listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
+          response => {
+            this.roleList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          }
+        );
+      },
+      /** 查询菜单树结构 */
+      getMenuTreeselect() {
+        menuTreeselect().then(response => {
+          this.menuOptions = response.data;
+        });
+      },
+      /** 查询部门树结构 */
+      getDeptTreeselect() {
+        deptTreeselect().then(response => {
+          this.deptOptions = response.data;
+        });
+      },
+      // 所有菜单节点数据
+      getMenuAllCheckedKeys() {
+        // 目前被选中的菜单节点
+        let checkedKeys = this.$refs.menu.getCheckedKeys();
+        // 半选中的菜单节点
+        let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
+        checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+        return checkedKeys;
+      },
+      // 所有部门节点数据
+      getDeptAllCheckedKeys() {
+        // 目前被选中的部门节点
+        let checkedKeys = this.$refs.dept.getCheckedKeys();
+        // 半选中的部门节点
+        let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
+        checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+        return checkedKeys;
+      },
+      /** 根据角色ID查询菜单树结构 */
+      getRoleMenuTreeselect(id) {
+        return roleMenuTreeselect(id).then(response => {
+          this.menuOptions = response.menus;
+          return response;
+        });
+      },
+      /** 根据角色ID查询部门树结构 */
+      getRoleDeptTreeselect(id) {
+        return roleDeptTreeselect(id).then(response => {
+          this.deptOptions = response.depts;
+          return response;
+        });
+      },
+      // 角色状态修改
+      handleStatusChange(row) {
+        let text = row.status === "0" ? "启用" : "停用";
+        this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return changeRoleStatus(row.id, row.status);
+        }).then(() => {
+          this.msgSuccess(text + "成功");
+        }).catch(function() {
+          row.status = row.status === "0" ? "1" : "0";
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 取消按钮（数据权限）
+      cancelDataScope() {
+        this.openDataScope = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        if (this.$refs.menu != undefined) {
+          this.$refs.menu.setCheckedKeys([]);
+        }
+        this.menuExpand = false,
+          this.menuNodeAll = false,
+          this.deptExpand = true,
+          this.deptNodeAll = false,
+          this.form = {
+            id: undefined,
+            roleName: undefined,
+            roleKey: undefined,
+            roleSort: 0,
+            status: "0",
+            menuIds: [],
+            deptIds: [],
+            menuCheckStrictly: true,
+            deptCheckStrictly: true,
+            remark: undefined
+          };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.dateRange = [];
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length != 1
+        this.multiple = !selection.length
+      },
+      // 树权限（展开/折叠）
+      handleCheckedTreeExpand(value, type) {
+        if (type == 'menu') {
+          let treeList = this.menuOptions;
+          for (let i = 0; i < treeList.length; i++) {
+            this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
+          }
+        } else if (type == 'dept') {
+          let treeList = this.deptOptions;
+          for (let i = 0; i < treeList.length; i++) {
+            this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
+          }
+        }
+      },
+      // 树权限（全选/全不选）
+      handleCheckedTreeNodeAll(value, type) {
+        if (type == 'menu') {
+          this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
+        } else if (type == 'dept') {
+          this.$refs.dept.setCheckedNodes(value ? this.deptOptions : []);
+        }
+      },
+      // 树权限（父子联动）
+      handleCheckedTreeConnect(value, type) {
+        if (type == 'menu') {
+          this.form.menuCheckStrictly = value ? true : false;
+        } else if (type == 'dept') {
+          this.form.deptCheckStrictly = value ? true : false;
+        }
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.getMenuTreeselect();
+        this.open = true;
+        this.title = "添加角色";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        const roleMenu = this.getRoleMenuTreeselect(id);
+        getRole(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.$nextTick(() => {
+            roleMenu.then(res => {
+              let checkedKeys = res.checkedKeys
+              checkedKeys.forEach((v) => {
+                this.$nextTick(() => {
+                  this.$refs.menu.setChecked(v, true, false);
+                })
+              })
+            });
+          });
+          this.title = "修改角色";
+        });
+      },
+      /** 选择角色权限范围触发 */
+      dataScopeSelectChange(value) {
+        if (value !== '2') {
+          this.$refs.dept.setCheckedKeys([]);
+        }
+      },
+      /** 分配数据权限操作 */
+      handleDataScope(row) {
+        this.reset();
+        const roleDeptTreeselect = this.getRoleDeptTreeselect(row.id);
+        getRole(row.id).then(response => {
+          this.form = response.data;
+          this.openDataScope = true;
+          this.$nextTick(() => {
+            roleDeptTreeselect.then(res => {
+              this.$refs.dept.setCheckedKeys(res.checkedKeys);
+            });
+          });
+          this.title = "分配数据权限";
+        });
+      },
+      /** 提交按钮 */
+      submitForm: function() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != undefined) {
+              this.form.menuIds = this.getMenuAllCheckedKeys();
+              updateRole(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              this.form.menuIds = this.getMenuAllCheckedKeys();
+              addRole(this.form).then(response => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 提交按钮（数据权限） */
+      submitDataScope: function() {
+        if (this.form.id != undefined) {
+          this.form.deptIds = this.getDeptAllCheckedKeys();
+          dataScope(this.form).then(response => {
+            this.msgSuccess("修改成功");
+            this.openDataScope = false;
+            this.getList();
+          });
+        }
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$confirm('是否确认删除角色编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delRole(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('system/role/export', {
+          ...this.queryParams
+        }, `role_${new Date().getTime()}.xlsx`)
+      }
+    }
+  };
+</script>
+<style lang="scss" scoped>
+  .roleContrBox {
+    background-color: #fff;
+    border-radius: 6px;
+    overflow: hidden;
+    padding: 23px 0;
+  }
+
+  .roleContr {
+    padding-left: 17px;
+
+    .searContLeft {
+      padding: 23px 17px 23px 23px;
+      border-right: 2px solid #E5E5E5;
+    }
+
+    .searContRight {
+      padding-left: 18px;
+
+      .searTitle {
+        display: flex;
+        padding-left: 11px;
+        margin-bottom: 26px;
+
+        .searName {
+          color: #343434;
+          font-size: 12px;
+          width: 156px;
+        }
+
+        .searItem {
+          flex: 1;
+          font-size: 12px;
+        }
+      }
+
+      .searCont {
+        display: flex;
+        height: 23px;
+        padding-left: 11px;
+        align-items: center;
+        margin-bottom: 4px;
+        cursor: pointer;
+
+        .searName {
+          color: #343434;
+          font-size: 12px;
+          width: 156px;
+        }
+
+        .searItem {
+          flex: 1;
+          font-size: 12px;
+        }
+
+        &:hover {
+          background-color: rgba(0, 0, 0, .1);
+        }
+      }
+
+      .active {
+        background-color: #CADBE4;
+
+        .searName {
+          color: #fff;
+        }
+      }
+    }
+  }
+
+  .searBoxs {
+    background-color: #fff;
+    border-radius: 6px;
+    padding: 23px;
+
+    .searBox {
+      display: flex;
+
+      .searInput {
+        flex: 1;
+        height: 32px;
+        margin-right: 8px;
+        box-sizing: border-box;
+      }
+
+      input {
+        width: 100%;
+        height: 100%;
+        background-color: #F7F6F6;
+        border: none;
+        padding: 0 7px;
+        outline: none;
+
+        &::placeholder {
+          color: #AAAAAA;
+          font-size: 12px;
+        }
+      }
+
+      .searBtn {
+        width: 30px;
+        height: 32px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background-color: #3C8DBC;
+        cursor: pointer;
+
+        .icon {
+          width: 18px;
+          height: 17px;
+        }
+      }
+    }
+
+    .searList {
+      padding: 10px 0;
+
+      .searItem {
+        padding: 0 8px;
+        line-height: 30px;
+        font-size: 12px;
+        color: #343434;
+        cursor: pointer;
+      }
+
+      .active {
+        background-color: #CADBE4;
+        color: #3C8DBC;
+      }
+    }
+  }
+
+  .app-container {
+    background-color: #EFF0FF;
+    min-height: calc(100vh - 70px);
+    box-sizing: border-box;
+    box-sizing: border-box;
+  }
+
+  .roleBox {
+    padding: 0 23px;
+    background: #fff;
+    border-radius: 6px;
+
+    .roleCol {
+      padding: 20px 0;
+      border-bottom: 1px solid #E5E5E5;
+
+      .roleH {
+        width: 18px;
+        height: 8px;
+        border-radius: 4px;
+        background-color: #3C8DBC;
+        margin-bottom: 8px;
+      }
+
+      span {
+        font-size: 15px;
+        color: #3C8DBC;
+      }
+    }
+
+    .roleBot {
+      padding: 22px 0;
+
+      .roleBtn {
+        height: 32px;
+        display: flex;
+        border-radius: 3px;
+        justify-content: center;
+        align-items: center;
+        width: 83px;
+        margin-right: 18px;
+
+        .icon {
+          width: 14px;
+          height: 14px;
+          margin-right: 7px;
+        }
+
+        span {
+          color: #fff;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+</style>
+<style>
+  .el-icon-my-export{
+      background: url('~@/assets/images/icon_btn_bc@2x.png') center no-repeat;
+      background-size: 13px 13px;
+     /* background-size: cover;*/
+  }
+  .el-icon-my-export:before{
+      content: "替";
+      font-size: 16px;
+      visibility: hidden;
+  }
+
+
+  .el-icon-my-export{
+      font-size: 16px;
+  }
+  .el-icon-my-export:before{
+      content: "\e611";
+  }
+</style>

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

@@ -1,685 +1,610 @@
 <template>
   <div class="app-container">
-    <el-row class="roleBox">
-      <el-col :span="24" class="roleCol">
-        <div class="roleH"></div>
-        <span>功能权限</span>
+    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input
+          v-model="queryParams.roleName"
+          placeholder="请输入角色名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="权限字符" prop="roleKey">
+        <el-input
+          v-model="queryParams.roleKey"
+          placeholder="请输入权限字符"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="角色状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:role:add']"
+        >新增</el-button>
       </el-col>
-      <el-col :span="24" class="roleBot">
-        <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" style="background-color: #2AC1CA;color: #fff;border: none;" plain icon="el-icon-plus"
-            @click="handleAdd" v-hasPermi="['system:role:add']">新增</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="primary" style="background-color: #FF9639;color: #fff;border: none;" plain icon="el-icon-refresh"
-            @click="handleAdd" v-hasPermi="['system:role:list']">刷新</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="primary" style="background-color: #3C8DBC;color: #fff;border: none;" plain icon="el-icon-my-export"
-            @click="handleAdd" v-hasPermi="['system:role:edit']">保存</el-button>
-        </el-col>
-        </el-row>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:role:edit']"
+        >修改</el-button>
       </el-col>
-      </el-row>
-    <el-row style="margin-top: 18px;">
-      <el-col :span="5" class="searBoxs">
-        <div class="searBox">
-          <div class="searInput">
-            <input type="text" placeholder="请输入角色">
-          </div>
-          <div class="searBtn">
-            <img src="@/assets/images/icon_sr_ss@2x.png" alt="" class="icon">
-          </div>
-        </div>
-        <div class="searList">
-          <div class="searItem" v-for="item in roleList" :class="{'active': false}">
-            {{item.roleName}}
-          </div>
-        </div>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:role:remove']"
+        >删除</el-button>
       </el-col>
-      <el-col :span="19" class="roleContr">
-        <div class="roleContrBox">
-          <el-col :span="7">
-            <div class="searContLeft">
-              <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
-            </div>
-          </el-col>
-          <el-col :span="17">
-            <div class="searContRight">
-              <div class="searTitle">
-                <div class="searName">
-                  功能
-                </div>
-                <div class="searItem" v-for="item in 8">
-                  <el-checkbox :label="'新增'+item"></el-checkbox>
-                </div>
-              </div>
-              <div class="searCont" v-for="items in 12" @click="searIndex = item" :class="{'active': searIndex == item}">
-                <div class="searName">
-                  功能功能{{items}}
-                </div>
-                <div class="searItem" v-for="item in 8">
-                  <el-checkbox></el-checkbox>
-                </div>
-              </div>
-            </div>
-          </el-col>
-        </div>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:role:export']"
+        >导出</el-button>
       </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+
+    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="角色编号" prop="roleId" width="120" />
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="显示顺序" prop="roleSort" width="100" />
+      <el-table-column label="状态" align="center" width="100">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.status"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-circle-check"
+            @click="handleDataScope(scope.row)"
+            v-hasPermi="['system:role:edit']"
+          >数据权限</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:role:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改角色配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="角色名称" prop="roleName">
+          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
+        </el-form-item>
+        <el-form-item label="权限字符" prop="roleKey">
+          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+        </el-form-item>
+        <el-form-item label="角色顺序" prop="roleSort">
+          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="菜单权限">
+          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
+          <el-tree
+            class="tree-border"
+            :data="menuOptions"
+            show-checkbox
+            ref="menu"
+            node-key="id"
+            :check-strictly="!form.menuCheckStrictly"
+            empty-text="加载中，请稍后"
+            :props="defaultProps"
+          ></el-tree>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 分配角色数据权限对话框 -->
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+      <el-form :model="form" label-width="80px">
+        <el-form-item label="角色名称">
+          <el-input v-model="form.roleName" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="权限字符">
+          <el-input v-model="form.roleKey" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="权限范围">
+          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
+            <el-option
+              v-for="item in dataScopeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="数据权限" v-show="form.dataScope == 2">
+          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
+          <el-tree
+            class="tree-border"
+            :data="deptOptions"
+            show-checkbox
+            default-expand-all
+            ref="dept"
+            node-key="id"
+            :check-strictly="!form.deptCheckStrictly"
+            empty-text="加载中，请稍后"
+            :props="defaultProps"
+          ></el-tree>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitDataScope">确 定</el-button>
+        <el-button @click="cancelDataScope">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-  import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from "@/api/system/role";
-  import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-  import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
-
-  export default {
-    name: "Role",
-    data() {
-      return {
-        searIndex: '',
-        data: [{
-          label: '一级 1',
-          children: [{
-            label: '二级 1-1',
-            children: [{
-              label: '三级 1-1-1'
-            }]
-          }]
-        }, {
-          label: '一级 2',
-          children: [{
-            label: '二级 2-1',
-            children: [{
-              label: '三级 2-1-1'
-            }]
-          }, {
-            label: '二级 2-2',
-            children: [{
-              label: '三级 2-2-1'
-            }]
-          }]
-        }, {
-          label: '一级 3',
-          children: [{
-            label: '二级 3-1',
-            children: [{
-              label: '三级 3-1-1'
-            }]
-          }, {
-            label: '二级 3-2',
-            children: [{
-              label: '三级 3-2-1'
-            }]
-          }]
-        }],
-        defaultProps: {
-          children: 'children',
-          label: 'label'
+import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from "@/api/system/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
+
+export default {
+  name: "Role",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 角色表格数据
+      roleList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示弹出层（数据权限）
+      openDataScope: false,
+      menuExpand: false,
+      menuNodeAll: false,
+      deptExpand: true,
+      deptNodeAll: false,
+      // 日期范围
+      dateRange: [],
+      // 状态数据字典
+      statusOptions: [],
+      // 数据范围选项
+      dataScopeOptions: [
+        {
+          value: "1",
+          label: "全部数据权限"
         },
-        indexs: 3,
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 角色表格数据
-        roleList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 是否显示弹出层（数据权限）
-        openDataScope: false,
-        menuExpand: false,
-        menuNodeAll: false,
-        deptExpand: true,
-        deptNodeAll: false,
-        // 日期范围
-        dateRange: [],
-        // 状态数据字典
-        statusOptions: [],
-        // 数据范围选项
-        dataScopeOptions: [{
-            value: "1",
-            label: "全部数据权限"
-          },
-          {
-            value: "2",
-            label: "自定数据权限"
-          },
-          {
-            value: "3",
-            label: "本部门数据权限"
-          },
-          {
-            value: "4",
-            label: "本部门及以下数据权限"
-          },
-          {
-            value: "5",
-            label: "仅本人数据权限"
-          }
-        ],
-        // 菜单列表
-        menuOptions: [],
-        // 部门列表
-        deptOptions: [],
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          roleName: undefined,
-          roleKey: undefined,
-          status: undefined
+        {
+          value: "2",
+          label: "自定数据权限"
+        },
+        {
+          value: "3",
+          label: "本部门数据权限"
         },
-        // 表单参数
-        form: {},
-        defaultProps: {
-          children: "children",
-          label: "label"
+        {
+          value: "4",
+          label: "本部门及以下数据权限"
         },
-        // 表单校验
-        rules: {
-          roleName: [{
-            required: true,
-            message: "角色名称不能为空",
-            trigger: "blur"
-          }],
-          roleKey: [{
-            required: true,
-            message: "权限字符不能为空",
-            trigger: "blur"
-          }],
-          roleSort: [{
-            required: true,
-            message: "角色顺序不能为空",
-            trigger: "blur"
-          }]
+        {
+          value: "5",
+          label: "仅本人数据权限"
         }
-      };
+      ],
+      // 菜单列表
+      menuOptions: [],
+      // 部门列表
+      deptOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        roleName: undefined,
+        roleKey: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 表单校验
+      rules: {
+        roleName: [
+          { required: true, message: "角色名称不能为空", trigger: "blur" }
+        ],
+        roleKey: [
+          { required: true, message: "权限字符不能为空", trigger: "blur" }
+        ],
+        roleSort: [
+          { required: true, message: "角色顺序不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询角色列表 */
+    getList() {
+      this.loading = true;
+      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
+        response => {
+          this.roleList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
     },
-    created() {
-      this.getList();
-      this.getDicts("sys_normal_disable").then(response => {
-        this.statusOptions = response.data;
+    /** 查询菜单树结构 */
+    getMenuTreeselect() {
+      menuTreeselect().then(response => {
+        this.menuOptions = response.data;
       });
     },
-    methods: {
-      handleNodeClick() {
-        console.log(221)
-      },
-      /** 查询角色列表 */
-      getList() {
-        this.loading = true;
-        listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
-          response => {
-            this.roleList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          }
-        );
-      },
-      /** 查询菜单树结构 */
-      getMenuTreeselect() {
-        menuTreeselect().then(response => {
-          this.menuOptions = response.data;
-        });
-      },
-      /** 查询部门树结构 */
-      getDeptTreeselect() {
-        deptTreeselect().then(response => {
-          this.deptOptions = response.data;
-        });
-      },
-      // 所有菜单节点数据
-      getMenuAllCheckedKeys() {
-        // 目前被选中的菜单节点
-        let checkedKeys = this.$refs.menu.getCheckedKeys();
-        // 半选中的菜单节点
-        let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
-        checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-        return checkedKeys;
-      },
-      // 所有部门节点数据
-      getDeptAllCheckedKeys() {
-        // 目前被选中的部门节点
-        let checkedKeys = this.$refs.dept.getCheckedKeys();
-        // 半选中的部门节点
-        let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
-        checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-        return checkedKeys;
-      },
-      /** 根据角色ID查询菜单树结构 */
-      getRoleMenuTreeselect(id) {
-        return roleMenuTreeselect(id).then(response => {
-          this.menuOptions = response.menus;
-          return response;
-        });
-      },
-      /** 根据角色ID查询部门树结构 */
-      getRoleDeptTreeselect(id) {
-        return roleDeptTreeselect(id).then(response => {
-          this.deptOptions = response.depts;
-          return response;
-        });
-      },
-      // 角色状态修改
-      handleStatusChange(row) {
-        let text = row.status === "0" ? "启用" : "停用";
-        this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', "警告", {
+    /** 查询部门树结构 */
+    getDeptTreeselect() {
+      deptTreeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 所有菜单节点数据
+    getMenuAllCheckedKeys() {
+      // 目前被选中的菜单节点
+      let checkedKeys = this.$refs.menu.getCheckedKeys();
+      // 半选中的菜单节点
+      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+      return checkedKeys;
+    },
+    // 所有部门节点数据
+    getDeptAllCheckedKeys() {
+      // 目前被选中的部门节点
+      let checkedKeys = this.$refs.dept.getCheckedKeys();
+      // 半选中的部门节点
+      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+      return checkedKeys;
+    },
+    /** 根据角色ID查询菜单树结构 */
+    getRoleMenuTreeselect(roleId) {
+      return roleMenuTreeselect(roleId).then(response => {
+        this.menuOptions = response.menus;
+        return response;
+      });
+    },
+    /** 根据角色ID查询部门树结构 */
+    getRoleDeptTreeselect(roleId) {
+      return roleDeptTreeselect(roleId).then(response => {
+        this.deptOptions = response.depts;
+        return response;
+      });
+    },
+    // 角色状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return changeRoleStatus(row.id, row.status);
+          return changeRoleStatus(row.roleId, row.status);
         }).then(() => {
           this.msgSuccess(text + "成功");
         }).catch(function() {
           row.status = row.status === "0" ? "1" : "0";
         });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 取消按钮（数据权限）
-      cancelDataScope() {
-        this.openDataScope = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        if (this.$refs.menu != undefined) {
-          this.$refs.menu.setCheckedKeys([]);
-        }
-        this.menuExpand = false,
-          this.menuNodeAll = false,
-          this.deptExpand = true,
-          this.deptNodeAll = false,
-          this.form = {
-            id: undefined,
-            roleName: undefined,
-            roleKey: undefined,
-            roleSort: 0,
-            status: "0",
-            menuIds: [],
-            deptIds: [],
-            menuCheckStrictly: true,
-            deptCheckStrictly: true,
-            remark: undefined
-          };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length != 1
-        this.multiple = !selection.length
-      },
-      // 树权限（展开/折叠）
-      handleCheckedTreeExpand(value, type) {
-        if (type == 'menu') {
-          let treeList = this.menuOptions;
-          for (let i = 0; i < treeList.length; i++) {
-            this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
-          }
-        } else if (type == 'dept') {
-          let treeList = this.deptOptions;
-          for (let i = 0; i < treeList.length; i++) {
-            this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
-          }
-        }
-      },
-      // 树权限（全选/全不选）
-      handleCheckedTreeNodeAll(value, type) {
-        if (type == 'menu') {
-          this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
-        } else if (type == 'dept') {
-          this.$refs.dept.setCheckedNodes(value ? this.deptOptions : []);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮（数据权限）
+    cancelDataScope() {
+      this.openDataScope = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false,
+      this.menuNodeAll = false,
+      this.deptExpand = true,
+      this.deptNodeAll = false,
+      this.form = {
+        roleId: undefined,
+        roleName: undefined,
+        roleKey: undefined,
+        roleSort: 0,
+        status: "0",
+        menuIds: [],
+        deptIds: [],
+        menuCheckStrictly: true,
+        deptCheckStrictly: true,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.roleId)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    // 树权限（展开/折叠）
+    handleCheckedTreeExpand(value, type) {
+      if (type == 'menu') {
+        let treeList = this.menuOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
         }
-      },
-      // 树权限（父子联动）
-      handleCheckedTreeConnect(value, type) {
-        if (type == 'menu') {
-          this.form.menuCheckStrictly = value ? true : false;
-        } else if (type == 'dept') {
-          this.form.deptCheckStrictly = value ? true : false;
+      } else if (type == 'dept') {
+        let treeList = this.deptOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
         }
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.getMenuTreeselect();
+      }
+    },
+    // 树权限（全选/全不选）
+    handleCheckedTreeNodeAll(value, type) {
+      if (type == 'menu') {
+        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
+      } else if (type == 'dept') {
+        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
+      }
+    },
+    // 树权限（父子联动）
+    handleCheckedTreeConnect(value, type) {
+      if (type == 'menu') {
+        this.form.menuCheckStrictly = value ? true: false;
+      } else if (type == 'dept') {
+        this.form.deptCheckStrictly = value ? true: false;
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getMenuTreeselect();
+      this.open = true;
+      this.title = "添加角色";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const roleId = row.roleId || this.ids
+      const roleMenu = this.getRoleMenuTreeselect(roleId);
+      getRole(roleId).then(response => {
+        this.form = response.data;
         this.open = true;
-        this.title = "添加角色";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        const roleMenu = this.getRoleMenuTreeselect(id);
-        getRole(id).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.$nextTick(() => {
-            roleMenu.then(res => {
-              let checkedKeys = res.checkedKeys
-              checkedKeys.forEach((v) => {
-                this.$nextTick(() => {
-                  this.$refs.menu.setChecked(v, true, false);
+        this.$nextTick(() => {
+          roleMenu.then(res => {
+            let checkedKeys = res.checkedKeys
+            checkedKeys.forEach((v) => {
+                this.$nextTick(()=>{
+                    this.$refs.menu.setChecked(v, true ,false);
                 })
-              })
-            });
+            })
           });
-          this.title = "修改角色";
         });
-      },
-      /** 选择角色权限范围触发 */
-      dataScopeSelectChange(value) {
-        if (value !== '2') {
-          this.$refs.dept.setCheckedKeys([]);
-        }
-      },
-      /** 分配数据权限操作 */
-      handleDataScope(row) {
-        this.reset();
-        const roleDeptTreeselect = this.getRoleDeptTreeselect(row.id);
-        getRole(row.id).then(response => {
-          this.form = response.data;
-          this.openDataScope = true;
-          this.$nextTick(() => {
-            roleDeptTreeselect.then(res => {
-              this.$refs.dept.setCheckedKeys(res.checkedKeys);
-            });
+        this.title = "修改角色";
+      });
+    },
+    /** 选择角色权限范围触发 */
+    dataScopeSelectChange(value) {
+      if(value !== '2') {
+        this.$refs.dept.setCheckedKeys([]);
+      }
+    },
+    /** 分配数据权限操作 */
+    handleDataScope(row) {
+      this.reset();
+      const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
+      getRole(row.roleId).then(response => {
+        this.form = response.data;
+        this.openDataScope = true;
+        this.$nextTick(() => {
+          roleDeptTreeselect.then(res => {
+            this.$refs.dept.setCheckedKeys(res.checkedKeys);
           });
-          this.title = "分配数据权限";
         });
-      },
-      /** 提交按钮 */
-      submitForm: function() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != undefined) {
-              this.form.menuIds = this.getMenuAllCheckedKeys();
-              updateRole(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              this.form.menuIds = this.getMenuAllCheckedKeys();
-              addRole(this.form).then(response => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              });
-            }
+        this.title = "分配数据权限";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.roleId != undefined) {
+            this.form.menuIds = this.getMenuAllCheckedKeys();
+            updateRole(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.menuIds = this.getMenuAllCheckedKeys();
+            addRole(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
-        });
-      },
-      /** 提交按钮（数据权限） */
-      submitDataScope: function() {
-        if (this.form.id != undefined) {
-          this.form.deptIds = this.getDeptAllCheckedKeys();
-          dataScope(this.form).then(response => {
-            this.msgSuccess("修改成功");
-            this.openDataScope = false;
-            this.getList();
-          });
         }
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$confirm('是否确认删除角色编号为"' + ids + '"的数据项?', "警告", {
+      });
+    },
+    /** 提交按钮（数据权限） */
+    submitDataScope: function() {
+      if (this.form.roleId != undefined) {
+        this.form.deptIds = this.getDeptAllCheckedKeys();
+        dataScope(this.form).then(response => {
+          this.msgSuccess("修改成功");
+          this.openDataScope = false;
+          this.getList();
+        });
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const roleIds = row.roleId || this.ids;
+      this.$confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return delRole(ids);
+          return delRole(roleIds);
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
         })
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('system/role/export', {
-          ...this.queryParams
-        }, `role_${new Date().getTime()}.xlsx`)
-      }
-    }
-  };
-</script>
-<style lang="scss" scoped>
-  .roleContrBox {
-    background-color: #fff;
-    border-radius: 6px;
-    overflow: hidden;
-    padding: 23px 0;
-  }
-
-  .roleContr {
-    padding-left: 17px;
-
-    .searContLeft {
-      padding: 23px 17px 23px 23px;
-      border-right: 2px solid #E5E5E5;
-    }
-
-    .searContRight {
-      padding-left: 18px;
-
-      .searTitle {
-        display: flex;
-        padding-left: 11px;
-        margin-bottom: 26px;
-
-        .searName {
-          color: #343434;
-          font-size: 12px;
-          width: 156px;
-        }
-
-        .searItem {
-          flex: 1;
-          font-size: 12px;
-        }
-      }
-
-      .searCont {
-        display: flex;
-        height: 23px;
-        padding-left: 11px;
-        align-items: center;
-        margin-bottom: 4px;
-        cursor: pointer;
-
-        .searName {
-          color: #343434;
-          font-size: 12px;
-          width: 156px;
-        }
-
-        .searItem {
-          flex: 1;
-          font-size: 12px;
-        }
-
-        &:hover {
-          background-color: rgba(0, 0, 0, .1);
-        }
-      }
-
-      .active {
-        background-color: #CADBE4;
-
-        .searName {
-          color: #fff;
-        }
-      }
-    }
-  }
-
-  .searBoxs {
-    background-color: #fff;
-    border-radius: 6px;
-    padding: 23px;
-
-    .searBox {
-      display: flex;
-
-      .searInput {
-        flex: 1;
-        height: 32px;
-        margin-right: 8px;
-        box-sizing: border-box;
-      }
-
-      input {
-        width: 100%;
-        height: 100%;
-        background-color: #F7F6F6;
-        border: none;
-        padding: 0 7px;
-        outline: none;
-
-        &::placeholder {
-          color: #AAAAAA;
-          font-size: 12px;
-        }
-      }
-
-      .searBtn {
-        width: 30px;
-        height: 32px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        background-color: #3C8DBC;
-        cursor: pointer;
-
-        .icon {
-          width: 18px;
-          height: 17px;
-        }
-      }
-    }
-
-    .searList {
-      padding: 10px 0;
-
-      .searItem {
-        padding: 0 8px;
-        line-height: 30px;
-        font-size: 12px;
-        color: #343434;
-        cursor: pointer;
-      }
-
-      .active {
-        background-color: #CADBE4;
-        color: #3C8DBC;
-      }
-    }
-  }
-
-  .app-container {
-    background-color: #EFF0FF;
-    min-height: calc(100vh - 70px);
-    box-sizing: border-box;
-    box-sizing: border-box;
-  }
-
-  .roleBox {
-    padding: 0 23px;
-    background: #fff;
-    border-radius: 6px;
-
-    .roleCol {
-      padding: 20px 0;
-      border-bottom: 1px solid #E5E5E5;
-
-      .roleH {
-        width: 18px;
-        height: 8px;
-        border-radius: 4px;
-        background-color: #3C8DBC;
-        margin-bottom: 8px;
-      }
-
-      span {
-        font-size: 15px;
-        color: #3C8DBC;
-      }
-    }
-
-    .roleBot {
-      padding: 22px 0;
-
-      .roleBtn {
-        height: 32px;
-        display: flex;
-        border-radius: 3px;
-        justify-content: center;
-        align-items: center;
-        width: 83px;
-        margin-right: 18px;
-
-        .icon {
-          width: 14px;
-          height: 14px;
-          margin-right: 7px;
-        }
-
-        span {
-          color: #fff;
-          font-size: 12px;
-        }
-      }
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有角色数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportRole(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
     }
   }
-</style>
-<style>
-  .el-icon-my-export{
-      background: url('~@/assets/images/icon_btn_bc@2x.png') center no-repeat;
-      background-size: 13px 13px;
-     /* background-size: cover;*/
-  }
-  .el-icon-my-export:before{
-      content: "替";
-      font-size: 16px;
-      visibility: hidden;
-  }
-
-
-  .el-icon-my-export{
-      font-size: 16px;
-  }
-  .el-icon-my-export:before{
-      content: "\e611";
-  }
-</style>
+};
+</script>

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

@@ -147,7 +147,7 @@
               <el-col :span="8">
                 <el-form-item label="关联HR字段：" prop="hrParentId">
                   <el-select style="width: 100%;" v-model="formZd.hrParentId" placeholder="请选择关联HR字段" clearable>
-                    <el-option v-for="dict in columList" :key="dict.columnId" :label="dict.columnName" :value="dict.columnId" />
+                    <el-option v-for="dict in columHRList" :key="dict.columnId" :label="dict.columnName" :value="dict.columnId" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -402,6 +402,7 @@
         // 字段信息
         tableSqlData: [],
         columList: [],
+        columHRList: [],
         foreignKey: [],
         openZd: false,
         formZd: {},
@@ -549,12 +550,18 @@
         getDictOptionselect().then(response => {
           this.dictOptions = response.data;
         });
-        // 关联字段
+        // 关联HR字段
         genTableColumnList({
           tableId,
           htmlType: 'HR'
         }).then(response => {
-          this.columList = response.rows;
+          this.columHRList = response.rows;
+        });
+        // 关联字段
+        listAllColumnsByTableId({
+          tableId
+        }).then(response => {
+          this.columList = response.data;
         });
         // 关联表数据
         listTable(this.glbParams).then(response => {