mali-applet-ui 1.0.85 → 1.0.87

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

@@ -15,6 +15,7 @@ export default {
       type: Boolean,
       default: true
     },
+    zIndex: [Number, String],
     backgroundColor: String
   },
   provide () {
@@ -36,7 +37,8 @@ export default {
     styles () {
       const bomSys = this.bottom ? `bottom:${this.bottom};` : ''
       const bgSys = this.backgroundColor ? `background:${this.backgroundColor};` : ''
-      return `${bomSys}${bgSys}`
+      const zSys = this.zIndex ? `z-index:${this.zIndex};` : ''
+      return `${bomSys}${bgSys}${zSys}`
     },
     activeTab () {
       if (this.tabs) {

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

@@ -1,5 +1,5 @@
 <template>
-  <view class="ml-list-select-page" :class="[className || '', {'is-border': border}]" @tap="tapEvent">
+  <view class="ml-list-select-page" :class="[className || '', {'is-border': border, 'is-disabled': disabled}]" @tap="tapEvent">
     <view class="ml-list-select-page-warpper">
       <view v-if="hasEmpty" class="ml-list-select-page-placeholder">{{ placeholder }}</view>
       <view v-else>
@@ -8,7 +8,7 @@
         </slot>
       </view>
     </view>
-    <view v-if="clearable && value.length" class="ml-list-select-page-clear-icon" @click.stop="clearEvent">
+    <view v-if="clearable && !hasEmpty" class="ml-list-select-page-clear-icon" @click.stop="clearEvent">
       <ml-icon name="delete-filling"></ml-icon>
     </view>
     <view v-else class="ml-list-select-page-icon">
@@ -38,6 +38,7 @@ export default {
       type: String,
       default: '请选择'
     },
+    disabled: Boolean,
     border: Boolean,
     clearable: Boolean,
     className: String
@@ -64,17 +65,20 @@ export default {
       return XEUtils.eqNull(this.value) || this.value === ''
     },
     selectLabel () {
+      let rest = []
       if (this.type === 'checkbox') {
-        return this.dataList.filter(item => this.value.includes(item[this.optValueField])).map(item => item[this.optLabelField]).join(', ')
+        rest = this.dataList.filter(item => this.value.includes(item[this.optValueField]))
+      } else if (this.type === 'radio') {
+        rest = this.dataList.filter(item => this.value === item[this.optValueField])
       }
-      if (this.type === 'radio') {
-        return this.dataList.filter(item => this.value === item[this.optValueField]).map(item => item[this.optLabelField]).join(', ')
-      }
-      return ''
+      return rest.map(item => item[this.optLabelField]).join(',')
     }
   },
   methods: {
     tapEvent () {
+      if (this.disabled) {
+        return
+      }
       // 打开选择列表页面
       this.$store.dispatch('openSelectPage', {
         compName: this.compRender.name, // 指定加载组件名称
@@ -99,7 +103,12 @@ export default {
       this.$emit('click', {})
     },
     clearEvent () {
-
+      let value = null
+      if (this.type === 'checkbox') {
+        value = []
+      }
+      this.$emit('input', value)
+      this.$emit('clear', { value })
     }
   }
 }
@@ -112,6 +121,9 @@ export default {
   padding: 0 10rpx;
   height: 70rpx;
   line-height: 70rpx;
+  &.is-disabled {
+
+  }
   .ml-list-select-page-warpper {
     flex-grow: 1;
     overflow: hidden;
@@ -122,6 +134,9 @@ export default {
   .ml-list-select-page-icon {
     flex-shrink: 0;
   }
+  .ml-list-select-page-clear-icon {
+    color: $ml-input-clear-icon-color;
+  }
   .ml-list-select-page-placeholder {
     color: $ml-input-color-placeholder;
   }

package/package.json

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