mali-applet-ui 1.0.144 → 1.0.145

package/lib/components/ml-table/ml-table.vue

@@ -33,7 +33,7 @@
       </view>
       <view class="table-body-contnet">
         <view class="table-tr" v-for="(row, rowIndex) in tableData" :key="rowIndex">
-          <view class="table-td" v-for="(column, columnIndex) in tableColumn" :key="columnIndex" :style="{width: getColWidth(column), height: tdHeight}" @click="cellTdClick({ type: 'body', row, rowIndex, column, columnIndex })">
+          <view class="table-td" v-for="(column, columnIndex) in tableColumn" :key="columnIndex" :style="{width: getColWidth(column), height: getColHeight(column)}" @click="cellTdClick({ type: 'body', row, rowIndex, column, columnIndex })">
             <view :class="['table-cell', column.align ? `align-${column.align}` : '', getCellClass({ type: 'body', row, rowIndex, column, columnIndex })]">
               <text v-if="column.type === 'seq'">{{ rowIndex + 1 }}</text>
               <text v-else-if="column.cellRender && column.cellRender.name === 'Underline'" class="is-underline">{{ getCellValue({ type: 'body', row, rowIndex, column, columnIndex }) }}</text>
@@ -143,9 +143,6 @@ export default {
     },
     colMinWidth () {
       return Math.max(20, XEUtils.floor(100 / this.tableColumn.length, 2))
-    },
-    tdHeight () {
-      return this.rowOpts.height ? `${this.rowOpts.height};` : (this.showOverflow ? '84rpx' : '')
     }
   },
   watch: {
@@ -204,7 +201,8 @@ export default {
       const { row, column } = params
       const cellValue = row[column.field]
       const clss = []
-      if (this.showOverflow) {
+      const showOverflow = XEUtils.isBoolean(column.showOverflow) ? column.showOverflow : this.showOverflow
+      if (showOverflow) {
         clss.push('is-ellipsis')
       }
       if (this.cellClass) {
@@ -224,6 +222,10 @@ export default {
       }
       return XEUtils.eqNull(cellValue) ? '' : cellValue
     },
+    getColHeight (column) {
+      const showOverflow = XEUtils.isBoolean(column.showOverflow) ? column.showOverflow : this.showOverflow
+      return this.rowOpts.height ? `${this.rowOpts.height};` : (showOverflow ? '84rpx' : '')
+    },
     getColWidth (column) {
       if (column.width) {
         if (isNaN(column.width)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.0.144",
+  "version": "1.0.145",
   "description": "码里云小程序组件库",
   "files": [
     "lib",