@cloudbase/weda-ui-mp 3.20.2 → 3.20.4

package/components/form/uploader/index.js

@@ -2,6 +2,7 @@ import { getCloudInstance, getTempFileURL, getDefaultUploadPath } from '../../..
 import { randomStr } from '../../../utils/platform';
 import { compressImage } from './compress';
 import { isNil } from '../../../utils/lodash';
+import { storageTypeIsHttps } from '../uploaderFile/upload';
 
 Component({
   options: {
@@ -99,6 +100,10 @@ Component({
       type: Object,
       value: null,
     },
+    storageType: {
+      type: String,
+      value: 'cloudID',
+    },
   },
   data: {
     maxCount: 0,
@@ -172,6 +177,17 @@ Component({
             cloudPath,
             filePath,
           });
+          let result = uploadRes.fileID;
+          let file = files?.tempFiles[0];
+          // 小程序自带tempURL 不需要调用 tcb.getTempFileURL 获取
+          if (storageTypeIsHttps(this.data.storageType)) {
+            result = await getTempFileURL(uploadRes.fileID);
+            file = { ...file, url: result };
+          }
+          this.triggerEvent('success', {
+            value: result,
+            file: file,
+          });
           return { fileID: uploadRes.fileID };
         });
         const uploadFileList = await Promise.all(uploadPromise);
@@ -195,11 +211,7 @@ Component({
     },
     uploadSuccess: async function (e) {
       const urls = e.detail.cloudUrls; // uploadFile 获取返回值
-      // 小程序自带tempURL 不需要调用 tcb.getTempFileURL 获取
-      this.triggerEvent('success', {
-        value: this.properties.single ? urls[0] : urls,
-        file: e.detail.file,
-      });
+
       const newUrls = [...this.data.cloudFile, ...urls];
       this.setData({
         files: this.data.files.concat(e.detail.urls.map((url) => ({ url }))),
@@ -228,8 +240,11 @@ Component({
       }
       this.handleChange(newUrls, true);
     },
-    handleChange: function (values, isDelete = false) {
+    handleChange: async function (values, isDelete = false) {
       let value = values;
+      if (storageTypeIsHttps(this.data.storageType)) {
+        value = await Promise.all(values.map((i) => getTempFileURL(i)));
+      }
       if (this.properties.single) {
         value = values[0] ?? '';
       }

package/components/form/uploader/weui-uploader.js

@@ -145,6 +145,7 @@ Component({
         count: this.data.maxCount - this.data.files.length,
         sizeType: this.data.sizeType,
         sourceType: this.data.sourceType,
+        mediaType: 'image',
         success: (res) => {
           // 首先检查文件大小
           let invalidIndex = -1;

package/components/form/uploaderFile/index.js

@@ -80,6 +80,10 @@ Component({
       type: String,
       value: '点击上传',
     },
+    storageType: {
+      type: String,
+      value: 'cloudID',
+    },
   },
   data: {
     maxCount: 0,

package/components/form/uploaderFile/upload.js

@@ -1,5 +1,7 @@
 import { transSize, randomStr } from '../../../utils/platform';
-import { getCloudInstance, getDefaultUploadPath } from '../../../utils/tcb';
+import { getCloudInstance, getDefaultUploadPath, getTempFileURL } from '../../../utils/tcb';
+
+export const storageTypeIsHttps = (storageType) => storageType === 'https';
 
 const ACTION = { CHOOSE_MEDIA: 'chooseMedia', CHOOSE_MESSAGE_FILE: 'chooseMessageFile' };
 
@@ -226,15 +228,16 @@ const handleUploadFile = async ({
 };
 
 export const upload = (uploadInstance) => {
-  const { config, onSuccess, onFail } = uploadInstance;
+  const { config, 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);
+    // 文件选择成功
+    handleUpload(res.tempFiles, uploadInstance);
   };
   const fail = (e) => {
+    // 文件选择失败
     onFail(e);
   };
 
@@ -260,17 +263,35 @@ export const initUploadInstance = ({ action, config, previewFile }, _this) => {
         urls: cloudPathList,
         cloudFile: cloudPathList,
       });
+      const { single, storageType } = _this.data;
       let _value = cloudPathList;
-      if (_this.data.single) {
-        _value = cloudPathList[0] ?? '';
+      if (storageTypeIsHttps(storageType)) {
+        Promise.all(_value.map((i) => getTempFileURL(i))).then((res) => {
+          _value = single ? cloudPathList[0] ?? '' : res;
+          _this.handleChange(_value);
+        });
+      } else {
+        if (single) {
+          _value = cloudPathList[0] ?? '';
+        }
+        _this.handleChange(_value);
       }
-      _this.handleChange(_value);
     },
     onSuccess(res) {
-      _this.triggerEvent('success', {
-        value: res.cloudPath,
-        file: res,
-      });
+      const { storageType } = _this.data;
+      if (storageTypeIsHttps(storageType)) {
+        getTempFileURL(res.cloudPath).then((url) => {
+          _this.triggerEvent('success', {
+            value: url,
+            file: { ...res, url },
+          });
+        });
+      } else {
+        _this.triggerEvent('success', {
+          value: res.cloudPath,
+          file: res,
+        });
+      }
     },
     onFail(e) {
       _this.triggerEvent('error', e);

package/components/richText/index.wxss

@@ -68,3 +68,7 @@
 .weda-RichTextView ._img {
   vertical-align: middle;
 }
+
+.weda-RichTextView .p {
+  min-height: 1em;
+}

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

@@ -30,6 +30,10 @@ Component({
       type: String,
       value: '点击上传',
     },
+    storageType: {
+      type: String,
+      value: 'cloudID',
+    },
   },
   methods: {
     initValue: function () {

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

@@ -36,6 +36,7 @@
       callbacks="{{callbacks}}"
       uploadButtonText="{{uploadButtonText}}"
       uploadTipText="{{uploadTipText}}"
+      storageType="{{storageType}}"
     />
   </wd-form-item>
 </block>

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

@@ -3,7 +3,8 @@ 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';
+import { upload, storageTypeIsHttps } from '../form/uploaderFile/upload';
+import { getTempFileURL } from '../../utils/tcb';
 
 Component({
   options: {
@@ -44,11 +45,15 @@ Component({
       type: String,
       value: 'normal',
     },
+    storageType: {
+      type: String,
+      value: 'cloudID',
+    },
   },
   data: {
     files: [],
     uploadInstance: {},
-    config: { count: 9, maxDuration: 60 },
+    config: { count: 9, maxDuration: 60, mediaType: 'image' },
   },
   methods: {
     initValue: function () {
@@ -87,17 +92,35 @@ Component({
             files,
           });
           const cloudPathList = files.map((i) => i.cloudId).filter((j) => !!j);
+          const { single, storageType } = _this.data;
           let _value = cloudPathList;
-          if (_this.data.single) {
-            _value = cloudPathList[0] ?? '';
+          if (storageTypeIsHttps(storageType)) {
+            Promise.all(_value.map((i) => getTempFileURL(i))).then((res) => {
+              _value = single ? cloudPathList[0] ?? '' : res;
+              _this.handleChange({ detail: { value: _value } });
+            });
+          } else {
+            if (single) {
+              _value = cloudPathList[0] ?? '';
+            }
+            _this.handleChange({ detail: { value: _value } });
           }
-          _this.handleChange({ detail: { value: _value } });
         },
         onSuccess(res) {
-          _this.triggerEvent('success', {
-            value: res.cloudPath,
-            file: res,
-          });
+          const { storageType } = _this.data;
+          if (storageTypeIsHttps(storageType)) {
+            getTempFileURL(res.cloudPath).then((url) => {
+              _this.triggerEvent('success', {
+                value: url,
+                file: { ...res, url },
+              });
+            });
+          } else {
+            _this.triggerEvent('success', {
+              value: res.cloudPath,
+              file: res,
+            });
+          }
         },
         onFail(e) {
           _this.triggerEvent('error', e);
@@ -163,13 +186,14 @@ Component({
     'name, value, label, required, visible, disabled, readOnly, sourceType': function () {
       this.updateWidgetAPI();
     },
-    'disabled,sourceType,maxUploadCount,sizeType,maxSize,single': function (
+    'disabled,sourceType,maxUploadCount,sizeType,maxSize,single,storageType': function (
       disabled,
       sourceType,
       maxUploadCount,
       sizeType,
       maxSize,
       single,
+      storageType,
     ) {
       const config = {
         disabled,
@@ -178,6 +202,7 @@ Component({
         sizeType,
         maxSize,
         single,
+        storageType,
       };
       this.setConfig(config);
     },

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

@@ -39,6 +39,7 @@
       compressQuality="{{compressQuality}}"
       compressedHeight="{{compressedHeight}}"
       compressedWidth="{{compressedWidth}}"
+      storageType="{{storageType}}"
       callbacks="{{callbacks}}"
       bind:change="handleChange"
       sourceType="{{sourceType}}"

package/package.json

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