Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/components/complexTable/index.vue

@@ -23,7 +23,8 @@
             <div>
               <el-table :data="props.row.children">
                 <el-table-column v-for="column in secondaryColumns" :key="column.prop" :prop="column.prop"
-                  :label="column.label" :sortable="column.sortable ?'custom' : false" :width="column.width">
+                  :label="column.label" :sortable="column.sortable ?'custom' : false" :width="column.width"
+                  >
                   <template #header>
                     <slot name="search" :slotData="column"></slot>
                   </template>
@@ -37,9 +38,9 @@
                     </el-tag>
                     <ImagePreview v-else-if="column.component === 'Image'" :src="getImgTo(scope.row, column)"
                       width="50px" height="50px"></ImagePreview>
-                    <span v-else>
+                    <template v-else>
                       {{ getDisplayText(scope.row, column) }}
-                    </span>
+                    </template>
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" :width="props.columnwidth">
@@ -55,7 +56,7 @@
         <el-table-column v-if="showIndex" type="index" label="序号" width="55" />
         <el-table-column v-for="column in columns" :key="column.prop" :prop="column.prop" :label="column.label"
           :sortable="column.sortable ?'custom' : false" :width="column.width"
-          :align="column.align ? column.align : 'center'">
+          :align="column.align ? column.align : 'center'" show-overflow-tooltip>
           <template #header>
             <slot name="search" :slotData="column"></slot>
           </template>
@@ -75,7 +76,7 @@
             </el-tag>
             <ImagePreview v-else-if="column.component === 'Image'" :src="getImgTo(scope.row, column)" width="50px"
               height="50px"></ImagePreview>
-            <div v-else>
+            <span v-else>
               <div
                 v-if="typeof getDisplayText(scope.row, column) === 'string' && getDisplayText(scope.row, column).includes('\n')"
                 class="flex f-c ">
@@ -85,7 +86,7 @@
               <span v-else>
                 {{ getDisplayText(scope.row, column) }}
               </span>
-            </div>
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" :width="props.columnwidth" v-if="props.showOperation" align="center">