cbvirtua 1.0.100 → 1.0.102

package/dist/uploader/index.wxml

@@ -0,0 +1,85 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
+
+<view class="van-uploader">
+  <view class="van-uploader__wrapper">
+    <!-- 预览样式 -->
+    <view
+      wx:if="{{ previewImage }}"
+      wx:for="{{ lists }}"
+      wx:key="index"
+      class="van-uploader__preview"
+      data-index="{{ index }}"
+      bindtap="onClickPreview"
+    >
+      <image
+        wx:if="{{ item.isImage }}"
+        mode="{{ imageFit }}"
+        src="{{ item.thumb || item.url }}"
+        alt="{{ item.name || ('图片' + index) }}"
+        class="van-uploader__preview-image"
+        style="{{ computed.sizeStyle({ previewSize }) }}"
+        data-index="{{ index }}"
+        bindtap="onPreviewImage"
+      />
+      <video
+        wx:elif="{{ item.isVideo }}"
+        src="{{ item.url }}"
+        title="{{ item.name || ('视频' + index) }}"
+        poster="{{ item.thumb }}"
+        autoplay="{{ item.autoplay }}"
+        object-fit="{{videoFit}}"
+        referrer-policy="{{ referrerPolicy }}"
+        class="van-uploader__preview-image"
+        style="{{ computed.sizeStyle({ previewSize }) }}"
+        data-index="{{ index }}"
+        bindtap="onPreviewVideo"
+      >
+      </video>
+      <view
+        wx:else
+        class="van-uploader__file"
+        style="{{ computed.sizeStyle({ previewSize }) }}"
+        data-index="{{ index }}"
+        bindtap="onPreviewFile"
+      >
+        <van-icon name="description" class="van-uploader__file-icon" />
+        <view class="van-uploader__file-name van-ellipsis">{{ item.name || item.url }}</view>
+      </view>
+      <view
+        wx:if="{{ item.status === 'uploading' || item.status === 'failed' }}"
+        class="van-uploader__mask"
+      >
+       <van-icon wx:if="{{ item.status === 'failed' }}" name="close" class="van-uploader__mask-icon" />
+       <van-loading wx:else custom-class="van-uploader__loading" />
+       <text wx:if="{{ item.message }}" class="van-uploader__mask-message">{{ item.message }}</text>
+      </view>
+      <view
+        wx:if="{{ deletable && item.deletable }}"
+        data-index="{{ index }}"
+        class="van-uploader__preview-delete"
+        catch:tap="deleteItem"
+      >
+        <van-icon name="cross" class="van-uploader__preview-delete-icon" />
+      </view>
+    </view>
+
+    <!-- 上传样式 -->
+    <block wx:if="{{ isInCount }}">
+      <view class="van-uploader__slot" bindtap="startUpload">
+        <slot />
+      </view>
+
+      <!-- 默认上传样式 -->
+      <view
+        wx:if="{{ showUpload }}"
+        class="van-uploader__upload {{ disabled ? 'van-uploader__upload--disabled': ''}}"
+        style="{{ computed.sizeStyle({ previewSize }) }}"
+        bindtap="startUpload"
+      >
+        <van-icon name="{{ uploadIcon }}" class="van-uploader__upload-icon" />
+        <text wx:if="{{ uploadText }}" class="van-uploader__upload-text">{{ uploadText }}</text>
+      </view>
+    </block>
+  </view>
+</view>

package/dist/uploader/index.wxs

@@ -0,0 +1,17 @@
+/* eslint-disable */
+var style = require('../wxs/style.wxs');
+var addUnit = require('../wxs/add-unit.wxs');
+
+function sizeStyle(data) {
+  return "Array" === data.previewSize.constructor ? style({
+    width: addUnit(data.previewSize[0]),
+    height: addUnit(data.previewSize[1]),
+  }) : style({
+    width: addUnit(data.previewSize),
+    height: addUnit(data.previewSize),
+  });
+}
+
+module.exports = {
+  sizeStyle: sizeStyle,
+};

package/dist/uploader/index.wxss

@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-uploader{display:inline-block;position:relative}.van-uploader__wrapper{display:flex;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{align-items:center;background-color:var(--uploader-upload-background-color,#f7f8fa);box-sizing:border-box;display:flex;flex-direction:column;height:var(--uploader-size,80px);justify-content:center;margin:0 8px 8px 0;position:relative;width:var(--uploader-size,80px)}.van-uploader__upload:active{background-color:var(--uploader-upload-active-color,#f2f3f5)}.van-uploader__upload-icon{color:var(--uploader-icon-color,#dcdee0);font-size:var(--uploader-icon-size,24px)}.van-uploader__upload-text{color:var(--uploader-text-color,#969799);font-size:var(--uploader-text-font-size,12px);margin-top:var(--padding-xs,8px)}.van-uploader__upload--disabled{opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{cursor:pointer;margin:0 8px 8px 0;position:relative}.van-uploader__preview-image{display:block;height:var(--uploader-size,80px);overflow:hidden;width:var(--uploader-size,80px)}.van-uploader__preview-delete,.van-uploader__preview-delete:after{height:var(--uploader-delete-icon-size,14px);position:absolute;right:0;top:0;width:var(--uploader-delete-icon-size,14px)}.van-uploader__preview-delete:after{background-color:var(--uploader-delete-background-color,rgba(0,0,0,.7));border-radius:0 0 0 12px;content:""}.van-uploader__preview-delete-icon{color:var(--uploader-delete-color,#fff);font-size:var(--uploader-delete-icon-size,14px);position:absolute;right:0;top:0;transform:scale(.7) translate(10%,-10%);z-index:1}.van-uploader__file{align-items:center;background-color:var(--uploader-file-background-color,#f7f8fa);display:flex;flex-direction:column;height:var(--uploader-size,80px);justify-content:center;width:var(--uploader-size,80px)}.van-uploader__file-icon{color:var(--uploader-file-icon-color,#646566);font-size:var(--uploader-file-icon-size,20px)}.van-uploader__file-name{box-sizing:border-box;color:var(--uploader-file-name-text-color,#646566);font-size:var(--uploader-file-name-font-size,12px);margin-top:var(--uploader-file-name-margin-top,8px);padding:var(--uploader-file-name-padding,0 4px);text-align:center;width:100%}.van-uploader__mask{align-items:center;background-color:var(--uploader-mask-background-color,rgba(50,50,51,.88));bottom:0;color:#fff;display:flex;flex-direction:column;justify-content:center;left:0;position:absolute;right:0;top:0}.van-uploader__mask-icon{font-size:var(--uploader-mask-icon-size,22px)}.van-uploader__mask-message{font-size:var(--uploader-mask-message-font-size,12px);line-height:var(--uploader-mask-message-line-height,14px);margin-top:6px;padding:0 var(--padding-base,4px)}.van-uploader__loading{color:var(--uploader-loading-icon-color,#fff)!important;height:var(--uploader-loading-icon-size,22px);width:var(--uploader-loading-icon-size,22px)}

package/dist/uploader/shared.d.ts

@@ -0,0 +1,61 @@
+export declare const imageProps: {
+    sizeType: {
+        type: ArrayConstructor;
+        value: string[];
+    };
+    capture: {
+        type: ArrayConstructor;
+        value: string[];
+    };
+    showmenu: {
+        type: BooleanConstructor;
+        value: boolean;
+    };
+};
+export declare const videoProps: {
+    capture: {
+        type: ArrayConstructor;
+        value: string[];
+    };
+    compressed: {
+        type: BooleanConstructor;
+        value: boolean;
+    };
+    maxDuration: {
+        type: NumberConstructor;
+        value: number;
+    };
+    camera: {
+        type: StringConstructor;
+        value: string;
+    };
+    referrerPolicy: {
+        type: StringConstructor;
+        value: string;
+    };
+};
+export declare const mediaProps: {
+    capture: {
+        type: ArrayConstructor;
+        value: string[];
+    };
+    mediaType: {
+        type: ArrayConstructor;
+        value: string[];
+    };
+    maxDuration: {
+        type: NumberConstructor;
+        value: number;
+    };
+    camera: {
+        type: StringConstructor;
+        value: string;
+    };
+};
+export declare const messageFileProps: {
+    extension: null;
+    previewFile: {
+        type: BooleanConstructor;
+        value: boolean;
+    };
+};

package/dist/uploader/shared.js

@@ -0,0 +1,65 @@
+// props for image
+export const imageProps = {
+    sizeType: {
+        type: Array,
+        value: ['original', 'compressed'],
+    },
+    capture: {
+        type: Array,
+        value: ['album', 'camera'],
+    },
+    showmenu: {
+        type: Boolean,
+        value: true,
+    },
+};
+// props for video
+export const videoProps = {
+    capture: {
+        type: Array,
+        value: ['album', 'camera'],
+    },
+    compressed: {
+        type: Boolean,
+        value: true,
+    },
+    maxDuration: {
+        type: Number,
+        value: 60,
+    },
+    camera: {
+        type: String,
+        value: 'back',
+    },
+    referrerPolicy: {
+        type: String,
+        value: 'no-referrer',
+    },
+};
+// props for media
+export const mediaProps = {
+    capture: {
+        type: Array,
+        value: ['album', 'camera'],
+    },
+    mediaType: {
+        type: Array,
+        value: ['image', 'video', 'mix'],
+    },
+    maxDuration: {
+        type: Number,
+        value: 60,
+    },
+    camera: {
+        type: String,
+        value: 'back',
+    },
+};
+// props for file
+export const messageFileProps = {
+    extension: null,
+    previewFile: {
+        type: Boolean,
+        value: true,
+    },
+};

package/dist/uploader/utils.d.ts

@@ -0,0 +1,24 @@
+export interface File {
+    url: string;
+    size?: number;
+    name?: string;
+    type: string;
+    duration?: number;
+    time?: number;
+    isImage?: boolean;
+    isVideo?: boolean;
+}
+export declare function isImageFile(item: File): boolean;
+export declare function isVideoFile(item: File): boolean;
+export declare function chooseFile({ accept, multiple, capture, compressed, maxDuration, sizeType, camera, maxCount, mediaType, extension, }: {
+    accept: any;
+    multiple: any;
+    capture: any;
+    compressed: any;
+    maxDuration: any;
+    sizeType: any;
+    camera: any;
+    maxCount: any;
+    mediaType: any;
+    extension: any;
+}): Promise<File | File[]>;

package/dist/uploader/utils.js

@@ -0,0 +1,94 @@
+import { pickExclude, isPC, isWxWork } from '../common/utils';
+import { isImageUrl, isVideoUrl } from '../common/validator';
+export function isImageFile(item) {
+    if (item.isImage != null) {
+        return item.isImage;
+    }
+    if (item.type) {
+        return item.type === 'image';
+    }
+    if (item.url) {
+        return isImageUrl(item.url);
+    }
+    return false;
+}
+export function isVideoFile(item) {
+    if (item.isVideo != null) {
+        return item.isVideo;
+    }
+    if (item.type) {
+        return item.type === 'video';
+    }
+    if (item.url) {
+        return isVideoUrl(item.url);
+    }
+    return false;
+}
+function formatImage(res) {
+    return res.tempFiles.map((item) => (Object.assign(Object.assign({}, pickExclude(item, ['path'])), { type: 'image', url: item.tempFilePath || item.path, thumb: item.tempFilePath || item.path })));
+}
+function formatVideo(res) {
+    return [
+        Object.assign(Object.assign({}, pickExclude(res, ['tempFilePath', 'thumbTempFilePath', 'errMsg'])), { type: 'video', url: res.tempFilePath, thumb: res.thumbTempFilePath }),
+    ];
+}
+function formatMedia(res) {
+    return res.tempFiles.map((item) => (Object.assign(Object.assign({}, pickExclude(item, ['fileType', 'thumbTempFilePath', 'tempFilePath'])), { type: item.fileType, url: item.tempFilePath, thumb: item.fileType === 'video' ? item.thumbTempFilePath : item.tempFilePath })));
+}
+function formatFile(res) {
+    return res.tempFiles.map((item) => (Object.assign(Object.assign({}, pickExclude(item, ['path'])), { url: item.path })));
+}
+export function chooseFile({ accept, multiple, capture, compressed, maxDuration, sizeType, camera, maxCount, mediaType, extension, }) {
+    return new Promise((resolve, reject) => {
+        switch (accept) {
+            case 'image':
+                if (isPC || isWxWork) {
+                    wx.chooseImage({
+                        count: multiple ? Math.min(maxCount, 9) : 1,
+                        sourceType: capture,
+                        sizeType,
+                        success: (res) => resolve(formatImage(res)),
+                        fail: reject,
+                    });
+                }
+                else {
+                    wx.chooseMedia({
+                        count: multiple ? Math.min(maxCount, 9) : 1,
+                        mediaType: ['image'],
+                        sourceType: capture,
+                        maxDuration,
+                        sizeType,
+                        camera,
+                        success: (res) => resolve(formatImage(res)),
+                        fail: reject,
+                    });
+                }
+                break;
+            case 'media':
+                wx.chooseMedia({
+                    count: multiple ? Math.min(maxCount, 9) : 1,
+                    mediaType,
+                    sourceType: capture,
+                    maxDuration,
+                    sizeType,
+                    camera,
+                    success: (res) => resolve(formatMedia(res)),
+                    fail: reject,
+                });
+                break;
+            case 'video':
+                wx.chooseVideo({
+                    sourceType: capture,
+                    compressed,
+                    maxDuration,
+                    camera,
+                    success: (res) => resolve(formatVideo(res)),
+                    fail: reject,
+                });
+                break;
+            default:
+                wx.chooseMessageFile(Object.assign(Object.assign({ count: multiple ? maxCount : 1, type: accept }, (extension ? { extension } : {})), { success: (res) => resolve(formatFile(res)), fail: reject }));
+                break;
+        }
+    });
+}

package/dist/wxs/add-unit.wxs

@@ -0,0 +1,12 @@
+/* eslint-disable */
+var REGEXP = getRegExp('^-?\d+(\.\d+)?$');
+
+function addUnit(value) {
+  if (value == null) {
+    return undefined;
+  }
+
+  return REGEXP.test('' + value) ? value + 'px' : value;
+}
+
+module.exports = addUnit;

package/dist/wxs/array.wxs

@@ -0,0 +1,5 @@
+function isArray(array) {
+  return array && array.constructor === 'Array';
+}
+
+module.exports.isArray = isArray;

package/dist/wxs/bem.wxs

@@ -0,0 +1,39 @@
+/* eslint-disable */
+var array = require('./array.wxs');
+var object = require('./object.wxs');
+var PREFIX = 'van-';
+
+function join(name, mods) {
+  name = PREFIX + name;
+  mods = mods.map(function(mod) {
+    return name + '--' + mod;
+  });
+  mods.unshift(name);
+  return mods.join(' ');
+}
+
+function traversing(mods, conf) {
+  if (!conf) {
+    return;
+  }
+
+  if (typeof conf === 'string' || typeof conf === 'number') {
+    mods.push(conf);
+  } else if (array.isArray(conf)) {
+    conf.forEach(function(item) {
+      traversing(mods, item);
+    });
+  } else if (typeof conf === 'object') {
+    object.keys(conf).forEach(function(key) {
+      conf[key] && mods.push(key);
+    });
+  }
+}
+
+function bem(name, conf) {
+  var mods = [];
+  traversing(mods, conf);
+  return join(name, mods);
+}
+
+module.exports = bem;

package/dist/wxs/memoize.wxs

@@ -0,0 +1,55 @@
+/**
+ * Simple memoize
+ * wxs doesn't support fn.apply, so this memoize only support up to 2 args
+ */
+/* eslint-disable */
+
+function isPrimitive(value) {
+  var type = typeof value;
+  return (
+    type === 'boolean' ||
+    type === 'number' ||
+    type === 'string' ||
+    type === 'undefined' ||
+    value === null
+  );
+}
+
+// mock simple fn.call in wxs
+function call(fn, args) {
+  if (args.length === 2) {
+    return fn(args[0], args[1]);
+  }
+
+  if (args.length === 1) {
+    return fn(args[0]);
+  }
+
+  return fn();
+}
+
+function serializer(args) {
+  if (args.length === 1 && isPrimitive(args[0])) {
+    return args[0];
+  }
+  var obj = {};
+  for (var i = 0; i < args.length; i++) {
+    obj['key' + i] = args[i];
+  }
+  return JSON.stringify(obj);
+}
+
+function memoize(fn) {
+  var cache = {};
+
+  return function() {
+    var key = serializer(arguments);
+    if (cache[key] === undefined) {
+      cache[key] = call(fn, arguments);
+    }
+
+    return cache[key];
+  };
+}
+
+module.exports = memoize;

package/dist/wxs/object.wxs

@@ -0,0 +1,13 @@
+/* eslint-disable */
+var REGEXP = getRegExp('{|}|"', 'g');
+
+function keys(obj) {
+  return JSON.stringify(obj)
+    .replace(REGEXP, '')
+    .split(',')
+    .map(function(item) {
+      return item.split(':')[0];
+    });
+}
+
+module.exports.keys = keys;

package/dist/wxs/style.wxs

@@ -0,0 +1,42 @@
+/* eslint-disable */
+var object = require('./object.wxs');
+var array = require('./array.wxs');
+
+function kebabCase(word) {
+  var newWord = word
+    .replace(getRegExp("[A-Z]", 'g'), function (i) {
+      return '-' + i;
+    })
+    .toLowerCase()
+
+  return newWord;
+}
+
+function style(styles) {
+  if (array.isArray(styles)) {
+    return styles
+      .filter(function (item) {
+        return item != null && item !== '';
+      })
+      .map(function (item) {
+        return style(item);
+      })
+      .join(';');
+  }
+
+  if ('Object' === styles.constructor) {
+    return object
+      .keys(styles)
+      .filter(function (key) {
+        return styles[key] != null && styles[key] !== '';
+      })
+      .map(function (key) {
+        return [kebabCase(key), [styles[key]]].join(':');
+      })
+      .join(';');
+  }
+
+  return styles;
+}
+
+module.exports = style;

package/dist/wxs/utils.wxs

@@ -0,0 +1,10 @@
+/* eslint-disable */
+var bem = require('./bem.wxs');
+var memoize = require('./memoize.wxs');
+var addUnit = require('./add-unit.wxs');
+
+module.exports = {
+  bem: memoize(bem),
+  memoize: memoize,
+  addUnit: addUnit
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cbvirtua",
-  "version": "1.0.100",
+  "version": "1.0.102",
   "description": "",
   "main": "index.js",
   "scripts": {