mali-applet-ui 1.0.120 → 1.0.122

package/lib/components/ml-approval-select/ml-approval-select.vue

@@ -193,7 +193,7 @@ export default {
       const flowHandlers = this.flowItems.map(item => {
         
         return {
-          copierList: mergeMemberIdsByRoleId(item.copyUsers || []),
+          copierList: this.mergeMemberIdsByRoleId(item.copyUsers || []),
           flowItemSettingId: item.id,
           userList: this.mergeMemberIdsByRoleId(item.users || [])
         }

package/lib/components/ml-progress-bar/ml-progress-bar.vue

@@ -58,7 +58,7 @@ export default {
   },
   computed: {
     percNum () {
-      return Math.ceil(XEUtils.toNumber(this.value) / (XEUtils.toNumber(this.max) / 100))
+      return Math.ceil(XEUtils.toNumber(this.value) / (Math.max(1, XEUtils.toNumber(this.max)) / 100))
     },
     barOpts () {
       return Object.assign({}, this.barStyle)

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

@@ -22,7 +22,7 @@
         </view>
         <view v-if="headerData && headerData.length" class="table-body-top">
           <view class="table-tr" v-for="(row, rowIndex) in headerData" :key="rowIndex">
-            <view class="table-td" v-for="(column, columnIndex) in tableColumn" :key="columnIndex" :style="[getColTdStyles(column)]" @click="cellHeaderTdClick({ type: 'header', row, rowIndex, column, columnIndex })">
+            <view class="table-td" v-for="(column, columnIndex) in tableColumn" :key="columnIndex" :style="{width: getColWidth(column)}" @click="cellHeaderTdClick({ type: 'header', row, rowIndex, column, columnIndex })">
               <view :class="['table-cell', column.align ? `align-${column.align}` : '', getHeaderCellClass({ type: 'header', row, rowIndex, column, columnIndex })]">
                 <ml-amount-text v-if="column.cellRender && column.cellRender.name === 'MlAmountText'" :value="row[column.field]" :simplify="column.cellRender.props ? column.cellRender.props.simplify : false"></ml-amount-text>
                 <text v-else>{{ getHeaderCellValue({ type: 'header', row, rowIndex, column, columnIndex }) }}</text>
@@ -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="[getColTdStyles(column)]" @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: tdHeight}" @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>
@@ -123,6 +123,9 @@ export default {
     }
   },
   computed: {
+    rowOpts () {
+      return this.rowConfig ? { ...this.rowConfig } : {}
+    },
     sortOpts () {
       return this.sortConfig ? { ...this.sortConfig } : {}
     },
@@ -131,6 +134,9 @@ export default {
     },
     colMinWidth () {
       return Math.max(20, XEUtils.floor(100 / this.tableColumn.length, 2))
+    },
+    tdHeight () {
+      return this.rowOpts.height ? `${this.rowOpts.height};` : '84rpx'
     }
   },
   watch: {
@@ -222,14 +228,6 @@ export default {
       }
       return ''
     },
-    getColTdStyles (column) {
-      const wSty = `width: ${this.getColWidth(column)};`
-      let hSty = ''
-      if (this.rowConfig && this.rowConfig.height) {
-        hSty = `height: ${this.rowConfig.height};`
-      }
-      return `${wSty || ''}${hSty || ''}`
-    },
     sort (fieldOrColumn, order) {
       const column = fieldOrColumn ? this.tableColumn.find(item => item.colid === fieldOrColumn.colid || item.field === fieldOrColumn) : null
       if (column) {
@@ -284,7 +282,7 @@ export default {
 .ml-table {
   display: block;
   width: 100%;
-  font-size: 26rpx;
+  font-size: $ml-base-font-size;
   box-shadow: 0rpx 0rpx 10rpx -3rpx rgba(0, 0, 0, 0.2);
   background: #fff;
   .ml-table-warpper {
@@ -297,11 +295,15 @@ export default {
   }
   .table-body-top {
     background: #fff;
+    .table-td {
+      height: 84rpx;
+      line-height: 84rpx;
+    }
   }
   .table-th {
     display: inline-flex;
-    height: 70rpx;
-    line-height: 70rpx;
+    height: 88rpx;
+    line-height: 88rpx;
     color: #000000;
     text-align: center;
     overflow: hidden;
@@ -316,13 +318,16 @@ export default {
       }
     }
     .th-title {
+      display: block;
+      width: 100%;
+      padding: 0 8rpx;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
     }
   }
   .table-tr {
-    display: block;
+    display: inline-flex;
     white-space: nowrap;
     width: 100%;
   }
@@ -345,7 +350,9 @@ export default {
   }
   .table-td {
     display: inline-flex;
-    padding: 20rpx 10rpx;
+    flex-direction: row;
+    align-items: center;
+    padding: 0 10rpx;
     text-align: center;
     color: rgba(39, 42, 48, 0.65);
     border-bottom: 1px solid rgba(126, 134, 142, 0.16);

package/package.json

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