mali-applet-ui 1.0.25 → 1.0.28

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

@@ -46,10 +46,11 @@ export default {
   $spans: 4.16667%, 8.33333%, 12.5%, 16.66667%, 20.83333%, 25%, 29.16667%, 33.33333%,
           37.5%, 41.66667%, 45.83333%, 50%, 54.16667%, 58.33333%, 62.5%, 66.66667%,
           70.83333%, 75%, 79.16667%, 83.33333%, 87.5%, 91.66667%, 95.83333%, 100%;
-  &.is-light {
-    color: rgba(0, 0, 0, 0.45);
-  }
+  // &.is-light {
+  //   color: rgba(0, 0, 0, 0.45);
+  // }
   &.is-important {
+    color: $ml-font-color;
     padding-bottom: 10rpx;
     font-size: $ml-base-font-size;
   }

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

@@ -121,50 +121,50 @@ export default {
     }
   }
   &.is-round {
-    padding: 8rpx 16rpx;
+    padding: 6rpx 20rpx;
     border-radius: $ml-border-radius;
-    font-size: 24rpx;
+    font-size: $ml-describe-font-size;
     &.ss-primary {
-      color: #ffffff;
-      background: $uni-color-primary;
+      color: $uni-color-primary;
+      background: #e0efff;
     }
     &.ss-success {
-      color: #ffffff;
-      background: $uni-color-success;
+      color: $uni-color-success;
+      background: #e0f5e8;
     }
     &.ss-info {
-      background: #909399;
+      background: #eaebed;
     }
     &.ss-warning {
       color: #ffffff;
       background: $uni-color-warning;
     }
     &.ss-danger {
-      color: #ffffff;
-      background: $uni-color-error;
+      color: $uni-color-error;
+      background: #ffeaec;
     }
     &.ss-gray {
       background: $ml-gray-color;
     }
     &.ss-blue {
-      color: #ffffff;
-      background: $ml-blue-color;
+      color: $ml-blue-color;
+      background: #e0efff;
     }
     &.ss-green {
-      color: #ffffff;
-      background: $ml-green-color;
+      color: $ml-green-color;
+      background: #e0f5e8;
     }
     &.ss-pink {
-      color: #ffffff;
-      background: $ml-pink-color;
+      color: $ml-pink-color;
+      background: #ffeaec;
     }
     &.ss-orange {
-      color: #ffffff;
-      background: $ml-orange-color;
+      color: $ml-orange-color;
+      background: #ffedd6;
     }
     &.ss-purple {
-      color: #ffffff;
-      background: $ml-purple-color;
+      color: $ml-purple-color;
+      background: #f2e9ff;
     }
   }
   &:not(.is-round) {

package/lib/components/ml-form-item/ml-form-item.vue

@@ -62,6 +62,9 @@ export default {
   },
   computed: {
     titleStyle () {
+      if (this.itemVertical) {
+        return ''
+      }
       return this.itemLabelWidth ? `width:${this.itemLabelWidth};` : ''
     },
     isFormBorder () {

package/lib/components/ml-list-item/ml-list-item.vue

@@ -188,6 +188,7 @@ export default {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    color: rgba(0, 0, 0, 0.45);
   }
   &.is-vertical {
     .ml-list-item-content {

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

@@ -132,7 +132,7 @@ export default {
 .ml-textarea {
   display: block;
   width: 100%;
-  padding: 20rpx 10rpx 10rpx 20rpx;
+  padding: 20rpx 10rpx 10rpx 10rpx;
   background: #fff;
   .ml-textarea-placeholder {
     color: $ml-input-color-placeholder;;

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

@@ -69,13 +69,45 @@ function normalizeChooseAndUploadFileRes (res, fileType) {
   return res
 }
 
+function compressImages (tempFiles) {
+  return Promise.all(
+    tempFiles.map(tempFilePath => {
+      return new Promise(resolve => {
+        uni.compressImage({
+          src: tempFilePath,
+          quality: this.imageQuality,
+          success (compressRes) {
+            resolve(compressRes.tempFilePath)
+          },
+          fail () {
+            resolve(tempFilePath)
+          }
+        })
+      })
+    })
+  )
+}
+
 function uploadImageFiles (opts) {
   return new Promise((resolve, reject) => {
     uni.chooseImage({
       count: opts.count || 9,
-      sourceType: opts.sourceType || ['album', 'camera'],
-      success (res) {
-        resolve(normalizeChooseAndUploadFileRes(res, 'image'))
+      sourceType: opts.sourceType,
+      // #ifdef MP-WEIXIN
+      sizeType: opts.sizeType,
+      // #endif
+      success (chooseRes) {
+        const rest = normalizeChooseAndUploadFileRes(chooseRes, 'image')
+        if (this.imageQuality) {
+          compressImages(rest.tempFiles).then((compressFiles) => {
+            resolve({
+              ...rest,
+              tempFiles: compressFiles
+            })
+          })
+        } else {
+          resolve(rest)
+        }
       },
       fail (res) {
         reject(res)
@@ -147,6 +179,15 @@ export default {
       type: Object,
       default: () => ({})
     },
+    imageQuality: Number,
+    sizeType: {
+      type: Array,
+      default: () => ['original', 'compressed']
+    },
+    sourceType: {
+      type: Array,
+      default: () => ['album', 'camera']
+    },
     getFileUrl: Function,
     getThumbnailUrl: Function,
     uploadFile: Function,
@@ -424,6 +465,8 @@ export default {
       }
       const uploadMethod = this.uploadFile ? this.uploadFile : (globalStore.upload ? globalStore.upload.uploadFile : null)
       chooseMethod({
+        sizeType: this.sizeType,
+        sourceType: this.sourceType,
         count: this.limit - this.fileList.length
       }).then(res => {
         const { tempFiles } = res

package/package.json

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

package/theme.scss

@@ -1,6 +1,9 @@
 // 页面宽度
 $ml-page-full-width: 100%;
 
+// 文字颜色
+$ml-font-color: rgba(0, 0, 0, 0.85);
+
 //  字体
 $ml-base-font-size: 34rpx;
 // 副标题体