Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into dev

src/shared/components/DataTable.vue

@@ -69,6 +69,7 @@ const props = withDefaults(defineProps<{
   emptyText?: string
   total?: number | string
   pageSizes?: number[]
+  maxHeight?: string | number
   preferenceKey?: string
   columnSettingsMode?: 'auto' | 'show' | 'hide'
   border?: boolean
@@ -78,6 +79,7 @@ const props = withDefaults(defineProps<{
   emptyText: '暂无数据',
   total: undefined,
   pageSizes: () => [10, 20, 50, 100],
+  maxHeight: 'calc(100vh - 300px)',
   columnSettingsMode: 'auto',
   border: true,
   stripe: true,
@@ -302,7 +304,7 @@ function setPage(value: number) {
         </div>
       </div>
     </div>
-    <el-table ref="tableRef" v-bind="$attrs" v-loading="loading" :data="data" :empty-text="emptyText" :border="border" :stripe="stripe" :aria-busy="loading">
+    <el-table ref="tableRef" v-bind="$attrs" v-loading="loading" :data="data" :empty-text="emptyText" :border="border" :stripe="stripe" :max-height="maxHeight" :aria-busy="loading">
       <el-table-column
         v-for="(column, index) in visibleColumns"
         :key="columnRenderKey(column, index)"