mali-applet-ui 1.0.142 → 1.0.144

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>
@@ -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,
@@ -140,7 +145,7 @@ export default {
       return Math.max(20, XEUtils.floor(100 / this.tableColumn.length, 2))
     },
     tdHeight () {
-      return this.rowOpts.height ? `${this.rowOpts.height};` : '84rpx'
+      return this.rowOpts.height ? `${this.rowOpts.height};` : (this.showOverflow ? '84rpx' : '')
     }
   },
   watch: {
@@ -198,13 +203,18 @@ export default {
     getCellClass (params) {
       const { row, column } = params
       const cellValue = row[column.field]
+      const clss = []
+      if (this.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
@@ -289,6 +299,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 +357,7 @@ export default {
   }
   .table-th {
     position: relative;
+    font-size: 28rpx;
     .th-sort {
       position: absolute;
       top: 50%;
@@ -363,11 +383,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 +409,7 @@ export default {
     flex-direction: column;
     min-height: 70rpx;
     justify-content: center;
+    border-top: 1px solid rgba(126, 134, 142, 0.16);
   }
 }
 </style>

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

@@ -505,6 +505,7 @@ export default {
               ).then(res => {
                 return {
                   ...res,
+                  isNew: true,
                   [this.nameField]: res[this.nameField] || file.name,
                   [this.typeField]: res[this.typeField] || fileSuffix,
                   tempPath: file.path
@@ -512,6 +513,7 @@ export default {
               })
             }
             return {
+              isNew: true,
               [this.nameField]: file.name,
               [this.typeField]: file.extname,
               [this.urlField]: file.path,

package/package.json

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