@cloudbase/weda-ui-mp 3.16.0 → 3.17.0

package/components/chart/ec-canvas/ec-canvas.js

@@ -1,33 +1,9 @@
 import WxCanvas from './wx-canvas';
 import * as echarts from '../common/lib/echarts.min';
+import { compareVersion } from '../../../utils/platform';
 
 let ctx;
 
-function compareVersion(v1, v2) {
-  v1 = v1.split('.');
-  v2 = v2.split('.');
-  const len = Math.max(v1.length, v2.length);
-
-  while (v1.length < len) {
-    v1.push('0');
-  }
-  while (v2.length < len) {
-    v2.push('0');
-  }
-
-  for (let i = 0; i < len; i++) {
-    const num1 = parseInt(v1[i]);
-    const num2 = parseInt(v2[i]);
-
-    if (num1 > num2) {
-      return 1;
-    } else if (num1 < num2) {
-      return -1;
-    }
-  }
-  return 0;
-}
-
 Component({
   properties: {
     canvasId: {

package/components/form/uploaderFile/index.js

@@ -1,7 +1,6 @@
-import { getCloudInstance, getTempFileURL, getDefaultUploadPath } from '../../../utils/tcb';
-import { transSize, randomStr } from '../../../utils/platform';
+import { getTempFileURL } from '../../../utils/tcb';
 import equal from '../../../utils/deepEqual';
-
+import { upload, handleUpload, getName, initUploadInstance } from './upload';
 Component({
   options: {
     virtualHost: true,
@@ -97,214 +96,9 @@ Component({
       { text: '拍照或录像', value: 2 },
       { text: '选取聊天文件', value: 3 },
     ],
+    uploadInstance: {},
   },
   methods: {
-    // 批量上传文件前置事件
-    handleBefore: function (files = []) {
-      if (this.data.files.length + files.length > this.data.maxCount) {
-        wx.showToast({
-          title: `上传文件总数不能超过${this.data.maxCount}个`,
-          icon: 'none',
-          duration: 2000,
-        });
-        return false;
-      }
-      if (this.properties.maxSize && files.some((f) => f.size > this.properties.maxSize * 1024 * 1024)) {
-        wx.showToast({
-          title: `上传文件大小不能超过${this.properties.maxSize}M`,
-          icon: 'none',
-          duration: 2000,
-        });
-        return false;
-      }
-      if (files.some((f) => f.size > 500 * 1024 * 1024)) {
-        wx.showToast({
-          title: `上传文件大小不能超过500M`,
-          icon: 'none',
-          duration: 2000,
-        });
-        return false;
-      }
-      return true;
-    },
-    //上传文件过程
-    uploadFile: async function () {
-      //文件上传的函数，
-      wx.chooseMessageFile({
-        count: this.data.maxCount,
-        type: 'all',
-        success: async (files) => {
-          await this.handleUpload(files?.tempFiles);
-        },
-        fail(e) {
-          this.triggerEvent('error', e.detail);
-        },
-      });
-    },
-    //拍摄或从手机相册中选择图片或视频
-    chooseMedia: async function (value) {
-      wx.chooseMedia({
-        count: this.data.maxCount,
-        sourceType: value === 1 ? ['album'] : ['camera'],
-        maxDuration: 60,
-        success: async (files) => {
-          await this.handleUpload(files?.tempFiles);
-        },
-        fail(e) {
-          this.triggerEvent('error', e.detail);
-        },
-      });
-    },
-    getName: function (hf) {
-      const uuidReg = /[0-9a-f]{8}([0-9a-f]{4}){3}[0-9a-f]{12}-/;
-      const lastIndex = String(hf).lastIndexOf('/');
-      const name = String(hf).slice(lastIndex + 1);
-      const label = name.replace(uuidReg, '');
-      return label;
-    },
-    handleUpload: async function (files, reload = false) {
-      var _this = this;
-      if (!this.handleBefore(files)) return;
-
-      const callbacks = this.data.callbacks;
-      let shouldUploadToCos = true;
-      if (typeof callbacks?.beforeUpload === 'function') {
-        try {
-          const mgr = wx.getFileSystemManager();
-          const ret = await callbacks.beforeUpload({
-            tempFilePaths: files.map((f) => f.path || f.tempFilePath),
-            base64Uri: files.map((f) => {
-              const content = mgr.readFileSync(f.path || f.tempFilePath);
-              return `data:;base64,${wx.arrayBufferToBase64(content)}`;
-            }),
-          });
-          if (typeof ret === 'boolean') {
-            shouldUploadToCos = ret;
-          } else if (Array.Array(ret) && ret.every((i) => typeof i === 'string')) {
-            files = ret.map((path, idx) => {
-              files[idx].path = path;
-            });
-          }
-        } catch (err) {
-          console.error('上传前处理函数抛错', err);
-          shouldUploadToCos = false;
-        }
-      }
-      if (shouldUploadToCos === false) {
-        return false;
-      }
-
-      const initFiles = files.map((i) => ({
-        ...i,
-        percent: '0',
-        cloudPath: null,
-        name: i?.name || this.getName(i?.tempFilePath),
-        filePath: i?.path || i?.tempFilePath || null,
-        size: transSize(i?.size),
-        status: 'pending',
-      }));
-      let filelsList = reload ? this.data.files : [...this.data.files, ...initFiles];
-      this.setData({
-        files: filelsList,
-      });
-      Promise.all(
-        initFiles.map(async (tempFile) => {
-          return new Promise(function (resolve) {
-            _this.handleUploadFile({
-              _tempFile: tempFile,
-              onSuccess: (res) => {
-                filelsList = filelsList.map((i) => (i.filePath === res.filePath ? res : i));
-                _this.triggerEvent('success', {
-                  value: res.cloudPath,
-                  file: res,
-                });
-                resolve(res);
-              },
-              onProgressUpdate: (res) => {
-                filelsList = filelsList.map((i) => (i.filePath === res.filePath ? res : i));
-                _this.setData({
-                  files: filelsList,
-                });
-              },
-              onFail: (res, error) => {
-                filelsList = filelsList.map((i) => (i.filePath === res.filePath ? res : i));
-                _this.triggerEvent('error', error.detail);
-                resolve(res);
-              },
-            });
-          });
-        }),
-      ).then((res) => {
-        const result = filelsList.map((i) => res.find((j) => j.filePath === i.filePath) || i);
-        const cloudPathList = result.filter((i) => i.cloudPath).map((j) => j.cloudPath);
-        this.setData({
-          files: result,
-          urls: cloudPathList,
-          cloudFile: cloudPathList,
-        });
-        _this.handleChange(cloudPathList);
-      });
-    },
-    handleUploadFile: async function ({ _tempFile, onSuccess, onProgressUpdate, onFail }) {
-      const tempFile = {
-        ..._tempFile,
-      };
-      const uploadPath = 'weda-uploader';
-      const _uploadPath = await getDefaultUploadPath(uploadPath);
-      const filenameRegex = /[^a-zA-Z0-9\u4e00-\u9fff-*!_.]/g;
-      const cloudPath = `${_uploadPath}/${randomStr()}-${tempFile.name?.replace(filenameRegex, '-')}`;
-      try {
-        const tcb = await getCloudInstance();
-        const uploadTask = await tcb.uploadFile({
-          cloudPath: cloudPath,
-          filePath: tempFile.path || tempFile.tempFilePath,
-          success(res) {
-            tempFile.cloudPath = res.fileID;
-            tempFile.percent = 100;
-            tempFile.status = 'success';
-            if (onSuccess) {
-              onSuccess(tempFile);
-            }
-          },
-          fail(e) {
-            tempFile.status = 'fail';
-            wx.showModal({
-              title: '上传失败，请重试',
-              content: e.message,
-              showCancel: false,
-            });
-            onFail(tempFile, {
-              detail: e,
-            });
-          },
-        });
-        if (typeof uploadTask.onProgressUpdate === 'function') {
-          uploadTask.onProgressUpdate((res) => {
-            tempFile.percent = String(res.progress);
-            tempFile.status = res.progress == 100 ? 'success' : 'uploading';
-            tempFile.uploaded = transSize(res.totalBytesSent);
-            if (onProgressUpdate) {
-              onProgressUpdate(tempFile);
-            }
-          });
-        } else {
-          tempFile.percent = '100';
-          tempFile.status = 'success';
-          tempFile.cloudPath = uploadTask.fileID;
-          onSuccess(tempFile);
-        }
-      } catch (e) {
-        tempFile.status = 'fail';
-        wx.showModal({
-          title: '上传失败，请重试',
-          content: e.message,
-          showCancel: false,
-        });
-        if (onFail) {
-          onFail(tempFile, e);
-        }
-      }
-    },
     onDelete: function (e) {
       let newUrls = [];
       if (this.data.urls.length == 0) {
@@ -332,17 +126,14 @@ Component({
     },
 
     // change 事件
-    handleChange: function (values) {
-      let value = values;
-      if (this.properties.single) {
-        value = values[0] ?? '';
-      }
+    handleChange: function (value) {
       this.setData({ oldValue: value });
       this.triggerEvent('change', { value });
     },
 
     reload: function (e) {
-      this.handleUpload([e.target.dataset.item], true);
+      const { uploadInstance } = this.data;
+      handleUpload([e.target.dataset.item], uploadInstance, true);
     },
     downloadFile: async function (e) {
       const path = e.target.dataset.item?.cloudPath;
@@ -397,19 +188,31 @@ Component({
       this.setData({
         showActionsheet: false,
       });
+      const { disabled, maxCount, files, maxSize } = this.data;
+      let config = { disabled, count: maxCount, maxSize, action: 'CHOOSE_MEDIA' };
+
       switch (e?.detail?.value) {
         // 照片图库
         case 1:
-        // 拍照或录像
-        // eslint-disable-next-line no-fallthrough
+          // 拍照或录像
+          //从手机相册中选择图片或视频
+          config.sourceType = ['album'];
+          break;
         case 2:
-          this.chooseMedia(e?.detail?.value);
+          // 拍摄
+          config.sourceType = ['camera'];
           break;
         // 选取聊天文件
         case 3:
-          this.uploadFile();
+          config.type = 'all';
+          config.action = 'CHOOSE_MESSAGE_FILE';
+          break;
+        default:
           break;
       }
+      const uploadInstance = initUploadInstance({ config, previewFile: files }, this);
+      this.setData({ uploadInstance });
+      upload(uploadInstance);
     },
   },
   observers: {
@@ -430,7 +233,7 @@ Component({
         for (let f of values) {
           if (f.startsWith('cloud:')) {
             const hf = await getTempFileURL(f);
-            const label = this.getName(hf);
+            const label = getName(hf);
             const httpFile = {
               name: label,
               cloudPath: f,

package/components/form/uploaderFile/upload.js

@@ -0,0 +1,283 @@
+import { transSize, randomStr } from '../../../utils/platform';
+import { getCloudInstance, getDefaultUploadPath } from '../../../utils/tcb';
+
+const ACTION = { CHOOSE_MEDIA: 'chooseMedia', CHOOSE_MESSAGE_FILE: 'chooseMessageFile' };
+
+// 选择文件
+const chooseFile = ({ action = 'CHOOSE_MEDIA', config, success, fail }) => {
+  let _config = { count: 9, maxDuration: 60 };
+
+  switch (action) {
+    case ACTION['CHOOSE_MEDIA']:
+      _config = {
+        mediaType: ['image'],
+        sourceType: ['album'],
+        ...config,
+      };
+      break;
+    case ACTION['CHOOSE_MESSAGE_FILE']:
+      _config = {
+        type: 'all',
+        ...config,
+      };
+      break;
+    default:
+      _config = { ...config };
+      break;
+  }
+
+  wx[ACTION[action]]({
+    ..._config,
+    success,
+    fail,
+  });
+};
+
+export const getName = (hf) => {
+  const uuidReg = /[0-9a-f]{8}([0-9a-f]{4}){3}[0-9a-f]{12}-/;
+  const lastIndex = String(hf).lastIndexOf('/');
+  const name = String(hf).slice(lastIndex + 1);
+  const label = name.replace(uuidReg, '');
+  return label;
+};
+
+// 批量上传文件前置事件
+const handleBefore = (files, uploadInstance) => {
+  const { count: maxCount, maxSize } = uploadInstance.config;
+  const previewFile = uploadInstance.getPreviewFile();
+  if (previewFile.length + files.length > maxCount) {
+    wx.showToast({
+      title: `上传文件总数不能超过${maxCount}个`,
+      icon: 'none',
+      duration: 2000,
+    });
+    return false;
+  }
+  if (maxSize && files.some((f) => f.size > maxSize * 1024 * 1024)) {
+    wx.showToast({
+      title: `上传文件大小不能超过${maxSize}M`,
+      icon: 'none',
+      duration: 2000,
+    });
+    return false;
+  }
+  return true;
+};
+
+// 上传
+export const handleUpload = async (files, uploadInstance, reload = false) => {
+  if (!handleBefore(files, uploadInstance)) return;
+
+  let shouldUploadToCos = true;
+  if (typeof uploadInstance?.beforeUpload === 'function') {
+    try {
+      const mgr = wx.getFileSystemManager();
+      const ret = await uploadInstance.beforeUpload({
+        tempFilePaths: files.map((f) => f.path || f.tempFilePath),
+        base64Uri: files.map((f) => {
+          const content = mgr.readFileSync(f.path || f.tempFilePath);
+          return `data:;base64,${wx.arrayBufferToBase64(content)}`;
+        }),
+      });
+      if (typeof ret === 'boolean') {
+        shouldUploadToCos = ret;
+      } else if (Array.isArray(ret) && ret.every((i) => typeof i === 'string')) {
+        files = ret.map((path, idx) => {
+          files[idx].path = path;
+        });
+      }
+    } catch (err) {
+      console.error('上传前处理函数抛错', err);
+      shouldUploadToCos = false;
+    }
+  }
+  if (!shouldUploadToCos) {
+    return;
+  }
+
+  const initFiles = files.map((i) => ({
+    ...i,
+    percent: '0',
+    cloudPath: null,
+    name: i?.name || getName(i?.tempFilePath),
+    filePath: i?.path || i?.tempFilePath || null,
+    size: transSize(i?.size),
+    status: 'pending',
+  }));
+  const previewFile = uploadInstance.getPreviewFile();
+  let filelsList = reload ? previewFile : [...previewFile, ...initFiles];
+  // 更新预览文件
+  uploadInstance.updatePreviewFile(filelsList);
+  return Promise.all(
+    initFiles.map(async (tempFile) => {
+      return new Promise(function (resolve) {
+        handleUploadFile({
+          uploadPath: uploadInstance.config.uploadPath,
+          customUploadPath: uploadInstance.config.customUploadPath,
+          _tempFile: tempFile,
+          onSuccess: (res) => {
+            filelsList = filelsList.map((i) => (i.filePath === res.filePath ? res : i));
+            uploadInstance.updatePreviewFile(filelsList);
+            uploadInstance.onSuccess(res);
+            resolve(res);
+          },
+          onProgressUpdate: (res) => {
+            filelsList = filelsList.map((i) => (i.filePath === res.filePath ? res : i));
+            uploadInstance.updatePreviewFile(filelsList);
+          },
+          onFail: (res, error) => {
+            filelsList = filelsList.map((i) => (i.filePath === res.filePath ? res : i));
+            uploadInstance.updatePreviewFile(filelsList);
+            uploadInstance.onFail(res, error);
+            resolve(res);
+          },
+        });
+      });
+    }),
+  ).then((res) => {
+    const result = filelsList.map((i) => res.find((j) => j.filePath === i.filePath) || i);
+
+    uploadInstance.onComplete(result);
+  });
+};
+
+//
+const sanitizeFilename = (filename, replacement = '') => {
+  return (
+    filename
+      // 移除非法字符
+      // eslint-disable-next-line no-control-regex
+      .replace(/[<>.:"\\|?*\x00-\x1F]/g, replacement)
+      // 处理Windows保留文件名（CON, PRN等）
+      .replace(/^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(\..*)?$/i, replacement)
+      // 移除开头和结尾的点,空格,反斜杠（Windows不允许）
+      .replace(/^[. /]+/, '')
+      .replace(/[. /]+$/, '')
+      // 可选：限制长度
+      .slice(0, 255)
+  );
+};
+// 上传到云存储
+const handleUploadFile = async ({
+  uploadPath = 'weda-uploader',
+  _tempFile,
+  onSuccess,
+  onProgressUpdate,
+  onFail,
+  customUploadPath,
+}) => {
+  const tempFile = {
+    ..._tempFile,
+  };
+  let _uploadPath = await getDefaultUploadPath(uploadPath);
+  if (customUploadPath) {
+    _uploadPath = `${_uploadPath}/${sanitizeFilename(customUploadPath, '')}`;
+  }
+  const filenameRegex = /[^a-zA-Z0-9\u4e00-\u9fff-*!_.]/g;
+  const cloudPath = `${_uploadPath}/${randomStr()}-${tempFile.name?.replace(filenameRegex, '-')}`;
+  try {
+    const tcb = await getCloudInstance();
+    const uploadTask = await tcb.uploadFile({
+      cloudPath: cloudPath,
+      filePath: tempFile.path || tempFile.tempFilePath,
+      success(res) {
+        tempFile.cloudPath = res.fileID;
+        tempFile.percent = 100;
+        tempFile.status = 'success';
+        if (onSuccess) {
+          onSuccess(tempFile);
+        }
+      },
+      fail(e) {
+        tempFile.status = 'fail';
+        wx.showModal({
+          title: '上传失败，请重试',
+          content: e.message,
+          showCancel: false,
+        });
+        onFail(tempFile, e);
+      },
+    });
+    if (typeof uploadTask.onProgressUpdate === 'function') {
+      uploadTask.onProgressUpdate((res) => {
+        tempFile.percent = String(res.progress);
+        tempFile.status = res.progress == 100 ? 'success' : 'uploading';
+        tempFile.uploaded = transSize(res.totalBytesSent);
+        if (onProgressUpdate) {
+          onProgressUpdate(tempFile);
+        }
+      });
+    } else {
+      tempFile.percent = '100';
+      tempFile.status = 'success';
+      tempFile.cloudPath = uploadTask.fileID;
+      onSuccess(tempFile);
+    }
+  } catch (e) {
+    tempFile.status = 'fail';
+    wx.showModal({
+      title: '上传失败，请重试',
+      content: e.message,
+      showCancel: false,
+    });
+    if (onFail) {
+      onFail(tempFile, e);
+    }
+  }
+};
+
+export const upload = (uploadInstance) => {
+  const { config, onSuccess, onFail } = uploadInstance;
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { action, disabled, maxSize, ..._config } = config;
+  if (disabled) return;
+  const success = (res) => {
+    const result = handleUpload(res.tempFiles, uploadInstance);
+    onSuccess(result);
+  };
+  const fail = (e) => {
+    onFail(e);
+  };
+
+  chooseFile({ action, config: _config, success, fail });
+};
+
+export const initUploadInstance = ({ action, config, previewFile }, _this) => {
+  let uploadInstance = {
+    action,
+    config: { disabled: false, maxSize: 500, count: 9, maxDuration: 60, ...config },
+    previewFile,
+    updatePreviewFile(files) {
+      _this.setData({ files });
+    },
+    getPreviewFile() {
+      const { files } = _this.data;
+      return files;
+    },
+    onComplete(result) {
+      const cloudPathList = result.filter((i) => i.cloudPath).map((j) => j.cloudPath);
+      _this.setData({
+        files: result,
+        urls: cloudPathList,
+        cloudFile: cloudPathList,
+      });
+      let _value = cloudPathList;
+      if (_this.data.single) {
+        _value = cloudPathList[0] ?? '';
+      }
+      _this.handleChange(_value);
+    },
+    onSuccess(res) {
+      _this.triggerEvent('success', {
+        value: res.cloudPath,
+        file: res,
+      });
+    },
+    onFail(e) {
+      _this.triggerEvent('error', e);
+    },
+    beforeUpload: _this.data.callbacks?.beforeUpload,
+  };
+
+  return uploadInstance;
+};

package/components/wd-ad/index.js

@@ -2,6 +2,8 @@
 import handleEvents from '../../utils/handleEvents';
 import { commonCompBehavior } from '../../utils/common-behavior';
 import { WD_PREFIX } from '../../utils/constant';
+import { compareVersion } from '../../utils/platform';
+import { errorHandler } from '../../utils/error';
 
 Component({
   options: { virtualHost: true },
@@ -37,12 +39,21 @@ Component({
       type: Number,
       value: 5,
     },
+    multiton: {
+      type: Boolean,
+      value: false,
+    },
+    disableFallbackSharePage: {
+      type: Boolean,
+      value: false,
+    },
   },
   data: {
     _adType: 'banner',
     _gridCount: 5,
     _adIntervals: null,
     classPrefix: WD_PREFIX,
+    rewardedVideoAd: null,
   },
   methods: {
     ...handleEvents([
@@ -50,17 +61,102 @@ Component({
       { name: 'error', title: '广告加载失败' },
       { name: 'close', title: '广告被关闭' },
     ]),
+    checkSdkVersion() {
+      let canUseRewardedVideoAd = true;
+      if (wx.canIUse('getAppBaseInfo')) {
+        const appBaseInfo = wx.getAppBaseInfo();
+        canUseRewardedVideoAd = compareVersion(appBaseInfo.SDKVersion, '2.8.1') >= 0;
+      } else {
+        const version = wx.getSystemInfoSync().SDKVersion;
+        canUseRewardedVideoAd = compareVersion(version, '2.8.1') >= 0;
+      }
+      return canUseRewardedVideoAd;
+    },
+    createRewardedVideoAd() {
+      if (this.data.rewardedVideoAd) {
+        this.destroy();
+      }
+      const canUseRewardedVideoAd = this.checkSdkVersion();
+
+      if (wx.createRewardedVideoAd && canUseRewardedVideoAd) {
+        const { unitId, multiton, disableFallbackSharePage } = this.data;
+        const rewardedVideoAd = wx.createRewardedVideoAd({ adUnitId: unitId, multiton, disableFallbackSharePage });
+        rewardedVideoAd.onLoad(() => {
+          this.triggerEvent('load');
+        });
+        rewardedVideoAd.onError((error) => {
+          const { comErrorInfo } = errorHandler({
+            id: this.id,
+            code: 'WdAd.createRewardedVideoAd',
+            error: error,
+          });
+          this.triggerEvent('error', { error: comErrorInfo });
+        });
+        rewardedVideoAd.onClose((res) => {
+          this.triggerEvent('close', res);
+        });
+        this.setData({ rewardedVideoAd });
+      } else {
+        const { comErrorInfo } = errorHandler({
+          id: this.id,
+          code: 'WdAd.createRewardedVideoAd',
+          message: '当前基础库版本低于2.8.1，不支持激励视频广告功能',
+        });
+        this.triggerEvent('error', { error: comErrorInfo });
+      }
+    },
+    destroy() {
+      this.data.rewardedVideoAd?.destroy();
+      this.setData({
+        rewardedVideoAd: null,
+      });
+    },
+    show() {
+      const { rewardedVideoAd } = this.data;
+      rewardedVideoAd?.show().catch(() => {
+        rewardedVideoAd
+          .load()
+          .then(() => rewardedVideoAd.show())
+          .catch((error) => {
+            const { comErrorInfo } = errorHandler({
+              id: this.id,
+              code: 'WdAd.showRewardedVideoAd',
+              error: error,
+            });
+            this.triggerEvent('error', { error: comErrorInfo });
+          });
+      });
+    },
+    updateWidgetAPI() {
+      this.setReadonlyAttributes?.({
+        rewardedVideoAd: this.data.rewardedVideoAd,
+        show: this.show.bind(this),
+      });
+    },
   },
   observers: {
     // 规范取值
     'adType,adIntervals,gridCount': function (adType, adIntervals, gridCount) {
-      const _adType = ['banner', 'video', 'grid'].includes(adType)
-        ? adType
-        : 'banner';
-      const _adIntervals =
-        Number(adIntervals) >= 30 ? Number(adIntervals) : null;
+      const _adType = ['banner', 'video', 'grid', 'rewardedVideoAd'].includes(adType) ? adType : 'banner';
+      const _adIntervals = Number(adIntervals) >= 30 ? Number(adIntervals) : null;
       const _gridCount = gridCount == 8 ? 8 : 5;
       this.setData({ _adType, _gridCount, _adIntervals });
     },
+    rewardedVideoAd: function () {
+      this.updateWidgetAPI();
+    },
+    'adType,unitId,multiton,disableFallbackSharePage': function () {
+      this.createRewardedVideoAd();
+    },
+  },
+  lifetimes: {
+    attached() {
+      if (this.data.adType === 'rewardedVideoAd') {
+        this.createRewardedVideoAd();
+      }
+    },
+    detached() {
+      this.destroy();
+    },
   },
 });

package/components/wd-ad/index.wxml

@@ -1,3 +1,5 @@
 <view id="{{id}}" style="{{style}}" class="{{classPrefix}}-ad {{classPrefix}}-mp-ad {{classPrefix}}-ad--{{_adType}} {{className}} ">
+<block wx:if="{{_adType!=='rewardedVideoAd'}}">
   <ad unit-id="{{unitId}}" ad-intervals="{{_adIntervals}}" ad-type="{{_adType}}" ad-theme="{{adTheme}}" grid-count="{{_gridCount}}" bindload="load" binderror="error" bindclose="close"></ad>
+</block>
 </view>

package/components/wd-upload-image/index.js

@@ -3,6 +3,7 @@ import formFieldBehavior from '../form-field-behavior/form-field-behavior';
 import itemBehavior from '../form-field-behavior/item-behavior';
 import isEqual from '../../utils/deepEqual';
 import { convertSingleValue } from '../../utils/platform';
+import { upload } from '../form/uploaderFile/upload';
 
 Component({
   options: {
@@ -39,6 +40,15 @@ Component({
       type: Object,
       value: null,
     },
+    template: {
+      type: String,
+      value: 'normal',
+    },
+  },
+  data: {
+    files: [],
+    uploadInstance: {},
+    config: { count: 9, maxDuration: 60 },
   },
   methods: {
     initValue: function () {
@@ -48,17 +58,151 @@ Component({
         this.setData({ value: v });
       }
     },
+    mapPreviewFile: function (files) {
+      return files.map((i) => ({
+        ...i,
+        progress: i.percent,
+        loading: i.status !== 'success',
+        cloudId: i.cloudId || i.cloudPath,
+        tempUrl: i.tempFilePath,
+      }));
+    },
+    initUploadInstance: function ({ action, config }) {
+      const { files } = this.data;
+      const _this = this;
+      let uploadInstance = {
+        action,
+        config: { ...config },
+        previewFile: files,
+        updatePreviewFile(files) {
+          _this.setData({ files: _this.mapPreviewFile(files) });
+        },
+        getPreviewFile() {
+          const { files } = _this.data;
+          return files;
+        },
+        onComplete(result) {
+          const files = _this.mapPreviewFile(result);
+          _this.setData({
+            files,
+          });
+          const cloudPathList = files.map((i) => i.cloudId).filter((j) => !!j);
+          let _value = cloudPathList;
+          if (_this.data.single) {
+            _value = cloudPathList[0] ?? '';
+          }
+          _this.handleChange({ detail: { value: _value } });
+        },
+        onSuccess(res) {
+          _this.triggerEvent('success', {
+            value: res.cloudPath,
+            file: res,
+          });
+        },
+        onFail(e) {
+          _this.triggerEvent('error', e);
+        },
+        beforeUpload: _this.data.callbacks?.beforeUpload,
+      };
+
+      return uploadInstance;
+    },
+    setConfig: function (_config) {
+      const { single, maxUploadCount, config } = this.data;
+      const _maxUploadCount = _config.maxUploadCount ?? maxUploadCount;
+      // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+      const maxCount = single ? 1 : _maxUploadCount;
+      const res = { ...config, count: maxCount, ..._config };
+      this.setData({ config: res });
+    },
+    deleteHandle: function ({ cloudId }) {
+      const { files, single } = this.data;
+      const fileList = files.filter((d) => d.cloudId !== cloudId);
+      this.setData({ files: fileList });
+
+      let value = fileList.map((i) => i?.cloudId).filter((j) => !!j);
+
+      value = single ? value[0] || '' : value;
+
+      this.handleChange({ detail: { value: value } });
+    },
+    setConfigHandle: function ({ config }) {
+      this.setConfig(config);
+    },
+    init: function () {
+      const { config } = this.data;
+      const uploadInstance = this.initUploadInstance({ action: 'CHOOSE_MEDIA', config });
+      this.setData({ uploadInstance });
+
+      this.setReadonlyAttributes &&
+        this.setReadonlyAttributes({
+          upload: (_uploadInstance = uploadInstance) => {
+            upload(_uploadInstance);
+          },
+          delete: this.deleteHandle.bind(this),
+          uploadInstance,
+          setConfig: this.setConfigHandle.bind(this),
+        });
+    },
+    updatePreviewFile: function () {
+      const { files } = this.data;
+      this.setReadonlyAttributes &&
+        this.setReadonlyAttributes({
+          previewFile: files,
+        });
+    },
   },
   observers: {
-    'name, value, label, required, visible, disabled, readOnly, sourceType':
-      function () {
-        this.updateWidgetAPI();
-      },
+    'name, value, label, required, visible, disabled, readOnly, sourceType': function () {
+      this.updateWidgetAPI();
+    },
+    'disabled,sourceType,maxUploadCount,sizeType,single': function (disabled, sourceType, maxUploadCount, sizeType) {
+      const config = {
+        disabled,
+        sourceType,
+        maxUploadCount,
+        sizeType,
+      };
+      this.setConfig(config);
+    },
+    config: function () {
+      this.init();
+    },
+    files: function () {
+      this.updatePreviewFile();
+    },
+    value: function (value) {
+      const _value = [].concat(value).filter((d) => typeof d === 'string' && d !== '');
+
+      const previewFileMap = this.data.files.reduce((acc, obj) => {
+        acc[obj?.cloudId] = obj; // 使用 cloudId 作为新对象的 key
+        return acc;
+      }, {});
+      if (_value.some((i) => !previewFileMap[i])) {
+        const previewFile = _value?.length
+          ? _value.map((i) => ({
+              progress: 100,
+              loading: false,
+              cloudId: i,
+              tempUrl: '',
+            }))
+          : [];
+        this.setData({ files: previewFile });
+      }
+    },
   },
   lifetimes: {
     attached: function () {
       this.initValue();
+      const { disabled, sourceType, sizeType } = this.data;
+      this.setConfig({ disabled, maxDuration: 60, sourceType, sizeType });
+
       this.updateWidgetAPI();
     },
+    ready: function () {
+      this.triggerEvent('onReady', {
+        uploadInstance: this.data.uploadInstance,
+      });
+    },
   },
 });

package/components/wd-upload-image/index.wxml

@@ -19,6 +19,10 @@
     size="{{size}}"
     borderedH5="{{borderedH5}}"
   >
+  <block wx:if="{{template==='custom'}}">
+  <slot></slot>
+  </block>
+  <block wx:else>
     <old-image-uploader
       labelVisible="{{false}}"
       acceptTypes="{{acceptTypes}}"
@@ -41,5 +45,6 @@
       bind:success="handleEvent"
       bind:error="handleEvent"
     />
+</block>
   </wd-form-item>
 </block>

package/package.json

@@ -3,7 +3,7 @@
   "miniprogram": "./",
   "packageManager": "yarn@3.0.2",
   "dependencies": {},
-  "version": "3.16.0",
+  "version": "3.17.0",
   "main": "./",
   "publishConfig": {
     "access": "public"

package/utils/platform.js

@@ -58,11 +58,7 @@ export const getWhereList = (where) => {
             }
             let [rel, val] = [REL_DICT[item2?.rel] || item2?.rel, item2?.value];
             // 去掉空字符串、undefined(接口不支持)、对象类型(接口不支持)
-            if (
-              val === '' ||
-              val === undefined ||
-              Object.prototype.toString.call(val) === '[object Object]'
-            ) {
+            if (val === '' || val === undefined || Object.prototype.toString.call(val) === '[object Object]') {
               return;
             }
             if ('_begin_with' === rel) {
@@ -115,9 +111,7 @@ export const randomStr = (len = 32) => {
  * 转换枚举值
  */
 export const convertLegacyEnum = (prop, enumObj, defaultValue) => {
-  const enumValue = enumObj.map((i) => i.value).includes(prop)
-    ? prop
-    : enumObj[0].value;
+  const enumValue = enumObj.map((i) => i.value).includes(prop) ? prop : enumObj[0].value;
   if (defaultValue !== undefined) return enumValue || defaultValue;
   return enumValue;
 };
@@ -160,3 +154,28 @@ export const convertSingleValue = (value, single) => {
   }
   return v;
 };
+
+export const compareVersion = (v1, v2) => {
+  v1 = v1.split('.');
+  v2 = v2.split('.');
+  const len = Math.max(v1.length, v2.length);
+
+  while (v1.length < len) {
+    v1.push('0');
+  }
+  while (v2.length < len) {
+    v2.push('0');
+  }
+
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i]);
+    const num2 = parseInt(v2[i]);
+
+    if (num1 > num2) {
+      return 1;
+    } else if (num1 < num2) {
+      return -1;
+    }
+  }
+  return 0;
+};