Merge branch 'qin_24'

src/components/DesignForm/app/index.vue

@@ -1753,13 +1753,14 @@ const transformOption = (val: string | number, type?: string) => {
 };
 
 const readerColumnSun = (column: any) => {
+  console.log("表头label长度-11->", column);
   let labelLong = 0; // 表头label长度
-  if (column) {
-    labelLong = column.length;
+  if (column.children) {
+    labelLong = column.children.length;
   }
   if (labelLong > 0) {
     let countLenght = 3;
-    column.forEach((item: any) => {
+    column.children.forEach((item: any) => {
       if (item.label.length < 3) {
         countLenght = countLenght + 90;
       } else {
@@ -1769,7 +1770,7 @@ const readerColumnSun = (column: any) => {
     console.log("表头label长度-->", countLenght);
     return countLenght;
   } else {
-    return 420;
+    return 100;
   }
 };
 </script>
@@ -2035,7 +2036,7 @@ const readerColumnSun = (column: any) => {
               :prop="item.field"
               :label="item.label"
               config=""
-              width="200"
+              min-width="100"
               align="center"
               fixed="right"
             >
@@ -2166,7 +2167,7 @@ const readerColumnSun = (column: any) => {
               v-else-if="item.fieldClass == '_lableTitle'"
               label="标题"
               config=""
-              min-width="320"
+              min-width="20"
             >
               <template #default="scope">
                 {{ writeListTitle(scope.row, viewPage.list) }}
@@ -2177,7 +2178,7 @@ const readerColumnSun = (column: any) => {
               v-else-if="item.fieldClass == ''"
               :prop="item.field"
               :label="item.label"
-              :width="readerColumnSun(item.children)"
+              :min-width="readerColumnSun(item)"
             >
               <template #default="scope">
                 <el-table

src/components/DesignForm/tableListPage/index.vue

@@ -1632,12 +1632,12 @@ const readerColumn = (column: any, isSun: int) => {
 };
 const readerColumnSun = (column: any) => {
   let labelLong = 0; // 表头label长度
-  if (column) {
-    labelLong = column.length;
+  if (column.children) {
+    labelLong = column.children.length;
   }
   if (labelLong > 0) {
     let countLenght = 3;
-    column.forEach((item: any) => {
+    column.children.forEach((item: any) => {
       if (item.label.length < 3) {
         countLenght = countLenght + 90;
       } else {
@@ -1647,7 +1647,7 @@ const readerColumnSun = (column: any) => {
     console.log("表头label长度-->", countLenght);
     return countLenght;
   } else {
-    return 420;
+    return 100;
   }
 };
 </script>
@@ -2045,7 +2045,7 @@ const readerColumnSun = (column: any) => {
               v-else-if="item.fieldClass == ''"
               :prop="item.field"
               :label="item.label"
-              :width="readerColumnSun(item.children)"
+              :width="readerColumnSun(item)"
             >
               <template #default="scope"
                 >{{ data.tableProps }}