From 55029306b230dd0eca9e7e21fac71aef7a2b6025 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Fri, 13 Jun 2025 11:47:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E7=A9=BF=E6=A2=AD?= =?UTF-8?q?=E6=A1=86=E7=BB=84=E4=BB=B6=E5=AF=B9=E5=BA=94=E7=9A=84=E5=86=85?= =?UTF-8?q?=E5=AE=B9bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DesignForm/public/form/formItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue index 71faa36..1ea16ef 100644 --- a/src/components/DesignForm/public/form/formItem.vue +++ b/src/components/DesignForm/public/form/formItem.vue @@ -1066,7 +1066,7 @@ const diGuiJilian = (val: any, options: any[]) => { /> From 092643897aa0ef515fc8c6093d148944df78fd86 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Tue, 17 Jun 2025 16:12:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E7=A9=BF=E6=A2=AD=E6=A1=86=E5=A4=9A?= =?UTF-8?q?=E9=80=89=E6=B7=B7=E5=90=88=E4=B8=8D=E5=8F=AF=E9=80=89bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=202.=E7=A9=BF=E6=A2=AD=E6=A1=86=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=203.=E4=BC=98=E5=8C=96=E7=A9=BF=E6=A2=AD=E6=A1=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BAid=E6=94=B9=E4=B8=BAlabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DesignForm/app/index.vue | 61 +++++++++ .../DesignForm/tableListPage/index.vue | 64 ++++++++- .../lowcodetransfer/lowcodeTransfer.vue | 129 ++++++++++++++++-- 3 files changed, 240 insertions(+), 14 deletions(-) diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 41154c1..f06e0de 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -905,6 +905,7 @@ const searchSend = reactive({ viewClass: {}, }); let asfDetails = []; +let transferDetails = []; let asfQueryParams: any[] = []; /** @ 作者: 秦东 @@ -957,6 +958,10 @@ const getPageData = () => { return item.fieldClass == "associatedForms"; }); + transferDetails = props.data.columns.filter((item: any) => { + return item.fieldClass == "lowcodeTransfer"; + }); + if (asfDetails.length > 0 && data.data.list != null) { //console.log(data.data.list) //拼装参数,asf值对象数组 @@ -1007,6 +1012,36 @@ const getPageData = () => { tableDataList.value = data.data.list; } } else { + //console.log(data.data.list) + transferDetails.forEach(element => { + //console.log(element) + data.data.list.forEach((obj: any) => { + //console.log(obj) + for (const key in obj) { + // 确保只处理对象自身的属性（不包括原型链上的） + if (Object.prototype.hasOwnProperty.call(obj, key)) { + const value = obj[key]; + + // 特殊处理数组/嵌套对象（使用JSON格式化） + const formattedValue = + (Array.isArray(value) || (typeof value === 'object' && value !== null)) + ? JSON.stringify(value, null, 2) + : value; + + //console.log(`${key}: ${formattedValue}`); + if(key==element.field){ + //console.log(key) + /* console.log(element.control.fixedOptions) + console.log(obj[key]) */ + obj[key] = mapIdsToLabels(element.control.fixedOptions,obj[key]) + } + } + } + }); + + }); + //console.log(transferDetails) + //convertIdsToLabels(data.data.list.) tableDataList.value = data.data.list; } @@ -1029,6 +1064,32 @@ const getPageData = () => { } }; + +interface TreeNode { + id: string; + label: string; + disabled: boolean; + children: TreeNode[]; +} + +function mapIdsToLabels(treeNodes: TreeNode[], ids1: string): string[] { + const ids: string[] = JSON.parse(ids1); + // 创建id到label的映射字典 + const idToLabelMap: Record = {}; + + // 递归遍历树节点并填充映射字典 + function traverse(node: TreeNode) { + idToLabelMap[node.id] = node.label; // 存储当前节点的映射 + node.children.forEach(child => traverse(child)); // 递归处理子节点 + } + + // 遍历根节点列表 + treeNodes.forEach(root => traverse(root)); + //console.log(ids) + // 将id数组转换为label数组 + return ids.map(id => idToLabelMap[id]); +} + const asfGetPageData = (asfFormId: any, asfToSelectMastersKey: any) => { let searchData = [ { diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue index 4f42b1b..a29e9ac 100644 --- a/src/components/DesignForm/tableListPage/index.vue +++ b/src/components/DesignForm/tableListPage/index.vue @@ -900,6 +900,7 @@ const searchSend = reactive({ }); let asfDetails = []; +let transferDetails = []; let asfQueryParams: any[] = []; /** @ 作者: 秦东 @@ -958,8 +959,13 @@ const getPageData = () => { return item.fieldClass == "associatedForms"; }); + transferDetails = props.data.columns.filter((item: any) => { + return item.fieldClass == "lowcodeTransfer"; + }); + + //console.log(asfDetails) if (asfDetails.length > 0 && data.data.list != null) { - //console.log(data.data.list) + console.log(data.data.list) //拼装参数,asf值对象数组 asfQueryParams = []; for (let j = 0; j < asfDetails.length; j++) { @@ -1001,12 +1007,43 @@ const getPageData = () => { } } } + tableDataList.value = dataList.data.list; }); } else { tableDataList.value = data.data.list; } } else { + //console.log(data.data.list) + transferDetails.forEach(element => { + //console.log(element) + data.data.list.forEach((obj: any) => { + //console.log(obj) + for (const key in obj) { + // 确保只处理对象自身的属性（不包括原型链上的） + if (Object.prototype.hasOwnProperty.call(obj, key)) { + const value = obj[key]; + + // 特殊处理数组/嵌套对象（使用JSON格式化） + const formattedValue = + (Array.isArray(value) || (typeof value === 'object' && value !== null)) + ? JSON.stringify(value, null, 2) + : value; + + //console.log(`${key}: ${formattedValue}`); + if(key==element.field){ + //console.log(key) + /* console.log(element.control.fixedOptions) + console.log(obj[key]) */ + obj[key] = mapIdsToLabels(element.control.fixedOptions,obj[key]) + } + } + } + }); + + }); + //console.log(transferDetails) + //convertIdsToLabels(data.data.list.) tableDataList.value = data.data.list; } //liwenxuan 关联表单数据获取 end @@ -1026,6 +1063,31 @@ const getPageData = () => { } }; +interface TreeNode { + id: string; + label: string; + disabled: boolean; + children: TreeNode[]; +} + +function mapIdsToLabels(treeNodes: TreeNode[], ids1: string): string[] { + const ids: string[] = JSON.parse(ids1); + // 创建id到label的映射字典 + const idToLabelMap: Record = {}; + + // 递归遍历树节点并填充映射字典 + function traverse(node: TreeNode) { + idToLabelMap[node.id] = node.label; // 存储当前节点的映射 + node.children.forEach(child => traverse(child)); // 递归处理子节点 + } + + // 遍历根节点列表 + treeNodes.forEach(root => traverse(root)); + //console.log(ids) + // 将id数组转换为label数组 + return ids.map(id => idToLabelMap[id]); +} + const asfGetPageData = (asfFormId: any, asfToSelectMastersKey: any) => { let searchData = [ { diff --git a/src/widget/lowcodetransfer/lowcodeTransfer.vue b/src/widget/lowcodetransfer/lowcodeTransfer.vue index cdd3188..90b00fd 100644 --- a/src/widget/lowcodetransfer/lowcodeTransfer.vue +++ b/src/widget/lowcodetransfer/lowcodeTransfer.vue @@ -17,7 +17,7 @@
- @@ -53,6 +53,7 @@ import { ref, watch, onMounted } from 'vue' import request from '@/utils/request'; +import { forEach } from 'jszip'; const props = defineProps({ // eslint-disable-next-line vue/require-default-prop @@ -97,19 +98,22 @@ const treeProps = { } let dataFinished = ref(false) const treeRef = ref() -const isExpandAll = ref(false) // 是否全展开 +const isExpandAll = ref(transferConfig.value.transferDataSource != "数据源") // 是否全展开 const keyword = ref('') // 搜索关键字 const checkList = ref([]) // 选中的list const userList = computed({ get(){ if (transferConfig.value.transferDataSource === "数据源") { + return [{ id: '全选', label: '全选', children: [...resData.value] }] + }else{ + return [{ id: '全选', label: '全选', @@ -122,6 +126,9 @@ const userList = computed({ } }) + +let userList1 = ref([]); +// let checkedIdList = ref([]); let count = 0 function waitAndReGet() { @@ -210,7 +217,11 @@ if (transferConfig.value.transferDataSource === "数据源") { label: '全选', children: [...resData.value] }] - treeRef.value.setCheckedKeys(checkedIdList.value, true) + userList1.value = userList.value + if( treeRef.value){ + treeRef.value.setCheckedKeys(checkedIdList.value, true) + } + setTimeout(() => { checkedIdList.value.forEach(element => { const _node = treeRef?.value?.getNode(element) @@ -324,13 +335,34 @@ const handleCheckList = (val) => { if (!_node) return const _checkList = checkList.value + //console.log(checkedIdList.value) if (_node.checked||_node.childNodes.length > 0) { - //console.log(1) if (_node.checked && _node.childNodes.length === 0) { - _checkList.push(_node) + + let count = 0 + checkedIdList.value.forEach(element1 => { + if(element1==valId){ + + count++ + } + }); + + if(count==1){ + _checkList.push(_node) + } + } - // 通过new Set() 实现数据去重 - checkList.value = Array.from(new Set(_checkList)) + //console.log(_checkList) + + /* checkList.value.forEach(element => { + console.log(element.data.id) + }); */ + + //使用 Map 对象实现真正的按 id 去重 + checkList.value = Array.from(new Map( + _checkList.map(item => [item.data.id, item]) + ).values()); + // 遍历子级,递归,直到获取最后一级的人员 if (_node.childNodes.length > 0) { _node.childNodes.map(item => handleCheckList(item.data)) @@ -410,14 +442,76 @@ const expandAll = () => { } } +let watchCount = 0 + + // 执行tree数据过滤 watch(keyword, (newVal) => { - console.log(keyword) - console.log(newVal) - treeRef.value.filter(newVal) + + + + console.log(fuzzyTreeSearch(userList.value,newVal)) + + + userList1.value = fuzzyTreeSearch(userList.value,newVal) + console.log(userList1.value) + //treeRef.value.data = fuzzyTreeSearch(treeRefValueData,newVal) + watchCount++ + isShowMore() }) +function isShowMore() { + isExpandAll.value = true + let nodes = treeRef.value.store._getAllNodes(); + nodes.forEach(item => { + item.expanded = true; + }); +} + + +function fuzzyTreeSearch(treeData, keyword) { + if (!keyword?.trim()) return deepClone(treeData); // 空关键词返回完整树 + + + const processNode = (node) => { + const newNode = deepClone(node); // 深拷贝当前节点 + const isSelfMatch = newNode.label.toLowerCase().includes(keyword.toLowerCase()); + + // 处理子节点（关键修复点） + let hasValidChild = false; + if (newNode.children?.length) { + newNode.children = newNode.children + .map(child => processNode(child)) + .filter(Boolean); // 过滤无效子节点 + hasValidChild = newNode.children.length > 0; + } + + // 保留条件：自身匹配 或 子节点有匹配（修复子节点丢失问题） + if (isSelfMatch || hasValidChild) { + // 自身匹配时保留完整子树（即使子节点未匹配） + if (isSelfMatch && newNode.children?.length === 0) { + newNode.children = deepClone(node.children); // 直接复制原子节点 + } + return newNode; + } + return null; + }; + + return treeData.map(root => processNode(root)).filter(Boolean); +} + +function deepClone(obj) { + if (obj === null || typeof obj !== 'object') return obj; + const clone = Array.isArray(obj) ? [] : {}; + for (const key in obj) { + clone[key] = deepClone(obj[key]); + } + return clone; +} + + + //获取配置接口相应或获取固定选项值 if (transferConfig.value.transferDataSource === "固定选项") { setTimeout(() => { @@ -428,9 +522,12 @@ if (transferConfig.value.transferDataSource === "固定选项") { label: '全选', children: props.data?.control.fixedOptions }] + userList1.value = userList.value //console.log(treeRef) /* console.log(checkedIdList.value) */ - treeRef.value.setCheckedKeys(checkedIdList.value, true) + if( treeRef.value){ + treeRef.value.setCheckedKeys(checkedIdList.value, true) + } setTimeout(() => { checkedIdList.value.forEach(element => { const _node = treeRef?.value?.getNode(element) @@ -525,7 +622,10 @@ watch(transferConfig, (newValue, oldValue) => { label: '全选', children: [...resData.value] }] - treeRef.value.setCheckedKeys(checkedIdList.value, true) + userList1.value = userList.value + if( treeRef.value){ + treeRef.value.setCheckedKeys(checkedIdList.value, true) + } setTimeout(() => { checkedIdList.value.forEach(element => { const _node = treeRef?.value?.getNode(element) @@ -573,9 +673,12 @@ watch(selectedValueCompu, (newValue, oldValue) => { label: '全选', children: props.data?.control.fixedOptions }] + userList1.value = userList.value //console.log(treeRef) /* console.log(checkedIdList.value) */ - treeRef.value.setCheckedKeys(checkedIdList.value, true) + if( treeRef.value){ + treeRef.value.setCheckedKeys(checkedIdList.value, true) + } setTimeout(() => { checkedIdList.value.forEach(element => { const _node = treeRef?.value?.getNode(element)