zartui 2.0.79 → 2.0.80-beta.1

package/es/media-picker/index.js

@@ -1,19 +1,21 @@
 // Utils
-import { createNamespace, isDef, isPromise, noop } from '../utils';
+import { createNamespace, isDef, isPromise } from '../utils';
 import Icon from "../icon";
 import Loading from "../loading";
 import ZtImage from "../image";
 import ZtGridItem from "../grid-item";
 import ZtMediaPlayer from "../media-player";
 import ZtActionSheet from "../action-sheet";
-import ZtGrid from "../grid"; // Types
-
-import { MediaAddType, MediaType, Media, MediaUploadStatus } from "./type";
-import { checkWatermarkConfigSupported, CompressOptions, file2DataURL, ImageProcessor, ResizeOptions, WatermarkOptions } from "@egova/media"; // import components
+import ZtGrid from "../grid";
+// Types
+import { MediaAddType, MediaType, MediaUploadStatus } from "./type";
+import { checkWatermarkConfigSupported, CompressOptions, file2DataURL, ImageProcessor, ResizeOptions, WatermarkOptions } from "@egova/media";
 
+// import components
 import Toast from '../toast';
-import ImagePreview from "../image-preview"; // Images
+import ImagePreview from "../image-preview";
 
+// Images
 import TakePhotoIcon from "./image/TakePhotoIcon";
 import PickPhotoIcon from "./image/PickPhotoIcon";
 import TakeVideoIcon from "./image/TakeVideoIcon";
@@ -30,14 +32,13 @@ import DefaultPdfIcon from "./image/DefaultPdfIcon";
 import DefaultPptIcon from "./image/DefaultPptIcon";
 import DefaultTextIcon from "./image/DefaultTextIcon";
 import { FRAME_CONTAINER, CERTIFICATE_BACKGROUND, CERTIFICATE_BUTTON } from './image/Img64';
-import { getFileUniqueCode, getUniqueFileName, isAudioType, isImageType, isVideoType, isPdfType, isDocType, isTextType, isPptType, isExcelType } from "./media-util"; // 单个文件最大限制，单位为M（目前限制是100M）
+import { getFileUniqueCode, getUniqueFileName, isAudioType, isImageType, isVideoType, isPdfType, isDocType, isTextType, isPptType, isExcelType } from "./media-util";
 
+// 单个文件最大限制，单位为M（目前限制是100M）
 var FILE_SIZE_LIMIT = 100;
-
 var _createNamespace = createNamespace('media-picker'),
-    createComponent = _createNamespace[0],
-    bem = _createNamespace[1];
-
+  createComponent = _createNamespace[0],
+  bem = _createNamespace[1];
 export default createComponent({
   props: {
     disabled: Boolean,
@@ -70,7 +71,6 @@ export default createComponent({
       type: Number,
       default: FILE_SIZE_LIMIT * 1024
     },
-
     /**
      * {
      *  maxImageSideLength,
@@ -184,7 +184,6 @@ export default createComponent({
     },
     actionOptions: function actionOptions() {
       var _this = this;
-
       if (this.videoOptionsVisible) {
         return [{
           name: '拍摄',
@@ -217,24 +216,20 @@ export default createComponent({
       if (this.disabled) {
         return;
       }
-
       if (!this.checkFileCountBeforeAdd(mediaType)) {
         return;
       }
-
       if (this.mediaPickAction && this.mediaPickAction(mediaType, mediaAddType)) {
         return;
       }
-
       var _this$$refs = this.$refs,
-          cameraInput = _this$$refs.cameraInput,
-          imageInput = _this$$refs.imageInput,
-          camcorderInput = _this$$refs.camcorderInput,
-          videoFileInput = _this$$refs.videoFileInput,
-          audioRecorderInput = _this$$refs.audioRecorderInput,
-          audioFileInput = _this$$refs.audioFileInput,
-          fileInput = _this$$refs.fileInput;
-
+        cameraInput = _this$$refs.cameraInput,
+        imageInput = _this$$refs.imageInput,
+        camcorderInput = _this$$refs.camcorderInput,
+        videoFileInput = _this$$refs.videoFileInput,
+        audioRecorderInput = _this$$refs.audioRecorderInput,
+        audioFileInput = _this$$refs.audioFileInput,
+        fileInput = _this$$refs.fileInput;
       if (mediaType === MediaType.PHOTO) {
         if (mediaAddType === MediaAddType.TAKE) {
           this.triggerHiddenInput(cameraInput);
@@ -270,7 +265,6 @@ export default createComponent({
         ref.click();
       }
     },
-
     /**
      * 清空value，避免添加相同图片时 change 事件不触发：https://stackoverflow.com/a/54125788/1263423
      * @param mediaType
@@ -278,14 +272,13 @@ export default createComponent({
      */
     resetInput: function resetInput(mediaType, mediaAddType) {
       var _this$$refs2 = this.$refs,
-          cameraInput = _this$$refs2.cameraInput,
-          imageInput = _this$$refs2.imageInput,
-          camcorderInput = _this$$refs2.camcorderInput,
-          videoFileInput = _this$$refs2.videoFileInput,
-          audioRecorderInput = _this$$refs2.audioRecorderInput,
-          audioFileInput = _this$$refs2.audioFileInput,
-          fileInput = _this$$refs2.fileInput;
-
+        cameraInput = _this$$refs2.cameraInput,
+        imageInput = _this$$refs2.imageInput,
+        camcorderInput = _this$$refs2.camcorderInput,
+        videoFileInput = _this$$refs2.videoFileInput,
+        audioRecorderInput = _this$$refs2.audioRecorderInput,
+        audioFileInput = _this$$refs2.audioFileInput,
+        fileInput = _this$$refs2.fileInput;
       if (mediaType === MediaType.PHOTO) {
         if (mediaAddType === MediaAddType.TAKE) {
           cameraInput.value = '';
@@ -310,34 +303,25 @@ export default createComponent({
     },
     handleInputFiles: function handleInputFiles(event) {
       var _this2 = this;
-
       var files = event.target.files;
-
       if (!files || files.length === 0) {
         return;
       }
-
       if (this.pickerMode === "certificate") {
         files = [files[0]];
       }
-
       files = this.filterValidFiles(files);
-
       if (files.length === 0) {
         return;
       }
-
       if (!this.checkFileCountAfterAdd(files)) {
         return;
       }
-
       if (this.beforeRead) {
         var response = this.beforeRead(files);
-
         if (!response) {
           return;
         }
-
         if (isPromise(response)) {
           response.then(function (data) {
             if (data) {
@@ -349,12 +333,10 @@ export default createComponent({
           return;
         }
       }
-
       this.readFiles(files);
     },
     readFiles: function readFiles(files) {
       var _this3 = this;
-
       // 处理非图片
       var notImages = files.filter(function (f) {
         return !isImageType(f);
@@ -362,23 +344,19 @@ export default createComponent({
         return _this3.transformNotImageFile(f);
       });
       var newMedias = [];
-
       if (notImages.length > 0) {
         newMedias = newMedias.concat(notImages);
-      } // 处理图片并合并
-
-
+      }
+      // 处理图片并合并
       var imageFiles = files.filter(function (f) {
         return isImageType(f);
       });
       var promise;
-
       if (imageFiles.length === 0) {
         promise = Promise.resolve();
       } else {
         promise = this.transformImageFiles(imageFiles);
       }
-
       promise.then(function (medias) {
         if (medias && medias.length > 0) {
           newMedias = newMedias.concat(medias);
@@ -389,13 +367,11 @@ export default createComponent({
         } else {
           _this3.$emit('input', [].concat(_this3.mediaList, newMedias));
         }
-
         if (_this3.afterRead) {
           _this3.afterRead(newMedias);
         }
       });
     },
-
     /**
      * 选择多媒体前进行数量检查
      */
@@ -404,31 +380,26 @@ export default createComponent({
         Toast.fail("\u5DF2\u8FBE\u5230\u6587\u4EF6\u6700\u5927\u6570\u91CF\u9650\u5236");
         return false;
       }
-
       if (mediaType === MediaType.PHOTO && this.mediaList.filter(function (media) {
         return media.type === MediaType.PHOTO;
       }).length > this.maxImageCount) {
         Toast.fail("\u5DF2\u8FBE\u5230\u56FE\u7247\u6700\u5927\u6570\u91CF\u9650\u5236");
         return false;
       }
-
       if (mediaType === MediaType.VIDEO && this.mediaList.filter(function (media) {
         return media.type === MediaType.VIDEO;
       }).length > this.maxVideoCount) {
         Toast.fail("\u5DF2\u8FBE\u5230\u89C6\u9891\u6700\u5927\u6570\u91CF\u9650\u5236");
         return false;
       }
-
       if (mediaType === MediaType.AUDIO && this.mediaList.filter(function (media) {
         return media.type === MediaType.AUDIO;
       }).length > this.maxAudioCount) {
         Toast.fail("\u5DF2\u8FBE\u5230\u5F55\u97F3\u6700\u5927\u6570\u91CF\u9650\u5236");
         return false;
       }
-
       return true;
     },
-
     /**
      * 选择多媒体后进行数量检查
      */
@@ -437,7 +408,6 @@ export default createComponent({
         Toast.fail("\u6700\u591A\u53EA\u80FD\u4E0A\u4F20" + this.maxMediaCount + "\u4E2A\u6587\u4EF6");
         return false;
       }
-
       if (this.mediaList.filter(function (media) {
         return media.type === MediaType.PHOTO;
       }).length + files.filter(function (media) {
@@ -446,7 +416,6 @@ export default createComponent({
         Toast.fail("\u6700\u591A\u53EA\u80FD\u4E0A\u4F20" + this.maxImageCount + "\u5F20\u56FE\u7247");
         return false;
       }
-
       if (this.mediaList.filter(function (media) {
         return media.type === MediaType.VIDEO;
       }).length + files.filter(function (media) {
@@ -455,7 +424,6 @@ export default createComponent({
         Toast.fail("\u6700\u591A\u53EA\u80FD\u4E0A\u4F20" + this.maxVideoCount + "\u4E2A\u89C6\u9891");
         return false;
       }
-
       if (this.mediaList.filter(function (media) {
         return media.type === MediaType.AUDIO;
       }).length + files.filter(function (media) {
@@ -464,31 +432,24 @@ export default createComponent({
         Toast.fail("\u6700\u591A\u53EA\u80FD\u4E0A\u4F20" + this.maxAudioCount + "\u4E2A\u5F55\u97F3");
         return false;
       }
-
       return true;
     },
     filterValidFiles: function filterValidFiles(files) {
       var validFiles = [];
-
       for (var i = 0; i < files.length; i++) {
         var file = files[i];
-
         if (file.size > this.maxFileSize * 1024) {
           Toast.fail("\u8BF7\u52FF\u6DFB\u52A0\u5927\u4E8E" + this.maxFileSize + "K\u7684\u6587\u4EF6");
           return validFiles;
         }
-
         if (this.checkFileExist(file)) {
           Toast.fail('请勿重复添加文件');
           return validFiles;
         }
-
         validFiles.push(file);
       }
-
       return validFiles;
     },
-
     /**
      * 转换图片文件，压缩、加水印，返回Media格式的图片
      * @param files 图片文件
@@ -496,16 +457,13 @@ export default createComponent({
      */
     transformImageFiles: function transformImageFiles(files) {
       var _this4 = this;
-
       var promisesTodo = [];
       var resizeOptions = new ResizeOptions(this.maxImageSideLength);
       var compressOptions = new CompressOptions(this.maxImageFileSize);
-
       var _loop = function _loop(i) {
         var file = files[i];
         var watermarkEnabled = _this4.watermarkOptions && _this4.watermarkOptions.watermarkConfigString && checkWatermarkConfigSupported(_this4.watermarkOptions.watermarkConfigString);
         var watermarkOpt = void 0;
-
         if (watermarkEnabled) {
           watermarkOpt = new WatermarkOptions({
             enabled: true,
@@ -524,12 +482,10 @@ export default createComponent({
             enabled: false
           });
         }
-
         var promise = new ImageProcessor(file, resizeOptions, watermarkOpt, compressOptions).process().then(function (f) {
           if (!f) {
             return Promise.resolve();
           }
-
           return file2DataURL(f).then(function (base64) {
             var uniqueFileName = getUniqueFileName(f, 'jpg');
             return Promise.resolve({
@@ -553,17 +509,14 @@ export default createComponent({
               originalName: file.name,
               // 原始名称
               originalSize: file.size // 原始大小
-
             });
           });
         });
         promisesTodo.push(promise);
       };
-
       for (var i = 0; i < files.length; i++) {
         _loop(i);
       }
-
       Toast.loading({
         message: '处理中...',
         forbidClick: true,
@@ -577,7 +530,6 @@ export default createComponent({
         Toast.clear();
       });
     },
-
     /**
      * 转换非图片文件
      * @param {File} f 非图片文件
@@ -587,7 +539,6 @@ export default createComponent({
       console.warn("type", f.type);
       var suffix = '';
       var type = MediaType.FILE;
-
       if (isAudioType(f)) {
         type = MediaType.AUDIO;
         suffix = 'mp3';
@@ -607,7 +558,6 @@ export default createComponent({
       } else {
         type = MediaType.FILE;
       }
-
       var uniqueFileName = getUniqueFileName(f, suffix);
       return {
         type: type,
@@ -623,7 +573,6 @@ export default createComponent({
         message: ''
       };
     },
-
     /**
      * 检查文件是否重复添加
      */
@@ -632,7 +581,6 @@ export default createComponent({
         return media.uniqueCode === getFileUniqueCode(file);
       });
     },
-
     /**
      * 点击预览
      */
@@ -640,7 +588,6 @@ export default createComponent({
       if (this.preview && this.preview(media, index)) {
         return;
       }
-
       if (media.type === MediaType.PHOTO) {
         var imageIndex = this.imageList.indexOf(media);
         ImagePreview({
@@ -657,8 +604,8 @@ export default createComponent({
           Toast('文件参数缺失');
         } else {
           this.mediaTypeToPlay = media.type;
-          this.mediaUrlToPlay = media.url || (URL || webkitURL).createObjectURL(media.file); // this.mediaUrlToPlay = 'http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4'
-
+          this.mediaUrlToPlay = media.url || (URL || webkitURL).createObjectURL(media.file);
+          // this.mediaUrlToPlay = 'http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4'
           this.mediaPlayerVisible = true;
         }
       } else {
@@ -667,14 +614,11 @@ export default createComponent({
     },
     onDelete: function onDelete(media, index) {
       var _this5 = this;
-
       if (this.beforeDelete) {
         var response = this.beforeDelete(media);
-
         if (!response) {
           return;
         }
-
         if (isPromise(response)) {
           response.then(function () {
             _this5.deleteMedia(media, index);
@@ -682,7 +626,6 @@ export default createComponent({
           return;
         }
       }
-
       this.deleteMedia(media, index);
     },
     deleteMedia: function deleteMedia(media, index) {
@@ -693,7 +636,6 @@ export default createComponent({
     },
     hiddenInput: function hiddenInput() {
       var _this6 = this;
-
       var h = this.$createElement;
       return [h("input", {
         "attrs": {
@@ -795,9 +737,7 @@ export default createComponent({
     },
     renderIcon: function renderIcon(mediaType, mediaAddType) {
       var _this7 = this;
-
       var h = this.$createElement;
-
       if (mediaType === MediaType.PHOTO) {
         if (mediaAddType === MediaAddType.TAKE) {
           return h(TakePhotoIcon, {
@@ -850,7 +790,6 @@ export default createComponent({
     renderButton: function renderButton(mediaType, mediaAddType) {
       var h = this.$createElement;
       var label = '';
-
       if (mediaType === MediaType.PHOTO) {
         if (mediaAddType === MediaAddType.TAKE) {
           label = '拍照';
@@ -864,7 +803,6 @@ export default createComponent({
       } else if (mediaType === MediaType.FILE) {
         label = '文档';
       }
-
       return h("div", {
         "class": bem('box')
       }, [this.renderIcon(mediaType, mediaAddType), h("div", {
@@ -873,9 +811,7 @@ export default createComponent({
     },
     renderCertificates: function renderCertificates() {
       var _this8 = this;
-
       var h = this.$createElement;
-
       if (this.mediaList && this.mediaList.length) {
         var media = this.mediaList[0];
         var showDelete = media.deletable && media.status !== MediaUploadStatus.UPLOADING;
@@ -884,9 +820,7 @@ export default createComponent({
           "on": {
             "click": function click(event) {
               event.stopPropagation();
-
               _this8.onDelete(media, 0);
-
               _this8.mediaPick(MediaType.PHOTO, MediaAddType.PICK);
             }
           }
@@ -903,8 +837,8 @@ export default createComponent({
           },
           "on": {
             "click": function click(event) {
-              event.stopPropagation(); // 证件照模式只有一张图片
-
+              event.stopPropagation();
+              // 证件照模式只有一张图片
               _this8.previewMedia(media, 0);
             }
           }
@@ -932,50 +866,39 @@ export default createComponent({
     },
     renderButtons: function renderButtons() {
       var buttons = [];
-
       if (this.allowTakePhoto) {
         buttons.push(this.renderButton(MediaType.PHOTO, MediaAddType.TAKE));
       }
-
       if (this.allowPickPhoto) {
         buttons.push(this.renderButton(MediaType.PHOTO, MediaAddType.PICK));
       }
-
       if (this.allowTakeVideo || this.allowPickVideo) {
         var addType = MediaAddType.TAKE_AND_PICK;
-
         if (!this.allowTakeVideo) {
           addType = MediaAddType.PICK;
         } else if (!this.allowPickVideo) {
           addType = MediaAddType.TAKE;
         }
-
         buttons.push(this.renderButton(MediaType.VIDEO, addType));
       }
-
       if (this.allowTakeAudio || this.allowPickAudio) {
         var _addType = MediaAddType.TAKE_AND_PICK;
-
         if (!this.allowTakeAudio) {
           _addType = MediaAddType.PICK;
         } else if (!this.allowPickAudio) {
           _addType = MediaAddType.TAKE;
         }
-
         buttons.push(this.renderButton(MediaType.AUDIO, _addType));
       }
-
       if (this.allowPickFile) {
         buttons.push(this.renderButton(MediaType.FILE, MediaAddType.PICK));
       }
-
       return buttons;
     },
     genThumbnailMask: function genThumbnailMask(media) {
       var h = this.$createElement;
       var status = media.status,
-          message = media.message;
-
+        message = media.message;
       if (status === MediaUploadStatus.UPLOADING || status === MediaUploadStatus.FAILED) {
         var MaskIcon = status === MediaUploadStatus.FAILED ? h(Icon, {
           "attrs": {
@@ -995,7 +918,6 @@ export default createComponent({
     },
     renderMediaBox: function renderMediaBox(media) {
       var h = this.$createElement;
-
       if (!this.showFileName) {
         return this.renderMediaThumbnail(media);
       } else {
@@ -1006,13 +928,11 @@ export default createComponent({
         }, [media.name || media.fileName])]);
       }
     },
-
     /**
      * 多媒体对应展示的缩略图
      */
     renderMediaThumbnail: function renderMediaThumbnail(media) {
       var h = this.$createElement;
-
       if (media.showSrc) {
         return h(ZtImage, {
           "attrs": {
@@ -1057,7 +977,6 @@ export default createComponent({
     },
     renderMediaList: function renderMediaList() {
       var _this9 = this;
-
       var h = this.$createElement;
       return this.mediaList.map(function (media, index) {
         var showDelete = media.deletable && media.status !== MediaUploadStatus.UPLOADING;
@@ -1066,7 +985,6 @@ export default createComponent({
           "on": {
             "click": function click(event) {
               event.stopPropagation();
-
               _this9.onDelete(media, index);
             }
           }
@@ -1076,7 +994,6 @@ export default createComponent({
           "on": {
             "click": function click(event) {
               event.stopPropagation();
-
               _this9.previewMedia(media, index);
             }
           }
@@ -1090,7 +1007,6 @@ export default createComponent({
   },
   render: function render() {
     var _this10 = this;
-
     var h = arguments[0];
     var title = this.showTitle && h("div", {
       "class": bem('title')

package/es/media-picker/media-util.js

@@ -22,30 +22,27 @@ export function isPptType(file) {
 export function isExcelType(file) {
   return file.type.indexOf('.sheet') >= 0;
 }
+
 /**
  * 文件唯一标识
  */
-
 export function getFileUniqueCode(file) {
   return file.name + "_" + file.type + "_" + file.size + "_" + file.lastModified;
 }
+
 /**
  * 生成不重复的文件名
  * @param {File} file 原始文件
  * @param {string} suffix 指定文件名后缀
  */
-
 export function getUniqueFileName(file, suffix) {
   if (suffix === void 0) {
     suffix = '';
   }
-
   var dotIndex = file.name.lastIndexOf('.');
-
   if (dotIndex > 0) {
     suffix = file.name.substring(dotIndex + 1);
   }
-
   var now = new Date();
   var name = "" + now.getFullYear() + now.getMonth() + now.getDay() + now.getHours() + now.getMinutes() + now.getSeconds() + now.getMilliseconds() + "_" + Math.ceil(Math.random() * 10000);
   return suffix ? name + '.' + suffix : name;

package/es/media-picker/type.js

@@ -1,13 +1,10 @@
 export var MediaUploadStatus;
-
 (function (MediaUploadStatus) {
   MediaUploadStatus["UPLOADING"] = "uploading";
   MediaUploadStatus["DONE"] = "done";
   MediaUploadStatus["FAILED"] = "failed";
 })(MediaUploadStatus || (MediaUploadStatus = {}));
-
 export var MediaType;
-
 (function (MediaType) {
   MediaType["PHOTO"] = "photo";
   MediaType["AUDIO"] = "audio";
@@ -19,9 +16,7 @@ export var MediaType;
   MediaType["PPT"] = "ppt";
   MediaType["EXCEL"] = "excel";
 })(MediaType || (MediaType = {}));
-
 export var MediaAddType;
-
 (function (MediaAddType) {
   MediaAddType["TAKE"] = "take";
   MediaAddType["PICK"] = "pick";