fix: 菜单管理搜索

backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.java

+package io.dataease.base.mapper.ext;
+
+import io.dataease.base.mapper.ext.query.GridExample;
+import io.dataease.controller.sys.request.SimpleTreeNode;
+
+import java.util.List;
+
+public interface ExtSysMenuMapper {
+
+    List<SimpleTreeNode> allNodes();
+
+    List<SimpleTreeNode> nodesByExample(GridExample example);
+}

backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="io.dataease.base.mapper.ext.ExtSysMenuMapper">
+
+    <resultMap id="simpleNode" type="io.dataease.controller.sys.request.SimpleTreeNode">
+        <id property="id" column="id" javaType="java.lang.Long" />
+        <result property="pid" column="pid" javaType="java.lang.Long"/>
+    </resultMap>
+
+    <select id="allNodes" resultMap="simpleNode">
+        select menu_id as id, pid from sys_menu
+    </select>
+
+
+    <select id="nodesByExample" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="simpleNode">
+        select menu_id as id, pid from sys_menu
+        <include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
+    </select>
+
+
+</mapper>

backend/src/main/java/io/dataease/controller/sys/SysMenuController.java

@@ -5,8 +5,11 @@ import io.dataease.base.domain.SysMenu;
 import io.dataease.commons.utils.BeanUtils;
 
 import io.dataease.controller.handler.annotation.I18n;
+import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.request.MenuCreateRequest;
 import io.dataease.controller.sys.request.MenuDeleteRequest;
+import io.dataease.controller.sys.request.SimpleTreeNode;
+import io.dataease.controller.sys.response.DeptNodeResponse;
 import io.dataease.controller.sys.response.MenuNodeResponse;
 import io.dataease.controller.sys.response.MenuTreeNode;
 import io.dataease.service.sys.MenuService;
@@ -37,6 +40,20 @@ public class SysMenuController {
         return menuService.convert(nodes);
     }
 
+    @ApiOperation("搜索菜单树")
+    @I18n
+    @PostMapping("/search")
+    public List<MenuNodeResponse> search(@RequestBody BaseGridRequest request) {
+        List<SysMenu> nodes = menuService.nodesTreeByCondition(request);
+        List<MenuNodeResponse> nodeResponses = nodes.stream().map(node -> {
+            MenuNodeResponse menuNodeResponse = BeanUtils.copyBean(new MenuNodeResponse(), node);
+            menuNodeResponse.setHasChildren(node.getSubCount() > 0);
+            menuNodeResponse.setTop(node.getPid() == menuService.MENU_ROOT_PID);
+            return menuNodeResponse;
+        }).collect(Collectors.toList());
+        return nodeResponses;
+    }
+
 
 
     @ApiOperation("新增菜单")

backend/src/main/java/io/dataease/service/sys/MenuService.java

 package io.dataease.service.sys;
 
-import io.dataease.base.domain.SysDept;
+
 import io.dataease.base.domain.SysMenu;
 import io.dataease.base.domain.SysMenuExample;
 import io.dataease.base.mapper.SysMenuMapper;
 import io.dataease.base.mapper.ext.ExtMenuMapper;
+import io.dataease.base.mapper.ext.ExtSysMenuMapper;
 import io.dataease.commons.utils.BeanUtils;
+import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.request.MenuCreateRequest;
 import io.dataease.controller.sys.request.MenuDeleteRequest;
-import io.dataease.controller.sys.response.DeptTreeNode;
+import io.dataease.controller.sys.request.SimpleTreeNode;
 import io.dataease.controller.sys.response.MenuNodeResponse;
-
 import io.dataease.controller.sys.response.MenuTreeNode;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -34,6 +32,8 @@ public class MenuService {
     @Resource
     private SysMenuMapper sysMenuMapper;
 
+    @Resource
+    private ExtSysMenuMapper extSysMenuMapper;
 
     @Resource
     private ExtMenuMapper extMenuMapper;
@@ -173,4 +173,54 @@ public class MenuService {
     }
 
 
+
+    public List<SysMenu> nodesTreeByCondition(BaseGridRequest request){
+        List<SimpleTreeNode> allNodes = allNodes();
+        List<SimpleTreeNode> targetNodes = nodeByCondition(request);
+        if(org.apache.commons.collections.CollectionUtils.isEmpty(targetNodes)){
+            return new ArrayList<>();
+        }
+        List<Long> ids = upTree(allNodes, targetNodes);
+        SysMenuExample example = new SysMenuExample();
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(ids)){
+            SysMenuExample.Criteria criteria = example.createCriteria();
+            criteria.andMenuIdIn(ids);
+        }
+        List<SysMenu> sysMenus = sysMenuMapper.selectByExample(example);
+        return sysMenus;
+    }
+
+    public List<SimpleTreeNode> allNodes() {
+        List<SimpleTreeNode> allNodes = extSysMenuMapper.allNodes();
+        return allNodes;
+    }
+
+    public List<SimpleTreeNode> nodeByCondition(BaseGridRequest request) {
+        List<SimpleTreeNode> simpleTreeNodes = extSysMenuMapper.nodesByExample(request.convertExample());
+        return simpleTreeNodes;
+    }
+
+    /**
+     * 找出目标节点所在路径上的所有节点 向上找
+     * @param allNodes 所有节点
+     * @param targetNodes 目标节点
+     * @return
+     */
+    private List<Long> upTree(List<SimpleTreeNode> allNodes, List<SimpleTreeNode> targetNodes){
+        final Map<Long, SimpleTreeNode> map = allNodes.stream().collect(Collectors.toMap(SimpleTreeNode::getId, node -> node));
+        List<Long> results = targetNodes.parallelStream().flatMap(targetNode -> {
+            //向上逐级找爹
+            List<Long> ids = new ArrayList<>();
+            SimpleTreeNode node = targetNode;
+            while (node != null) {
+                ids.add(node.getId());
+                Long pid = node.getPid();
+                node = map.get(pid);
+            }
+            return ids.stream();
+        }).distinct().collect(Collectors.toList());
+        return results;
+    }
+
+
 }

frontend/src/api/system/menu.js

@@ -53,4 +53,12 @@ export function treeByMenuId(menuId) {
   })
 }
 
-export default { addMenu, editMenu, delMenu, getMenusTree, getChild, treeByMenuId }
+export function queryCondition(data) {
+  return request({
+    url: '/api/menu/search',
+    method: 'post',
+    data
+  })
+}
+
+export default { addMenu, editMenu, delMenu, getMenusTree, getChild, treeByMenuId, queryCondition }

frontend/src/utils/index.js

@@ -162,6 +162,21 @@ export function formatCondition(param) {
   return result
 }
 
+export function formatQuickCondition(param, quickField) {
+  let quickObj = null
+  if (!param || !(quickObj = param.quick) || !quickField) {
+    quickObj && delete param.quick
+    return param
+  }
+  param[quickField] = {
+    field: quickField,
+    operator: 'like',
+    value: quickObj.value
+  }
+  delete param.quick
+  return param
+}
+
 export function getQueryVariable(variable) {
   const query = window.location.search.substring(1)
   const vars = query.split('&')

frontend/src/views/system/menu/index.vue

@@ -2,9 +2,8 @@
   <layout-content v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
     <tree-table
       :columns="columns"
-
       :search-config="searchConfig"
-      @search="initTableData"
+      @search="search"
     >
       <template #toolbar>
         <fu-table-button v-permission="['menu:add']" icon="el-icon-circle-plus-outline" :label="$t('menu.create')" @click="create" />
@@ -15,7 +14,6 @@
         :data="tableData"
         lazy
         :load="initTableData"
-
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         row-key="menuId"
       >
@@ -120,7 +118,8 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { LOAD_CHILDREN_OPTIONS, LOAD_ROOT_OPTIONS } from '@riophae/vue-treeselect'
 import { checkPermission } from '@/utils/permission'
-import { addMenu, editMenu, delMenu, getMenusTree } from '@/api/system/menu'
+import { addMenu, editMenu, delMenu, getMenusTree, queryCondition } from '@/api/system/menu'
+import { formatCondition, formatQuickCondition } from '@/utils/index'
 
 export default {
   components: {
@@ -169,11 +168,10 @@ export default {
       ],
       searchConfig: {
         useQuickSearch: true,
-        useComplexSearch: false,
-        quickPlaceholder: '按姓名搜索',
+        quickPlaceholder: '按标题搜索',
         components: [
 
-          //   { field: 'name', label: '姓名', component: 'FuComplexInput' },
+          { field: 'title', label: this.$t('menu.tile'), component: 'FuComplexInput' }
 
         //   {
         //     field: 'enabled',
@@ -204,7 +202,61 @@ export default {
       this.$router.push({ name: 'system-menu-form' })
     },
     search(condition) {
-      console.log(condition)
+      condition = formatQuickCondition(condition, 'title')
+      const temp = formatCondition(condition)
+      if (!temp || !temp.conditions || temp.conditions.length === 0) {
+        this.initTableData()
+        this.$nextTick(() => {
+          this.tableData.forEach(node => {
+            this.$refs.table.toggleRowExpansion(node, false)
+          })
+        })
+        return
+      }
+      const param = temp || {}
+      queryCondition(param).then(res => {
+        let data = res.data
+        data = data.map(obj => {
+          if (obj.subCount > 0) {
+            obj.hasChildren = true
+          }
+          return obj
+        })
+
+        if (condition) {
+          data = data.map(node => {
+            delete (node.hasChildren)
+            return node
+          })
+          this.tableData = this.buildTree(data)
+          this.$nextTick(() => {
+            data.forEach(node => {
+              this.$refs.table.toggleRowExpansion(node, true)
+            })
+          })
+        } else {
+          this.tableData = data
+        }
+      })
+    },
+    buildTree(arrs) {
+      const idMapping = arrs.reduce((acc, el, i) => {
+        acc[el.menuId] = i
+        return acc
+      }, {})
+      const roots = []
+      arrs.forEach(el => {
+        // 判断根节点
+        if (el.pid === null || el.pid === 0) {
+          roots.push(el)
+          return
+        }
+        // 用映射表找到父元素
+        const parentEl = arrs[idMapping[el.pid]]
+        // 把当前元素添加到父元素的`children`数组中
+        parentEl.children = [...(parentEl.children || []), el]
+      })
+      return roots
     },
 
     // edit(row) {

frontend/src/views/system/role/index.vue

@@ -81,7 +81,7 @@
 
 import LayoutContent from '@/components/business/LayoutContent'
 import ComplexTable from '@/components/business/complex-table'
-import { formatCondition } from '@/utils/index'
+import { formatCondition, formatQuickCondition } from '@/utils/index'
 import { addRole, editRole, delRole, roleGrid, addRoleMenus, menuIds } from '@/api/system/role'
 
 import { getMenusTree, getChild } from '@/api/system/menu'
@@ -124,7 +124,7 @@ export default {
         }
       ],
       searchConfig: {
-        useQuickSearch: false,
+        useQuickSearch: true,
         quickPlaceholder: this.$t('role.search_by_name'),
         components: [
           { field: 'name', label: this.$t('role.role_name'), component: 'FuComplexInput' }
@@ -151,6 +151,7 @@ export default {
       this.$router.push({ name: 'system-role-form' })
     },
     search(condition) {
+      condition = formatQuickCondition(condition, 'name')
       const temp = formatCondition(condition)
       const param = temp || {}
       roleGrid(this.paginationConfig.currentPage, this.paginationConfig.pageSize, param).then(response => {

frontend/src/views/system/user/index.vue

@@ -145,7 +145,7 @@ import LayoutContent from '@/components/business/LayoutContent'
 import ComplexTable from '@/components/business/complex-table'
 
 import { checkPermission } from '@/utils/permission'
-import { formatCondition } from '@/utils/index'
+import { formatCondition, formatQuickCondition } from '@/utils/index'
 import { PHONE_REGEX } from '@/utils/validate'
 import { LOAD_CHILDREN_OPTIONS, LOAD_ROOT_OPTIONS } from '@riophae/vue-treeselect'
 import Treeselect from '@riophae/vue-treeselect'
@@ -176,7 +176,8 @@ export default {
       ],
       searchConfig: {
         useQuickSearch: true,
-        quickPlaceholder: '按姓名搜索',
+        useComplexSearch: true,
+        quickPlaceholder: '按名称搜索',
         components: [
           { field: 'nick_name', label: '姓名', component: 'FuComplexInput' },
           {
@@ -290,6 +291,7 @@ export default {
     },
 
     search(condition) {
+      condition = formatQuickCondition(condition, 'username')
       const temp = formatCondition(condition)
       const param = temp || {}
       const { currentPage, pageSize } = this.paginationConfig