mali-applet-ui 1.0.117 → 1.0.119

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

@@ -170,21 +170,32 @@ export default {
       this.selectedUserIds = ((isCopy ? this.selectFlowItem?.copyUsers : this.selectFlowItem?.users) || []).map(item => item.id)
       this.showPopup = true
     },
+    mergeMemberIdsByRoleId (list) {
+      const userList = []
+      const roleIds = []
+      list.forEach(item => {
+        const [memberId, roleId] = item.id?.split('_')
+        const index = roleIds.indexOf(roleId)
+        if (index > -1) {
+          userList[index].memberIds += `,${memberId}`
+        } else {
+          roleIds.push(roleId)
+          userList.push({
+            memberIds: memberId,
+            memberNames: item.name,
+            roleId: roleId
+          })
+        }
+      })
+      return userList
+    },
     updateFlowHandlers () {
       const flowHandlers = this.flowItems.map(item => {
+        
         return {
-          copierList: (item.copyUsers || []).map(user => ({
-            memberIds: user.id?.split('_')[0],
-            memberNames: user.name,
-            roleId: user.id?.split('_')[1]
-          })),
+          copierList: mergeMemberIdsByRoleId(item.copyUsers || []),
           flowItemSettingId: item.id,
-          userList: (item.users || []).map(user => ({
-            // approveFlag: false,
-            memberIds: user.id?.split('_')[0],
-            memberNames: user.name,
-            roleId: user.id?.split('_')[1]
-          }))
+          userList: this.mergeMemberIdsByRoleId(item.users || [])
         }
       })
       this.approvalData.flowHandlers = flowHandlers

package/lib/components/ml-fixed-footer/ml-fixed-footer.vue

@@ -64,6 +64,7 @@ export default {
         this.calculateStyle(300)
         this.calculateStyle(800)
         this.calculateStyle(1500)
+        this.calculateStyle(3000)
       })
     },
     calculateStyle (timeout) {

package/lib/components/ml-fixed-header/ml-fixed-header.vue

@@ -60,6 +60,7 @@ export default {
         this.calculateStyle(300)
         this.calculateStyle(800)
         this.calculateStyle(1500)
+        this.calculateStyle(3000)
       })
     },
     calculateStyle (timeout) {

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="{width: getColWidth(column)}" @click="cellHeaderTdClick({ type: 'header', row, rowIndex, column, columnIndex })">
+            <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-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="{width: getColWidth(column)}" @click="cellTdClick({ type: 'body', row, rowIndex, column, columnIndex })">
+          <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-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>
@@ -95,6 +95,10 @@ export default {
     columns: Array,
     showMore: Boolean,
     loadStatus: String,
+    rowConfig: {
+      type: Object,
+      defaule: () => ({})
+    },
     sortConfig: {
       type: Object,
       defaule: () => ({})
@@ -218,6 +222,14 @@ 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) {

package/package.json

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