Merge branch 'han_v2'

src/components/DesignForm/app/index.vue

@@ -1002,7 +1002,7 @@ const getPageData = () => {
 //表单导入
 function doImportTableData(){
   dynamicVNode.value=h(importPanel,{
-    fields:props.fieldsDetailList,
+    fields:props.fieldsDetailList.filter(val=>val.type!=="table"),
     formId:props.versionid,
     commitFunc:()=>{
       getPageData() //刷新table页面
@@ -1042,7 +1042,8 @@ function doExportTableData(){
         let maxline=0;
         //写主表列
         for (let val of fields){
-          line.push((item[val.field] as string).replaceAll(",","，"))
+            if(typeof(val)==="string") line.push((item[val.field] as string).replaceAll(",","，"))
+            else  line.push(item[val.field])
         }
 
         //写子表列
@@ -1089,7 +1090,7 @@ function doExportTableData(){
       })
 
       //去掉标题行的统计
-      if((array.length-1)!==datas.total) alert(`实际数据总量：${datas.total}, 导出数据总量：${array.length}`)
+      if((array.length-1)!==datas.total) alert(`导出记录数：${datas.total}, 共计：${array.length-1} 行`)
       
       const filename= props.pickAppMenu.label+".csv"
       const csvString = array.join('\n');
@@ -1109,7 +1110,8 @@ function doExportTableData(){
   }
 
   dynamicVNode.value=h(exportPanel,{
-    fields:columnsFilter.value,
+    fields:columnsFilter.value.filter((item)=>item.pattern!=="table"),
+    subtabs:columnsFilter.value.filter((item)=>item.pattern==="table"),
     subFields:subTableFieldsFilter.value.fields,
     commitFunc:exportFunc,
     closeFunc:()=>dynamicVNode.value=null

src/components/DesignForm/exportPanel.vue

@@ -4,6 +4,7 @@ import { ElDialog } from 'element-plus';
 
 const props = withDefaults(defineProps<{
   fields:any[],
+  subtabs:any[],
   subFields:any[],
   commitFunc:(fields:{field:string,label:string}[],subs:{table:string,field:string,label:string}[])=>void, 
   closeFunc:()=>void,  //父级只需销毁组件
@@ -14,15 +15,19 @@ const checkList=ref<string[]>([])
 //子表字段
 const subCheckList=ref<string[]>([]) 
 
+//优化：用来按子表显示子表自动 
+const subTables=ref<string[]>([])
+
 onMounted(()=>{
   props.fields.forEach((val)=>{
-    if (val.attribute===''){
+    if (val.attribute==='' && val.type!=""){
       checkList.value.push(val.field)
     }
   })
+
   //初始化子表的字段
   props.subFields.forEach((val)=>{
-      subCheckList.value.push(val.field)
+    subCheckList.value.push(val.field)
   })
 })
 
@@ -37,6 +42,7 @@ function handleData(){
 
   //收集子表需要导出的字段
   props.subFields.forEach((val)=>{
+    
     if(subCheckList.value.includes(val.field)){
       sub.push(val)
     }
@@ -55,10 +61,10 @@ function handleData(){
         </template>
       </el-checkbox-group>
 
-      <div v-if="props.subFields.length>0" style="margin-top: 40px;">
-        <h3>请选择子表导出的字段</h3>
+      <div v-for="tab in subtabs" style="margin-top: 40px;">
+        <h3>{{ tab.label }} : 表导出的字段</h3>
         <el-checkbox-group v-model="subCheckList">
-            <el-checkbox v-for="item in props.subFields" :key="item.field" :label="item.label" :value="item.field" />
+            <el-checkbox v-for="item in props.subFields.filter(val=>val.table===tab.field)" :key="item.field" :label="item.label" :value="item.field" />
         </el-checkbox-group>  
       </div>