mali-applet-ui 1.0.143 → 1.0.145

package/lib/components/ml-header-filter-form/ml-header-filter-form.vue

@@ -97,6 +97,7 @@ export default {
     },
     clearEvent () {
       this.$emit('search')
+      this.$emit('query')
     },
     searchEvent () {
       this.$emit('search')

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

@@ -1,5 +1,5 @@
 <template>
-  <view class="ml-table" :class="className || ''">
+  <view class="ml-table" :class="[className || '', {'is-border': border, 'is-ellipsis' : showOverflow}]">
     <view v-if="$slots.top" class="ml-table-top-warpper">
       <slot name="top"></slot>
     </view>
@@ -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>
@@ -93,6 +93,7 @@ export default {
   props: {
     loading: Boolean,
     className: String,
+    border: Boolean,
     height: [Number, String],
     headerData: Array,
     data: Array,
@@ -101,11 +102,15 @@ export default {
     loadStatus: String,
     rowConfig: {
       type: Object,
-      defaule: () => ({})
+      default: () => ({})
     },
     sortConfig: {
       type: Object,
-      defaule: () => ({})
+      default: () => ({})
+    },
+    showOverflow: {
+      type: Boolean,
+      default: true
     },
     headerCellClass: [String, Function],
     headerCellFormat: Function,
@@ -138,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};` : '84rpx'
     }
   },
   watch: {
@@ -198,13 +200,19 @@ export default {
     getCellClass (params) {
       const { row, column } = params
       const cellValue = row[column.field]
+      const clss = []
+      const showOverflow = XEUtils.isBoolean(column.showOverflow) ? column.showOverflow : this.showOverflow
+      if (showOverflow) {
+        clss.push('is-ellipsis')
+      }
       if (this.cellClass) {
         if (XEUtils.isFunction(this.cellClass)) {
-          return this.cellClass.call(this.currVM, { ...params, cellValue })
+          clss.push(this.cellClass.call(this.currVM, { ...params, cellValue }))
+        } else {
+          clss.push(`${this.cellClass}`)
         }
-        return `${this.cellClass}`
       }
-      return ''
+      return clss.join(' ')
     },
     getCellValue (params) {
       const { row, column } = params
@@ -214,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)) {
@@ -289,6 +301,15 @@ export default {
   font-size: $ml-base-font-size;
   box-shadow: 0rpx 0rpx 10rpx -3rpx rgba(0, 0, 0, 0.2);
   background: #fff;
+  &.is-border {
+    .table-th,
+    .table-td {
+      border-right: 1px solid rgba(126, 134, 142, 0.16);
+      &:last-child {
+        border-right: 0;
+      }
+    }
+  }
   .ml-table-warpper {
     overflow: auto;
   }
@@ -338,6 +359,7 @@ export default {
   }
   .table-th {
     position: relative;
+    font-size: 28rpx;
     .th-sort {
       position: absolute;
       top: 50%;
@@ -363,11 +385,17 @@ export default {
     color: rgba(39, 42, 48, 0.65);
     border-bottom: 1px solid rgba(126, 134, 142, 0.16);
     box-sizing: border-box;
+    font-size: 24rpx;
+    min-height: 84rpx;
   }
   .table-cell {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    white-space: normal;
+    word-break: break-all;
+    &.is-ellipsis {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
     &.align-left {
       text-align: left;
     }
@@ -383,6 +411,7 @@ export default {
     flex-direction: column;
     min-height: 70rpx;
     justify-content: center;
+    border-top: 1px solid rgba(126, 134, 142, 0.16);
   }
 }
 </style>

package/package.json

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