zartui 2.0.83 → 2.0.85

package/lib/media-picker/index.js

@@ -63,6 +63,10 @@ var _Img = require("./image/Img64");
 
 var _mediaUtil = require("./media-util");
 
+var _device = require("../utils/device");
+
+var _wxUtil = require("./wx-util");
+
 // Utils
 // Types
 // import components
@@ -197,6 +201,10 @@ var _default2 = createComponent({
     reUploadText: {
       type: String,
       default: '重新拍摄'
+    },
+    useWx: {
+      type: Boolean,
+      default: false
     }
   },
   model: {
@@ -250,6 +258,8 @@ var _default2 = createComponent({
   },
   methods: {
     mediaPick: function mediaPick(mediaType, mediaAddType) {
+      var _this2 = this;
+
       if (this.disabled) {
         return;
       }
@@ -272,10 +282,17 @@ var _default2 = createComponent({
           fileInput = _this$$refs.fileInput;
 
       if (mediaType === _type.MediaType.PHOTO) {
-        if (mediaAddType === _type.MediaAddType.TAKE) {
-          this.triggerHiddenInput(cameraInput);
-        } else if (mediaAddType === _type.MediaAddType.PICK) {
-          this.triggerHiddenInput(imageInput);
+        if (this.useWx && (0, _device.isWeixin)() && window.wx) {
+          var type = mediaAddType === _type.MediaAddType.TAKE ? 'camera' : 'album';
+          (0, _wxUtil.wxUploadImage)(type).then(function (newMedias) {
+            _this2.$emit('input', [].concat(_this2.mediaList, newMedias));
+          });
+        } else {
+          if (mediaAddType === _type.MediaAddType.TAKE) {
+            this.triggerHiddenInput(cameraInput);
+          } else if (mediaAddType === _type.MediaAddType.PICK) {
+            this.triggerHiddenInput(imageInput);
+          }
         }
       } else if (mediaType === _type.MediaType.VIDEO) {
         if (mediaAddType === _type.MediaAddType.TAKE) {
@@ -345,7 +362,7 @@ var _default2 = createComponent({
       }
     },
     handleInputFiles: function handleInputFiles(event) {
-      var _this2 = this;
+      var _this3 = this;
 
       var files = event.target.files;
 
@@ -377,9 +394,9 @@ var _default2 = createComponent({
         if ((0, _utils.isPromise)(response)) {
           response.then(function (data) {
             if (data) {
-              _this2.readFiles(data);
+              _this3.readFiles(data);
             } else {
-              _this2.readFiles(files);
+              _this3.readFiles(files);
             }
           });
           return;
@@ -389,13 +406,13 @@ var _default2 = createComponent({
       this.readFiles(files);
     },
     readFiles: function readFiles(files) {
-      var _this3 = this;
+      var _this4 = this;
 
       // 处理非图片
       var notImages = files.filter(function (f) {
         return !(0, _mediaUtil.isImageType)(f);
       }).map(function (f) {
-        return _this3.transformNotImageFile(f);
+        return _this4.transformNotImageFile(f);
       });
       var newMedias = [];
 
@@ -420,14 +437,14 @@ var _default2 = createComponent({
           newMedias = newMedias.concat(medias);
         }
       }).finally(function () {
-        if (_this3.pickerMode === "certificate") {
-          _this3.$emit('input', [].concat(newMedias));
+        if (_this4.pickerMode === "certificate") {
+          _this4.$emit('input', [].concat(newMedias));
         } else {
-          _this3.$emit('input', [].concat(_this3.mediaList, newMedias));
+          _this4.$emit('input', [].concat(_this4.mediaList, newMedias));
         }
 
-        if (_this3.afterRead) {
-          _this3.afterRead(newMedias);
+        if (_this4.afterRead) {
+          _this4.afterRead(newMedias);
         }
       });
     },
@@ -541,7 +558,7 @@ var _default2 = createComponent({
      * @return {Promise<[Media]>}
      */
     transformImageFiles: function transformImageFiles(files) {
-      var _this4 = this;
+      var _this5 = this;
 
       var promisesTodo = [];
       var resizeOptions = new _media.ResizeOptions(this.maxImageSideLength);
@@ -549,19 +566,19 @@ var _default2 = createComponent({
 
       var _loop = function _loop(i) {
         var file = files[i];
-        var watermarkEnabled = _this4.watermarkOptions && _this4.watermarkOptions.watermarkConfigString && (0, _media.checkWatermarkConfigSupported)(_this4.watermarkOptions.watermarkConfigString);
+        var watermarkEnabled = _this5.watermarkOptions && _this5.watermarkOptions.watermarkConfigString && (0, _media.checkWatermarkConfigSupported)(_this5.watermarkOptions.watermarkConfigString);
         var watermarkOpt = void 0;
 
         if (watermarkEnabled) {
           watermarkOpt = new _media.WatermarkOptions({
             enabled: true,
-            watermarkConfigString: watermarkEnabled ? _this4.watermarkOptions.watermarkConfigString : '',
+            watermarkConfigString: watermarkEnabled ? _this5.watermarkOptions.watermarkConfigString : '',
             context: {
-              address: _this4.watermarkOptions.address || "",
-              humanName: _this4.watermarkOptions.humanName || _this4.watermarkOptions.humanname || "",
-              projectName: _this4.watermarkOptions.projectName || "",
-              logo: _this4.watermarkOptions.logo || "",
-              applicationName: _this4.watermarkOptions.applicationName || "",
+              address: _this5.watermarkOptions.address || "",
+              humanName: _this5.watermarkOptions.humanName || _this5.watermarkOptions.humanname || "",
+              projectName: _this5.watermarkOptions.projectName || "",
+              logo: _this5.watermarkOptions.logo || "",
+              applicationName: _this5.watermarkOptions.applicationName || "",
               watermarkTime: new Date()
             }
           });
@@ -713,7 +730,7 @@ var _default2 = createComponent({
       }
     },
     onDelete: function onDelete(media, index) {
-      var _this5 = this;
+      var _this6 = this;
 
       if (this.beforeDelete) {
         var response = this.beforeDelete(media);
@@ -724,7 +741,7 @@ var _default2 = createComponent({
 
         if ((0, _utils.isPromise)(response)) {
           response.then(function () {
-            _this5.deleteMedia(media, index);
+            _this6.deleteMedia(media, index);
           });
           return;
         }
@@ -739,7 +756,7 @@ var _default2 = createComponent({
       this.$emit('delete', media, index);
     },
     hiddenInput: function hiddenInput() {
-      var _this6 = this;
+      var _this7 = this;
 
       var h = this.$createElement;
       return [h("input", {
@@ -753,7 +770,7 @@ var _default2 = createComponent({
         "on": {
           "change": this.handleInputFiles,
           "click": function click() {
-            return _this6.resetInput(_type.MediaType.PHOTO, _type.MediaAddType.TAKE);
+            return _this7.resetInput(_type.MediaType.PHOTO, _type.MediaAddType.TAKE);
           }
         },
         "class": bem('hidden')
@@ -767,7 +784,7 @@ var _default2 = createComponent({
         "on": {
           "change": this.handleInputFiles,
           "click": function click() {
-            return _this6.resetInput(_type.MediaType.PHOTO, _type.MediaAddType.PICK);
+            return _this7.resetInput(_type.MediaType.PHOTO, _type.MediaAddType.PICK);
           }
         },
         "class": bem('hidden')
@@ -781,7 +798,7 @@ var _default2 = createComponent({
         "on": {
           "change": this.handleInputFiles,
           "click": function click() {
-            return _this6.resetInput(_type.MediaType.VIDEO, _type.MediaAddType.TAKE);
+            return _this7.resetInput(_type.MediaType.VIDEO, _type.MediaAddType.TAKE);
           }
         },
         "class": bem('hidden')
@@ -794,7 +811,7 @@ var _default2 = createComponent({
         "on": {
           "change": this.handleInputFiles,
           "click": function click() {
-            return _this6.resetInput(_type.MediaType.VIDEO, _type.MediaAddType.PICK);
+            return _this7.resetInput(_type.MediaType.VIDEO, _type.MediaAddType.PICK);
           }
         },
         "class": bem('hidden')
@@ -808,7 +825,7 @@ var _default2 = createComponent({
         "on": {
           "change": this.handleInputFiles,
           "click": function click() {
-            return _this6.resetInput(_type.MediaType.AUDIO, _type.MediaAddType.TAKE);
+            return _this7.resetInput(_type.MediaType.AUDIO, _type.MediaAddType.TAKE);
           }
         },
         "class": bem('hidden')
@@ -821,7 +838,7 @@ var _default2 = createComponent({
         "on": {
           "change": this.handleInputFiles,
           "click": function click() {
-            return _this6.resetInput(_type.MediaType.AUDIO, _type.MediaAddType.PICK);
+            return _this7.resetInput(_type.MediaType.AUDIO, _type.MediaAddType.PICK);
           }
         },
         "class": bem('hidden')
@@ -834,14 +851,14 @@ var _default2 = createComponent({
         "on": {
           "change": this.handleInputFiles,
           "click": function click() {
-            return _this6.resetInput(_type.MediaType.FILE, _type.MediaAddType.PICK);
+            return _this7.resetInput(_type.MediaType.FILE, _type.MediaAddType.PICK);
           }
         },
         "class": bem('hidden')
       })];
     },
     renderIcon: function renderIcon(mediaType, mediaAddType) {
-      var _this7 = this;
+      var _this8 = this;
 
       var h = this.$createElement;
 
@@ -851,7 +868,7 @@ var _default2 = createComponent({
             "class": bem('button'),
             "on": {
               "click": function click() {
-                return _this7.mediaPick(mediaType, mediaAddType);
+                return _this8.mediaPick(mediaType, mediaAddType);
               }
             }
           });
@@ -860,7 +877,7 @@ var _default2 = createComponent({
             "class": bem('button'),
             "on": {
               "click": function click() {
-                return _this7.mediaPick(mediaType, mediaAddType);
+                return _this8.mediaPick(mediaType, mediaAddType);
               }
             }
           });
@@ -870,7 +887,7 @@ var _default2 = createComponent({
           "class": bem('button'),
           "on": {
             "click": function click() {
-              return _this7.mediaPick(mediaType, mediaAddType);
+              return _this8.mediaPick(mediaType, mediaAddType);
             }
           }
         });
@@ -879,7 +896,7 @@ var _default2 = createComponent({
           "class": bem('button'),
           "on": {
             "click": function click() {
-              return _this7.mediaPick(mediaType, mediaAddType);
+              return _this8.mediaPick(mediaType, mediaAddType);
             }
           }
         });
@@ -888,7 +905,7 @@ var _default2 = createComponent({
           "class": bem('button'),
           "on": {
             "click": function click() {
-              return _this7.mediaPick(mediaType, mediaAddType);
+              return _this8.mediaPick(mediaType, mediaAddType);
             }
           }
         });
@@ -919,7 +936,7 @@ var _default2 = createComponent({
       }, [label])]);
     },
     renderCertificates: function renderCertificates() {
-      var _this8 = this;
+      var _this9 = this;
 
       var h = this.$createElement;
 
@@ -932,9 +949,9 @@ var _default2 = createComponent({
             "click": function click(event) {
               event.stopPropagation();
 
-              _this8.onDelete(media, 0);
+              _this9.onDelete(media, 0);
 
-              _this8.mediaPick(_type.MediaType.PHOTO, _type.MediaAddType.PICK);
+              _this9.mediaPick(_type.MediaType.PHOTO, _type.MediaAddType.PICK);
             }
           }
         }, [h(_ReUpload.default, {
@@ -952,7 +969,7 @@ var _default2 = createComponent({
             "click": function click(event) {
               event.stopPropagation(); // 证件照模式只有一张图片
 
-              _this8.previewMedia(media, 0);
+              _this9.previewMedia(media, 0);
             }
           }
         }, [reUpload]);
@@ -969,7 +986,7 @@ var _default2 = createComponent({
           },
           "on": {
             "click": function click() {
-              _this8.mediaPick(_type.MediaType.PHOTO, _type.MediaAddType.PICK);
+              _this9.mediaPick(_type.MediaType.PHOTO, _type.MediaAddType.PICK);
             }
           }
         }), h("span", {
@@ -1103,7 +1120,7 @@ var _default2 = createComponent({
       }
     },
     renderMediaList: function renderMediaList() {
-      var _this9 = this;
+      var _this10 = this;
 
       var h = this.$createElement;
       return this.mediaList.map(function (media, index) {
@@ -1114,7 +1131,7 @@ var _default2 = createComponent({
             "click": function click(event) {
               event.stopPropagation();
 
-              _this9.onDelete(media, index);
+              _this10.onDelete(media, index);
             }
           }
         });
@@ -1124,10 +1141,10 @@ var _default2 = createComponent({
             "click": function click(event) {
               event.stopPropagation();
 
-              _this9.previewMedia(media, index);
+              _this10.previewMedia(media, index);
             }
           }
-        }, [_this9.renderMediaBox(media), _this9.genThumbnailMask(media), deleteIcon]);
+        }, [_this10.renderMediaBox(media), _this10.genThumbnailMask(media), deleteIcon]);
       });
     },
     selectAction: function selectAction(action) {
@@ -1136,7 +1153,7 @@ var _default2 = createComponent({
     }
   },
   render: function render() {
-    var _this10 = this;
+    var _this11 = this;
 
     var h = arguments[0];
     var title = this.showTitle && h("div", {
@@ -1150,9 +1167,9 @@ var _default2 = createComponent({
         "mediaUrl": this.mediaUrlToPlay
       },
       "model": {
-        value: _this10.mediaPlayerVisible,
+        value: _this11.mediaPlayerVisible,
         callback: function callback($$v) {
-          _this10.mediaPlayerVisible = $$v;
+          _this11.mediaPlayerVisible = $$v;
         }
       }
     }), h(_actionSheet.default, {
@@ -1166,9 +1183,9 @@ var _default2 = createComponent({
         "select": this.selectAction
       },
       "model": {
-        value: _this10.actionVisible,
+        value: _this11.actionVisible,
         callback: function callback($$v) {
-          _this10.actionVisible = $$v;
+          _this11.actionVisible = $$v;
         }
       }
     }), this.pickerMode === "certificate" ? h("div", {

package/lib/media-picker/wx-util.js

@@ -0,0 +1,78 @@
+"use strict";
+
+exports.__esModule = true;
+exports.wxUploadImage = exports.uploadImage = exports.chooseImage = void 0;
+
+var _type = require("./type");
+
+var chooseImage = function chooseImage(type) {
+  return new Promise(function (resolve, reject) {
+    window.wx.chooseImage({
+      count: 1,
+      sizeType: ['original', 'compressed'],
+      // 可以指定是原图还是压缩图，默认二者都有
+      sourceType: [type],
+      // 可以指定来源是相册还是相机，默认二者都有
+      success: function success(_ref) {
+        var localIds = _ref.localIds;
+        resolve(localIds);
+      },
+      fail: function fail(res) {
+        reject(res);
+      }
+    });
+  });
+};
+
+exports.chooseImage = chooseImage;
+
+var uploadImage = function uploadImage(localId) {
+  return new Promise(function (resolve, reject) {
+    window.wx.uploadImage({
+      localId: localId,
+      // 需要上传的图片的本地ID，由chooseImage接口获得
+      isShowProgressTips: 1,
+      // 默认为1，显示进度提示
+      success: function success(_ref2) {
+        var serverId = _ref2.serverId;
+        resolve(serverId);
+      },
+      fail: function fail(res) {
+        reject(res);
+      }
+    });
+  });
+};
+
+exports.uploadImage = uploadImage;
+
+var wxUploadImage = function wxUploadImage(type) {
+  return new Promise(function (resolve) {
+    var newMedias = [];
+    chooseImage(type).then(function (localIds) {
+      var time = new Date().getTime().toString();
+      var media = {
+        type: _type.MediaType.PHOTO,
+        uniqueCode: time,
+        fileSize: 0,
+        lastModified: 0,
+        deletable: true,
+        status: _type.MediaUploadStatus.DONE
+      };
+      localIds.forEach(function (localId) {
+        media.showSrc = localId;
+        media.url = localId;
+        uploadImage(localId).then(function (serverId) {
+          media.wxServerId = serverId;
+          newMedias.push(media);
+
+          if (newMedias.length === localIds.length) {
+            resolve(newMedias);
+          }
+        });
+      });
+    });
+  });
+};
+
+exports.wxUploadImage = wxUploadImage;