diff --git a/src/components/DesignForm/app/groupPage.vue b/src/components/DesignForm/app/groupPage.vue index c8d8ed8..e5a7630 100644 --- a/src/components/DesignForm/app/groupPage.vue +++ b/src/components/DesignForm/app/groupPage.vue @@ -60,7 +60,6 @@ const onUpdateSort = (data: { prop: string; order: "ascending" | "descending" | columnSortData.delete(data.prop); } - selectedMergeKeys.value=Array.from(columnSortData.keys()) getPageData(); } @@ -68,7 +67,7 @@ const onUpdateSort = (data: { prop: string; order: "ascending" | "descending" | const spanMap = computed(() => { const map = {} const pos = {} - + selectedMergeKeys.value=Array.from(columnSortData.keys()) // 按优先级排序的合并列,获取排序列 selectedMergeKeys.value.forEach((key, index) => { map[key] = [] @@ -152,19 +151,39 @@ const getPageData=async ()=>{ }) } +const tableChildren = (field:string,dataList:any) => { + let jieguo = "" + if(Array.isArray(dataList)){ + dataList.forEach((item) => { + if(typeof(item)=="object"){ + for (let key in item) { + if (field == key){ + if(jieguo!=""){ + jieguo = jieguo+"
"+item[key] + }else{ + jieguo = item[key] + } + + } + } + } + }) + } + return jieguo +} + onMounted(()=>{ + columnSortData.clear() + //处理默认分组 if(props.viewSetup.form.title&&props.viewSetup.form.title.length){ props.viewSetup.form.title.forEach(ele => { if(props.viewSetup.form.sort==2){ columnSortData.set(ele, ""); }else{ - columnSortData.set(ele,'DESC'); //默认asc + columnSortData.set(ele,'DESC'); //默认desc } }); - - selectedMergeKeys.value=Array.from(columnSortData.keys()) } - nextTick(()=>{ getPageData() @@ -175,7 +194,6 @@ defineExpose({ groupColumnSearch }) -