mali-applet-ui 1.0.145 → 1.0.147

package/config/store.js

@@ -7,25 +7,25 @@ const globalStore = {
     //   fileName: 'fileName' // 文件名
     // },
     // 获取附件缩略图方法
-    getThumbnailFileUrl: null,
-    // 获取附件路径方法
-    getFileUrl: null,
-    // 上传附件方法
-    uploadFile: null,
-    // 下载附件方法
-    downloadFile: null,
-    // 删除附件方法
-    removeFile: null
+    // getThumbnailFileUrl: null,
+    // // 获取附件路径方法
+    // getFileUrl: null,
+    // // 上传附件方法
+    // uploadFile: null,
+    // // 下载附件方法
+    // downloadFile: null,
+    // // 删除附件方法
+    // removeFile: null
   },
   // 审批组件
   approval: {
     // 审批流程
     select: {
-      optionMethod: null
+      // optionMethod: null
     },
     // 审批记录
     record: {
-      optionMethod: null
+      // optionMethod: null
     },
     types: [
       { value: 0, label: '起草中', color: '#353535', background: '#eaebed' },
@@ -49,9 +49,9 @@ const globalStore = {
       total: 'total'
     },
     notData: {
-      emptyUrl: '',
+      // emptyUrl: '',
       emptyText: '暂无记录',
-      resultUrl: '',
+      // resultUrl: '',
       resultText: '暂无相关结果',
       resultHint: '请检查输入是否正确'
     }
@@ -68,7 +68,7 @@ const globalStore = {
       total: 'total'
     },
     notData: {
-      emptyUrl: '',
+      // emptyUrl: '',
       emptyText: '暂无记录',
       resultUrl: '',
       resultText: '暂无相关结果',
@@ -76,8 +76,11 @@ const globalStore = {
     }
   },
   notData: {
-    emptyUrl: '',
+    // emptyUrl: '',
     emptyText: '暂无记录'
+  },
+  listSelectUserPage: {
+    // defaultAvatarUrl: ''
   }
 }
 

package/lib/components/ml-amount-input/ml-amount-input.vue

@@ -236,6 +236,7 @@ export default {
   }
   .ml-amount-input-inp {
     outline: 0;
+    border: 0;
   }
   .ml-amount-input-inp,
   .ml-amount-input-simulate {

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

@@ -166,6 +166,7 @@ export default {
   }
   .ml-input-inp {
     outline: 0;
+    border: 0;
   }
   .ml-input-inp,
   .ml-input-simulate {

package/lib/components/ml-list-select-user-page/ml-list-select-user-page.vue

@@ -2,10 +2,13 @@
   <view class="ml-list-select-user-page" :class="[className || '', {'is-border': border, 'is-disabled': disabled}]" @tap="tapEvent">
     <view v-if="selectRows.length" class="ml-list-select-user-list">
       <view v-for="(item, index) in selectRows" :key="index" class="ml-list-select-user-item">
+        <view class="ml-list-select-user-avatar">
+          <image class="ml-list-select-user-avatar-img" :src="item[optAvatarUrlField] || defaultAvatarUrl" mode="aspectFit"></image>
+        </view>
         <view class="ml-list-select-user-name">
           <view class="ml-list-select-user-content">{{ item[optLabelField] }}</view>
         </view>
-        <view v-if="clearable" class="ml-list-select-user-del-item" @click="removeItem(item)">
+        <view v-if="clearable && !readonly" class="ml-list-select-user-del-item" @click="removeItem(item)">
           <ml-icon name="close" />
         </view>
       </view>
@@ -13,7 +16,7 @@
     <view v-else class="ml-list-select-user-list">
       <view class="ml-list-select-user-page-placeholder">{{ placeholder }}</view>
     </view>
-    <view class="ml-list-select-user-add-item" @click="openUserEvent">
+    <view v-if="!readonly" class="ml-list-select-user-add-item" @click="openUserEvent">
       <view class="ml-list-select-user-add-btn">
         <ml-icon name="add-circle" />
       </view>
@@ -22,6 +25,7 @@
 </template>
 
 <script>
+import globalStore from '../../../config/store'
 import XEUtils from 'xe-utils'
 
 export default {
@@ -44,6 +48,7 @@ export default {
       default: '请选择'
     },
     disabled: Boolean,
+    readonly: Boolean,
     border: Boolean,
     clearable: Boolean,
     className: String
@@ -57,12 +62,18 @@ export default {
     optOptions () {
       return Object.assign({}, this.optionProps)
     },
+    optAvatarUrlField () {
+      return this.optOptions.avatar || 'faceImgUrl'
+    },
     optLabelField () {
       return this.optOptions.label || 'label'
     },
     optValueField () {
       return this.optOptions.value || 'value'
     },
+    defaultAvatarUrl () {
+      return globalStore.listSelectUserPage?.defaultAvatarUrl
+    },
     hasEmpty  () {
       if (this.type === 'checkbox') {
         return !this.value || !this.value.length
@@ -70,10 +81,7 @@ export default {
       return XEUtils.eqNull(this.value) || this.value === ''
     },
     selectRows () {
-      if (this.type === 'checkbox') {
-        return this.dataList.filter(item => this.value.includes(item[this.optValueField]))
-      }
-      return this.dataList.filter(item => this.value === item[this.optValueField])
+      return this.getSelectRows(this.value)
     }
   },
   watch: {
@@ -92,6 +100,15 @@ export default {
       this.$emit('tap', {})
       this.$emit('click', {})
     },
+    getSelectRows (value) {
+      if (!this.dataList || !this.dataList.length) {
+        return []
+      }
+      if (this.type === 'checkbox') {
+        return this.dataList.filter(item => value.includes(item[this.optValueField]))
+      }
+      return this.dataList.filter(item => value === item[this.optValueField])
+    },
     openUserEvent () {
       if (this.disabled) {
         return
@@ -119,11 +136,24 @@ export default {
     },
     removeItem (item) {
       let value = null
+      const checkedKey = null
+      let checkedKeys = []
       if (this.type === 'checkbox') {
         value = this.value.filter(key => key !== item[this.optValueField])
+        checkedKeys = value
+      }
+      const selectRows = this.getSelectRows(value)
+      const label = selectRows.map(item => item[this.optLabelField]).join(',')
+      const params = {
+        value,
+        label,
+        selectRows,
+        checkedKey,
+        checkedKeys,
+        type: this.compType
       }
       this.$emit('input', value)
-      this.$emit('change', { value })
+      this.$emit('change', params)
     },
     clearEvent () {
       let value = null
@@ -131,7 +161,14 @@ export default {
         value = []
       }
       this.$emit('input', value)
-      this.$emit('clear', { value })
+      this.$emit('clear', {
+        value,
+        label: '',
+        checkedKey: null,
+        checkedKeys: [],
+        selectRows: [],
+        type: this.compType
+      })
     }
   }
 }
@@ -171,16 +208,23 @@ export default {
       color: $uni-text-color-disable;
     }
   }
-  .ml-list-select-user-img {
-    width: 50rpx;
-    height: 50rpx;
-    border-radius: 50%;
-    overflow: hidden;
+  .ml-list-select-user-avatar {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    .ml-list-select-user-avatar-img {
+      width: 40rpx;
+      height: 40rpx;
+      border-radius: 50%;
+      overflow: hidden;
+    }
   }
   .ml-list-select-user-name {
+    margin-left: 8rpx;
     .ml-list-select-user-content {
       font-size: 28rpx;
-      max-width: 140rpx;
+      max-width: 100rpx;
+      text-align: center;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
@@ -188,7 +232,7 @@ export default {
   }
   .ml-list-select-user-del-item {
     flex-shrink: 0;
-    margin-left: 16rpx;
+    margin-left: 8rpx;
   }
   .ml-list-select-user-page-placeholder {
     color: $ml-input-color-placeholder;

package/lib/components/ml-number-input/ml-number-input.vue

@@ -280,6 +280,7 @@ export default {
   }
   .ml-number-input-inp {
     outline: 0;
+    border: 0;
   }
   .ml-number-input-minus-btn,
   .ml-number-input-plus-btn {

package/package.json

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

package/store/base.js

@@ -31,7 +31,7 @@ const base = {
         success ({ eventChannel }) {
           if (opts && opts.compTitle) {
             uni.setNavigationBarTitle({
-              title: opts.compTitle
+              title: opts.compTitle || '请选择'
             })
           }
           eventChannel.emit('init', compParams)