diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index dd5028767..25ca446f6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -16,7 +16,6 @@ import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; -import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; @@ -135,8 +134,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldFileList = fieldList.stream().filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); //删除文件 - List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(StringUtils.join(ids,",")); - + List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(StringUtils.join(ids, ",")); List connectIdList = new ArrayList<>(); @@ -198,7 +194,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl serialNumberList = new ArrayList<>(); StringBuilder sb = new StringBuilder(); for (Map map : mapList) { - if(documentIds.size() != 0 && documentIds.contains((String) map.get("id"))){ + if (documentIds.size() != 0 && documentIds.contains((String) map.get("id"))) { String id = (String) map.get("id"); String serialNumber = (String) map.get("serial_number"); String title = (String) map.get("title"); @@ -223,12 +219,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ",")); List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - String content = sysUser.getRealname() + "删除了" + StringUtils.join(serialNumberList,",") + "请知晓"; + String content = sysUser.getRealname() + "删除了" + StringUtils.join(serialNumberList, ",") + "请知晓"; String contentInfo = sysUser.getRealname() + "删除了" + sbStr + "请知晓"; //封装消息的实体类 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); sysAnnouncementService.saveAnnouncement(sysAnnouncement); - sendWebsocket(StringUtils.join(serialNumberList,","), StringUtils.join(serialNumberList,",")); + sendWebsocket(StringUtils.join(serialNumberList, ","), StringUtils.join(serialNumberList, ",")); } } @@ -394,7 +390,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BussDocumentLibraryEO::getId, id); //通过id查询数据 - List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);; + List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); + ; //查询所有 List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null); //对应标准id @@ -409,9 +406,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map) { try { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - String implementTime = (String)map.get("implement_time"); - String issueTime = (String)map.get("issue_time"); - Date implementTimeDate=df.parse(implementTime); - Date issueTimeDate=df.parse(issueTime); - if(issueTimeDate.after(implementTimeDate)){ + String implementTime = (String) map.get("implement_time"); + String issueTime = (String) map.get("issue_time"); + Date implementTimeDate = df.parse(implementTime); + Date issueTimeDate = df.parse(issueTime); + if (issueTimeDate.after(implementTimeDate)) { throw new JeroBootException("发布日期不能大于标准实施日期"); } } catch (ParseException e) { @@ -800,15 +797,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map) { try { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - String implementTime = (String)map.get("implement_time"); - String issueTime = (String)map.get("issue_time"); - Date implementTimeDate=df.parse(implementTime); - Date issueTimeDate=df.parse(issueTime); - if(issueTimeDate.after(implementTimeDate)){ - throw new JeroBootException("发布日期不能大于标准实施日期") ; + String implementTime = (String) map.get("implement_time"); + String issueTime = (String) map.get("issue_time"); + Date implementTimeDate = df.parse(implementTime); + Date issueTimeDate = df.parse(issueTime); + if (issueTimeDate.after(implementTimeDate)) { + throw new JeroBootException("发布日期不能大于标准实施日期"); } } catch (ParseException e) { - throw new JeroBootException("编辑失败") ; + throw new JeroBootException("编辑失败"); } String cut = (String) map.get("cut"); if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) { @@ -881,7 +878,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl oSSFileList = new ArrayList<>(); @@ -893,7 +890,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(key)).collect(Collectors.toList()); - if(fields.size() != 0){ + if (fields.size() != 0) { String dbFieldTxt = fields.get(0).getDbFieldTxt(); if (value == null) { value = ""; @@ -1147,32 +1144,37 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImplXXX对“GB 7258 进行了修改请及时查看”) + //项订阅领域管理中订阅了该技术领域的人和文档库中订阅了该条文档的人发送消息 + Map mapTemp = new HashMap<>(); + mapTemp.put("domainId", map.get("technology_territory")); + mapTemp.put("documentId", map.get("id")); + List userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp); //1.先判断是否订阅 - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId, (String) map.get("id")); - List onlCgformSubscribeList = iOnlCgformSubscribeService.list(lambdaQueryWrapper); - List userNameList = new ArrayList<>(); - if (onlCgformSubscribeList.size() != 0) { - for (OnlCgformSubscribe onlCgformSubscribe : onlCgformSubscribeList) { - userNameList.add(onlCgformSubscribe.getCreateBy()); - } - List userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ",")); - List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId, (String) map.get("id")); +// List onlCgformSubscribeList = iOnlCgformSubscribeService.list(lambdaQueryWrapper); +// List userNameList = new ArrayList<>(); +// if (onlCgformSubscribeList.size() != 0) { +// for (OnlCgformSubscribe onlCgformSubscribe : onlCgformSubscribeList) { +// userNameList.add(onlCgformSubscribe.getCreateBy()); +// } +// List userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ",")); +// List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - String id = (String) map.get("id"); - String title = (String) map.get("title"); - String href = "" + serialNumber + ""; + String id = (String) map.get("id"); + String title = (String) map.get("title"); + String href = "" + serialNumber + ""; - String content = sysUser.getRealname() + "对" + serialNumber + "进行了修改请及时查看"; - String contentInfo = sysUser.getRealname() + "修改标准" + href + "中" + sbStr.toString(); - //封装消息的实体类 - SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); - sysAnnouncementService.saveAnnouncement(sysAnnouncement); - sendWebsocket((String) map.get("id"), (String) map.get("id")); - } - //2. 处理修改代替标准的发送消息 + String content = sysUser.getRealname() + "对" + serialNumber + "进行了修改请及时查看"; + String contentInfo = sysUser.getRealname() + "修改标准" + href + "中" + sbStr.toString(); + //封装消息的实体类 + SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); + sysAnnouncementService.saveAnnouncement(sysAnnouncement); + sendWebsocket((String) map.get("id"), (String) map.get("id")); +// } + //2. 处理修改代替标准的发送消息(法规负责人) //处理修改代替标准,发送通知 //修改时前端传参 String replaceStandard = (String) map.get("replace_standard"); @@ -1644,7 +1646,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl deleteSubscribe = new QueryWrapper<>(); - deleteSubscribe.lambda().eq(OnlCgformSubscribe::getDocumentId,id); + deleteSubscribe.lambda().eq(OnlCgformSubscribe::getDocumentId, id); iOnlCgformSubscribeService.remove(deleteSubscribe); //订阅表中添加数据 @@ -2398,9 +2400,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 2){ + if (length > 2) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传"); @@ -2426,18 +2428,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileList = new ArrayList<>(); for (File file1 : fileNew.listFiles()) { - if(file1.getName().contains(".xls") || file1.getName().contains(".xlsx")){ + if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx")) { fileList.add(file1); } } - if(fileList.size() ==0 ){ + if (fileList.size() == 0) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); throw new JeroBootException("压缩包根目录下没有excel作为导入数据,请重新上传"); - }else if(fileList.size() > 1){ + } else if (fileList.size() > 1) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传") ; + throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传"); } // 数据相关处理, @@ -2447,7 +2449,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); @@ -2491,7 +2493,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> dataList, - List> fieldList, - List categoryList, - List dictItemList, - String zipEntryName) { + List> fieldList, + List categoryList, + List dictItemList, + String zipEntryName) { //树形数据字典 List treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); //普通数据字典 List itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); int i = 2; List msgList = new ArrayList<>(); - List> mapList = new ArrayList<>(); + List> mapList = new ArrayList<>(); for (Map stringStringMap : dataList) { Map mapResult = new HashMap<>(); i++; @@ -2663,7 +2665,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"; } - throw new JeroBootException(html) ; + throw new JeroBootException(html); } else { - if(mapList.size() != 0){ + if (mapList.size() != 0) { for (Map map : mapList) { this.addInfo(map); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/domain/service/impl/DomainManageServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/domain/service/impl/DomainManageServiceImpl.java index c1754df58..7ee962dc6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/domain/service/impl/DomainManageServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/domain/service/impl/DomainManageServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.oConvertUtils; import com.jero.modules.domain.entity.DomainUserRel; import com.jero.modules.domain.mapper.DomainUserRelMapper; import com.jero.modules.domain.service.DomainUserRelService; @@ -21,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; @@ -95,7 +95,7 @@ public class DomainManageServiceImpl extends ServiceImpl queryDomain = new QueryWrapper<>(); - queryDomain.lambda().eq(DomainUserRel::getDomainId,domainId); + queryDomain.lambda().in(DomainUserRel::getDomainId, Arrays.asList(domainId.split(","))); List domainUserRelList = super.baseMapper.selectList(queryDomain); if(CollectionUtils.isNotEmpty(domainUserRelList)){ result = domainUserRelList.stream().map(DomainUserRel::getUserId).distinct().collect(Collectors.toList()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 2b7655a7e..c0003059b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -11,6 +11,7 @@ import com.jero.modules.tag.service.IOnlCgformTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -88,7 +89,7 @@ public class OnlCgformAreaController extends JeroController add(@Validated @RequestBody OnlCgformArea onlCgformArea) { onlCgformAreaService.add(onlCgformArea); return Result.OK("添加成功！"); @@ -103,7 +104,7 @@ public class OnlCgformAreaController extends JeroController edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { onlCgformAreaService.editById(onlCgformArea); return Result.OK("编辑成功!"); @@ -118,7 +119,7 @@ public class OnlCgformAreaController extends JeroController delete(@RequestParam(name="id",required=true) String id) { OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id); int count=onlCgformTagService.queryExitArea(onlCgformArea); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index 6a8fe50d8..c825e49d5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -3,9 +3,11 @@ package com.jero.modules.tag.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.CommonConstant; import com.jero.common.system.base.controller.JeroController; import com.jero.generater.modules.online.cgform.controller.OnlCgformApiController; import com.jero.modules.enums.FixedFieldEnum; +import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; @@ -15,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -82,7 +85,7 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { onlCgformTagService.add(onlCgformTag); onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal"); @@ -98,7 +101,7 @@ public class OnlCgformTagController extends JeroController edit(@Validated @RequestBody OnlCgformTag onlCgformTag) { if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { return Result.error("固定字段,不可修改"); @@ -118,7 +121,7 @@ public class OnlCgformTagController extends JeroController delete(@RequestParam(name="id",required=true) String id) { Result result = new Result<>(); OnlCgformTag onlCgformTag = onlCgformTagService.queryById(id); @@ -134,6 +137,30 @@ public class OnlCgformTagController extends JeroController logicDelete(@RequestParam(name="id",required=true) String id) { + Result result = new Result<>(); + OnlCgformTag onlCgformTag = onlCgformTagService.queryById(id); + if(StringUtils.isNotBlank(String.valueOf(onlCgformTag.getIsReadOnly()))) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { + result.error500("固定字段,不可删除"); + } else { + onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_1); + //onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");//逻辑删除-->要处理同步数据库问题!!!! + result.OK("删除成功！"); + } + } + return result; + } /** * 批量删除 * @@ -143,7 +170,7 @@ public class OnlCgformTagController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { OnlCgformTag onlCgformTag = onlCgformTagService.queryById(ids); if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { @@ -155,6 +182,38 @@ public class OnlCgformTagController extends JeroController logicDeleteBatch(@RequestParam(name="ids",required=true) String ids) { + Result result = new Result(); + OnlCgformTag onlCgformTag = onlCgformTagService.queryById(ids); + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { + return Result.error("包含固定字段,不可删除"); + }else { + List idList = Arrays.asList(ids.split(",")); + for(String list:idList){ + OnlCgformTag midTag=onlCgformTagService.getById(list); + if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(midTag.getIsReadOnly()))) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(midTag.getIsReadOnly())) { + result.error500("包含固定字段,不可删除"); + } else { + midTag.setIsDelete(CommonConstant.DEL_FLAG_1); + //onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");//逻辑删除-->要处理同步数据库问题!!!! + result.success("批量删除成功!"); + } + } + } + } + return result; + } /** * 通过id查询 * diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index ff05cf345..56f68d64a 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -45,7 +45,7 @@ export default { name: 'HeaderNotice', components: { - DynamicNotice, + DynamicNotice }, data() { return { @@ -54,14 +54,14 @@ listCementByUser: '/sys/sysAnnouncementSend/getMessageUnreadList', editCementSend: '/sys/sysAnnouncementSend/editByAnntIdAndUserId', queryById: '/sys/annountCement/queryById', - readAllMsg:'sys/sysAnnouncementSend/read', + readAllMsg: 'sys/sysAnnouncementSend/read' }, hovered: false, announcement1: [], announcement2: [], msg1Count: '0', msg2Count: '0', - msg1Title: this.$t('MessageNotification')+'(0)', + msg1Title: this.$t('MessageNotification') + '(0)', msg2Title: '', stopTimer: false, websock: null, @@ -86,17 +86,6 @@ this.websocketOnclose() }, methods: { - timerFun() { - this.stopTimer = false - let myTimer = setInterval(() => { - // 停止定时器 - if (this.stopTimer == true) { - clearInterval(myTimer) - return - } - this.loadData() - }, 6000) - }, loadData() { try { // 获取系统消息 @@ -104,7 +93,7 @@ if (res.success) { this.announcement1 = res.result this.msg1Count = res.result.length - this.msg1Title = this.$t('MessageNotification')+'(' + res.result.length + ')' + this.msg1Title = this.$t('MessageNotification') + '(' + res.result.length + ')' } }).catch(error => { this.stopTimer = true @@ -158,16 +147,9 @@ this.reconnect() }, websocketOnmessage: function(e) { - console.log(e) - console.log('-----接收消息-------', e.data) - var data = eval('(' + e.data + ')') //解析对象 - if (data.cmd == 'topic') { - //系统通知 - this.loadData() - } else if (data.cmd == 'user') { - //用户消息 - this.loadData() - } + console.log('-----接收消息-------', e) + //系统通知 + this.loadData() }, websocketOnclose: function(e) { console.log('connection closed (' + e + ')') @@ -198,6 +180,7 @@ heartCheckFun() { var that = this //心跳检测,每20s心跳一次 + console.log(123) that.heartCheck = { timeout: 20000, timeoutObj: null, diff --git a/jero-web/src/views/documentManage/splitting/modules/imports.vue b/jero-web/src/views/documentManage/splitting/modules/imports.vue index c612a166b..5fd2d7707 100644 --- a/jero-web/src/views/documentManage/splitting/modules/imports.vue +++ b/jero-web/src/views/documentManage/splitting/modules/imports.vue @@ -34,7 +34,7 @@
- +
{ if(res.success){ + console.log('result',res.result) this.data=[...res.result] - this.treeData=[...this.addAttr(this.data)] + this.treeData1=[...this.addAttr(this.data)] + this.treeData=[...this.treeData1] // console.log('treeData',this.treeData) } }) @@ -84,6 +88,7 @@ onSearch(){ // this.treeData=[] // this.treeData=this.getSearch(this.data) + // this.getSearch(this.searchValue,this.treeData1) }, //获取用户的订阅 getSubscribtion(){ @@ -111,21 +116,26 @@ // console.log('dataI',dataI) return dataI }, - getSearch(dataI){ + getSearch(key,tree){ let dataSearch=[] - console.log('tree',this.treeData,this.data) - if((Array.isArray(dataI)) && dataI.length>0){ - dataI.forEach((item,index)=>{ - this.$set(item,'key',item.id) - if(item.title.indexOf(this.searchValue)>-1){ - dataSearch.push(item) + let parentKey; + for (let i = 0; i < tree.length; i++) { + const node = tree[i]; + + if (node.children) { + if (node.children.some(item => item.title.indexOf(key)>-1)) { + console.log('titel',node) + parentKey = node.key; + this.parentItem.push(node) + } else if (this.getParentKey(key, node.children)) { + parentKey = this.getParentKey(key, node.children); } - let arr = []; - this.addAttr(item.children,arr); - }); + } } - console.log('dataSearch',dataSearch) - return dataSearch + console.log('dataSearch',this.parentItem) + return this.parentItem + + // return dataSearch }, afterVisibleChange(val) { // console.log('visible', val);