双机架轧辊管理

klp-ui/src/components/KLPUI/KLPTable/index.vue

@@ -8,8 +8,8 @@
 
     <div class="el-table-container" ref="elTableWrapper" @mouseleave="handleTableLeave">
       <!-- 原生 Table 核心：透传 props/事件/插槽 -->
-      <el-table :ref="tableRef" v-bind="$attrs" v-on="$listeners" :class="['my-table', customClass]"
-        @cell-mouse-enter="handleCellEnter" @row-mouseleave="handleRowLeave" :height="height">
+      <el-table :ref="tableRef" v-bind="tableAttrs" v-on="$listeners" :class="['my-table', customClass]"
+        @cell-mouse-enter="handleCellEnter" @row-mouseleave="handleRowLeave">
         <!-- 2. 透传原生内置插槽（如 empty 空数据插槽、append 底部插槽等） -->
         <template v-slot:empty="scope">
           <slot name="empty" v-bind="scope"></slot>
@@ -102,6 +102,13 @@ export default {
     };
   },
   computed: {
+    tableAttrs() {
+      const attrs = { ...this.$attrs }
+      if (this.height !== '' && this.height !== null && this.height !== undefined) {
+        attrs.height = this.height
+      }
+      return attrs
+    },
     floatLayerColumns() {
       if (this.floatLayerConfig?.columns?.length > 1) {
         return this.floatLayerConfig.columns

klp-ui/src/components/Pagination/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="{'hidden':hidden}" class="pagination-container" :style="style">
+  <div :class="{'hidden':hidden}" class="pagination-container" :style="containerStyle">
     <el-pagination
       :background="background"
       :current-page.sync="currentPage"
@@ -61,7 +61,7 @@ export default {
       type: Boolean,
       default: false
     },
-    style: {
+    containerStyle: {
       type: String,
       default: ''
     }