mali-applet-ui 0.0.68 → 0.0.70

package/components/ml-chunk-item/ml-chunk-item.vue

@@ -69,11 +69,11 @@ export default {
     }
   }
   &:not(.is-vertical) {
-    border-right: 1px solid rgba(255, 255, 255, 0.2);
+    border-bottom: 1px solid #e5e5e5;
   }
   &.is-vertical {
     flex-direction: row;
-    border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+    border-bottom: 1px solid #e5e5e5;
   }
   &:last-child {
     border: 0;

package/components/ml-col/ml-col.vue

@@ -1,5 +1,8 @@
 <template>
-  <view class="ml-col" :class="[className || '', span && !width ? `span-${span}` : '', align ? `align-${align}` : '', verticalAling ? `vertical-${verticalAling}` : '', {'is-light': light, 'is-flex': verticalAling || flex,'is-fixed': width || shrink}]" :style="styles">
+  <view
+    class="ml-col"
+    :class="[className || '', span && !width ? `span-${span}` : '', align ? `align-${align}` : '', verticalAling ? `vertical-${verticalAling}` : '', {'is-light': light, 'is-flex': verticalAling || flex, 'is-fixed': width || shrink, 'is-important': important}]"
+    :style="styles">
     <slot></slot>
   </view>
 </template>
@@ -12,6 +15,7 @@ export default {
   },
 	props: {
     span: [String, Number],
+    important: Boolean,
     light: Boolean,
     flex: Boolean,
     shrink: Boolean,
@@ -36,6 +40,10 @@ export default {
   &.is-light {
     color: rgba(0, 0, 0, 0.45);
   }
+  &.is-important {
+    padding-bottom: 10rpx;
+    font-size: 30rpx;
+  }
   &.is-flex {
     display: flex;
     flex-direction: row;

package/components/ml-dict-type/ml-dict-type.vue

@@ -1,5 +1,5 @@
 <template>
-  <text class="ml-dict-type" :class="[className || '', (status || showStatus) && selectStatus ? `status-${selectStatus}` : '', {'is-underline': underline}]">{{ selectLabel }}</text>
+  <text class="ml-dict-type" :class="[className || '', (status || showStatus) && selectStatus ? `status-${selectStatus}` : '', {'is-underline': underline, 'is-round': round}]">{{ selectLabel }}</text>
 </template>
 
 <script>
@@ -12,6 +12,7 @@ export default {
     value: [Number, String],
     options: Array,
     status: String,
+    round: Boolean,
     showStatus: Boolean,
     underline: Boolean,
     optionProps: Object,
@@ -19,14 +20,14 @@ export default {
   },
   computed: {
     selectItem () {
-      const item = this.options ? this.options.find(item => item[this.optValueField] === this.value) : null
+      const item = this.options ? this.options.find(item => String(item[this.optValueField]) === String(this.value)) : null
       return item
     },
     selectLabel () {
       return this.selectItem ? this.selectItem[this.optLabelField] : this.value
     },
     selectStatus () {
-      return this.status || this.selectItem[this.optStatusField]
+      return this.status || (this.selectItem ? this.selectItem[this.optStatusField] : null)
     },
     optOptions () {
       return Object.assign({}, this.optionProps)
@@ -50,20 +51,47 @@ export default {
   &.is-underline {
     text-decoration: underline;
   }
-  &.status-primary {
-    color: $uni-color-primary;
-  }
-  &.status-success {
-    color: $uni-color-success;
-  }
-  &.status-info {
-    color: #909399;
-  }
-  &.status-warning {
-    color: $uni-color-warning;
+  &.is-round {
+    padding: 6rpx 16rpx;
+    border-radius: 10rpx;
+    font-size: 20rpx;
+    &.status-primary {
+      color: #ffffff;
+      background: $uni-color-primary;
+    }
+    &.status-success {
+      color: #ffffff;
+      background: $uni-color-success;
+    }
+    &.status-info {
+      color: #ffffff;
+      background: #909399;
+    }
+    &.status-warning {
+      color: #ffffff;
+      background: $uni-color-warning;
+    }
+    &.status-danger {
+      color: #ffffff;
+      background: $uni-color-error;
+    }
   }
-  &.status-danger {
-    color: $uni-color-error;
+  &:not(.is-round) {
+    &.status-primary {
+      color: $uni-color-primary;
+    }
+    &.status-success {
+      color: $uni-color-success;
+    }
+    &.status-info {
+      color: #909399;
+    }
+    &.status-warning {
+      color: $uni-color-warning;
+    }
+    &.status-danger {
+      color: $uni-color-error;
+    }
   }
 }
 </style>

package/components/ml-select-picker/ml-select-picker.vue

@@ -60,7 +60,7 @@ export default {
       return this.options || []
     },
     selectLabel () {
-      const item = this.optionList.find(item => item[this.optValueField] === this.value)
+      const item = this.optionList.find(item => String(item[this.optValueField]) === String(this.value))
       return item ? item[this.optLabelField] : this.value
     },
     optOptions () {

package/components/ml-status-tag/ml-status-tag.vue

@@ -30,9 +30,9 @@ export default {
 .ml-status-tag {
   display: inline-block;
   color: #ffffff;
-  padding: 6rpx 18rpx;
+  padding: 6rpx 16rpx;
   border-radius: 10rpx;
-  font-size: 24rpx;
+  font-size: 20rpx;
   &.status-primary {
     background: $uni-color-primary;
   }

package/modal/toast.js

@@ -5,7 +5,7 @@ const MaliToast = {
         title: option.content || '操作成功',
         icon: 'success',
         success () {
-          setTimeout(resolve, 1500)
+          setTimeout(resolve, 2000)
         }
       })
     })
@@ -16,7 +16,7 @@ const MaliToast = {
         title: option.content || '操作失败',
         icon: 'error',
         success () {
-          setTimeout(resolve, 1500)
+          setTimeout(resolve, 2000)
         }
       })
     })
@@ -25,7 +25,7 @@ const MaliToast = {
     return new Promise(resolve => {
       uni.hideToast({
         success () {
-          setTimeout(resolve, 1500)
+          setTimeout(resolve, 2000)
         }
       })
     })

package/package.json

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