@cloudbase/weda-ui-mp 3.15.8 → 3.17.0

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/richText/copy/index.wxss

@@ -1,49 +1,46 @@
 @font-face {
-    font-family: WdTd;
-    src: url("t.eot"), url("t_iefix.eot") format("embedded-opentype"),
-      url("t.woff") format("woff"), url("t.ttf") format("truetype"),
-      url("t.svg") format("svg"),
-      url("https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.eot"),
-      url("https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t_iefix.eot")
-        format("embedded-opentype"),
-      url("https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.woff")
-        format("woff"),
-      url("https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.ttf")
-        format("truetype"),
-      url("https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.svg")
-        format("svg");
-    font-weight: 400;
-    font-style: normal;
-  }
- .wd-markdown {
-    padding: 1rem;
-  }
-  .markdown-it-code-wrap {
-    position: relative;
-  }
-  .markdown-it-code-copy {
-    font-family: WdTd !important;
-    vertical-align: middle;
-    font-size: 14px;
-    border: none;
-    background: transparent;
-    position: absolute; top: 7.5px; right: 6px; cursor: pointer; outline: none;
-  }
-  i.markdown-it-code-copy {
-    font-style: normal;
-  }
-  .markdown-it-code-copy::before {
-    content: '\E1AC';
-    position: absolute;
-    top: 0;
-    right: 0;
-    cursor: pointer;
-    width: 20px;
-    height: 20px;
-    display: inline-block;
-    text-align: center;
-  }
-  .markdown-it-code-copy:hover::before {
-    background: #eef1f4;
-  }
-  
+  font-family: WdTd;
+  src: url('t.eot'), url('t_iefix.eot') format('embedded-opentype'), url('t.woff') format('woff'),
+    url('t.ttf') format('truetype'), url('t.svg') format('svg'),
+    url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.eot'),
+    url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t_iefix.eot')
+      format('embedded-opentype'),
+    url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.woff') format('woff'),
+    url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.ttf') format('truetype'),
+    url('https://comp-public-replace-1303824488-cos.weda.tencent.com/icon/0.0.7/t.svg') format('svg');
+  font-weight: 400;
+  font-style: normal;
+}
+.wd-markdown {
+  padding: 1rem;
+}
+.markdown-it-code-wrap {
+  position: relative;
+}
+.markdown-it-code-copy {
+  font-family: WdTd !important;
+  vertical-align: middle;
+  font-size: 14px;
+  border: none;
+  background: transparent;
+  position: absolute;
+  top: 7.5px;
+  right: 6px;
+  outline: none;
+}
+i.markdown-it-code-copy {
+  font-style: normal;
+}
+.markdown-it-code-copy::before {
+  content: '\E1AC';
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 20px;
+  height: 20px;
+  display: inline-block;
+  text-align: center;
+}
+.markdown-it-code-copy:hover::before {
+  background: #eef1f4;
+}

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-select/index.js

@@ -3,10 +3,10 @@ import formFieldBehavior from '../form-field-behavior/form-field-behavior';
 import itemBehavior from '../form-field-behavior/item-behavior';
 import { convertFixedIcon, SELECT_ICON_H5 } from '../../utils/getFormLegacy';
 import debounce from '../../utils/debounce';
-import { safeObj, arrayToMap, getSelected } from '../../utils/tool';
+import { arrayToMap, getSelected } from '../../utils/tool';
 
 Component({
-  options: { virtualHost: true },
+  options: { virtualHost: true, styleIsolation: 'shared' },
   behaviors: [itemBehavior, commonCompBehavior, formFieldBehavior],
   properties: {
     classRoot: {
@@ -25,9 +25,16 @@ Component({
       type: Array,
       value: [],
     },
+    searchable: {
+      type: Boolean,
+      value: true,
+    },
+    filterable: {
+      type: Boolean,
+      value: false,
+    },
   },
   data: {
-    options: [],
     itemMap: {},
     selectedLabel: null,
     selectedItem: null,
@@ -45,16 +52,18 @@ Component({
         });
       this.updateWidgetAPI();
     },
-    changeOptions: function (e) {
-      const { options } = safeObj(e.detail.value);
-      this.setData({ options });
-    },
     search: function (e) {
       this.debouncedTriggerSearchEvent(e.detail.value);
     },
     debouncedTriggerSearchEvent: debounce(function (value) {
       this.triggerEvent('search', { value });
     }),
+    updateSelect: function (e) {
+      const { value, option } = e.detail;
+      const itemMap = arrayToMap(option, 'value');
+      const { selectedLabel, selectedItem } = getSelected(itemMap, value, false);
+      this.setData({ selectedLabel, selectedItem });
+    },
   },
   observers: {
     'name, value, label, required, visible, disabled, readOnly, before, after, primaryField, selectedLabel, selectedItem':
@@ -65,13 +74,8 @@ Component({
       const [_suffixType, _suffixIcon] = convertFixedIcon(suffixType, suffixIcon, SELECT_ICON_H5);
       this.setData({ _suffixType, _suffixIcon });
     },
-    options: function (options) {
-      const itemMap = arrayToMap(options, 'value');
-      this.setData({ itemMap });
-    },
-    'itemMap, value': function (itemMap, value) {
-      const { selectedLabel, selectedItem } = getSelected(itemMap, value, false);
-      this.setData({ selectedLabel, selectedItem });
+    range: function (range) {
+      this.updateSelect({ detail: { value: this.data.value, option: range } });
     },
   },
   lifetimes: {

package/components/wd-select/index.wxml

@@ -22,6 +22,9 @@
     <wd-input-group before="{{before}}" after="{{after}}" block="{{true}}" size="{{_size}}" classRoot="{{classRoot}}" readOnly="{{readOnly}}">
       <wd-input-wrap block="{{block}}" classRoot="{{classRoot}}" before="{{before}}" after="{{after}}" disabled="{{disabled}}" prefixType="{{prefixType}}" prefixIcon="{{prefixIcon}}" prefixSrc="{{prefixSrc}}" suffixType="{{_suffixType}}" suffixIcon="{{_suffixIcon}}" suffixSrc="{{suffixSrc}}" hasClearIcon="{{hasClearIcon}}" bind:onClear="handleClear" readOnly="{{readOnly}}">
         <old-select
+          multiple="{{false}}"
+          searchable="{{searchable}}"
+          filterable="{{filterable}}"
           supportManyRelated="{{supportManyRelated}}"
           queryCondition="{{queryCondition}}"
           sorter="{{sorter}}"
@@ -30,7 +33,7 @@
           label=""
           defaultValue="{{value}}"
           enumName="{{enumName}}"
-          format="{{format === 'many-one' ? 'father-son' : format}}"
+          format="{{format}}"
           placeholder="{{placeholder}}"
           primaryField="{{primaryField}}"
           range="{{range}}"
@@ -44,10 +47,11 @@
           version="wd"
           mode="selector"
           ignoreCase="{{ignoreCase}}"
-          staticSearchable="{{staticSearchable}}"
           bind:change="handleChange"
-          bind:changeOptions="changeOptions"
+          bind:updateSelect="updateSelect"
           bind:search="search"
+          bind:focus="handleEvent"
+          bind:blur="handleEvent"
         />
       </wd-input-wrap>
     </wd-input-group>