@cloudbase/weda-ui-mp 3.18.2 → 3.18.3

package/components/form/uploader/index.js

@@ -126,9 +126,14 @@ Component({
         let tempFilePaths = files.tempFilePaths;
         if (typeof callbacks?.beforeUpload === 'function') {
           try {
+            const mgr = wx.getFileSystemManager();
+
             const ret = await callbacks.beforeUpload({
               tempFilePaths: tempFilePaths,
-              base64Uri: files.contents.map((content) => `data:image/jpg;base64,${wx.arrayBufferToBase64(content)}`),
+              base64Uri: files.tempFiles.map((f) => {
+                const content = mgr.readFileSync(f.tempFilePath);
+                return `data:;base64,${wx.arrayBufferToBase64(content)}`;
+              }),
             });
             if (typeof ret === 'boolean') {
               shouldUploadToCos = ret;
@@ -174,7 +179,7 @@ Component({
         // 这里返回的东西会在uploadSuccess回调函数中获取到
         // https://github.com/wechat-miniprogram/weui-miniprogram/blob/a3630575910302e3b94e69fcef266d2b509de650/src/components/uploader/uploader.ts#L149
         // 写死的从返回值的 .urls 获取展示用的url来用。一定要将tempFilePaths透传下去，否则会重新加载然后出现闪白
-        return { urls: files.tempFilePaths, cloudUrls };
+        return { urls: files.tempFilePaths, cloudUrls, file: files.tempFiles };
       } catch (e) {
         wx.showModal({
           title: '上传失败，请重试',
@@ -193,6 +198,7 @@ Component({
       // 小程序自带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({

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

@@ -176,25 +176,13 @@ Component({
       });
     },
     commonFile: function (tempFiles) {
-      // 获取文件内容
-      const mgr = wx.getFileSystemManager();
-      const contents = tempFiles.map((item) => {
-        const fileContent = mgr.readFileSync(item?.tempFilePath);
-
-        return fileContent;
-      });
       const obj = {
         tempFilePaths: tempFiles.map((item) => item.tempFilePath),
         tempFiles: tempFiles,
-        contents,
       };
-      // 触发选中的事件，开发者根据内容来上传文件，上传了把上传的结果反馈到files属性里面
-      this.triggerEvent('select', obj, {});
-      const files = tempFiles.map((item, i) => ({
+      const files = tempFiles.map((item) => ({
         loading: true,
-        url:
-          item.tempFilePaths ||
-          `data:image/jpg;base64,${wx.arrayBufferToBase64(contents[i])}`,
+        url: item.tempFilePath,
       }));
       if (!files || !files.length) return;
       if (typeof this.data.upload === 'function') {
@@ -230,7 +218,7 @@ Component({
                   type: 3,
                   errMsg: 'upload file fail, urls not found',
                 },
-                {}
+                {},
               );
             }
           })
@@ -252,7 +240,7 @@ Component({
                 errMsg: 'upload file fail',
                 error: err,
               },
-              {}
+              {},
             );
           });
       }

package/components/wd-button/index.js

@@ -101,7 +101,7 @@ Component({
     },
     showMessageCard: {
       type: Boolean,
-      value: 'false',
+      value: false,
     },
     appParameter: {
       type: String,
@@ -121,9 +121,7 @@ Component({
       switch (this.data._formType) {
         case 'submit': {
           // 调用父级表单容器的提交
-          parentForm = this.$widget.closest(
-            (w) => w.getConfig?.().componentType === 'form'
-          );
+          parentForm = this.$widget.closest((w) => w.getConfig?.().componentType === 'form');
           if (parentForm.submit) {
             parentForm.submit();
             return;
@@ -136,9 +134,7 @@ Component({
         }
         case 'reset': {
           // 调用父级表单容器的重置
-          parentForm = this.$widget.closest(
-            (w) => w.getConfig?.().componentType === 'form'
-          );
+          parentForm = this.$widget.closest((w) => w.getConfig?.().componentType === 'form');
           if (parentForm.reset) {
             parentForm.reset();
             return;
@@ -154,16 +150,7 @@ Component({
       }
     },
     updateWidgetAPI() {
-      const {
-        text,
-        theme,
-        variant,
-        size,
-        block,
-        disabled,
-        formType,
-        openType,
-      } = this.data;
+      const { text, theme, variant, size, block, disabled, formType, openType } = this.data;
 
       this.setReadonlyAttributes &&
         this.setReadonlyAttributes({
@@ -210,18 +197,14 @@ Component({
       let _size = PROPS_VALUE_MAP.size[size] || size;
       let _theme = PROPS_VALUE_MAP.theme[theme] || theme;
       let _icon = loading ? 'td:loading' : icon;
-      let _iconType =
-        iconType === 'none' && loading ? 'text-with-icon' : iconType;
+      let _iconType = iconType === 'none' && loading ? 'text-with-icon' : iconType;
 
       // 枚举转换
       _theme = convertLegacyEnum(_theme, WD_BUTTON_THEME);
       _size = convertLegacyEnum(_size, WD_BUTTON_SIZE);
       _iconType = convertLegacyEnum(_iconType, WD_BUTTON_ICON_TYPE);
       const _variant = convertLegacyEnum(variant, WD_BUTTON_VARIANT);
-      const _iconPosition = convertLegacyEnum(
-        iconPosition,
-        WD_BUTTON_ICON_POSITION
-      );
+      const _iconPosition = convertLegacyEnum(iconPosition, WD_BUTTON_ICON_POSITION);
       const _formType = convertLegacyEnum(formType, WD_BUTTON_TYPE);
 
       const classes = {
@@ -249,12 +232,9 @@ Component({
       // icon样式
       const iconCls = classNames({
         [`${classPrefix}-btn__icon`]: true,
-        [`${classPrefix}-btn__before-icon`]:
-          iconType === 'text-with-icon' && _iconPosition === 'before',
-        [`${classPrefix}-btn__after-icon`]:
-          iconType === 'text-with-icon' && _iconPosition === 'after',
-        [`${classPrefix}-icon--inherit`]:
-          style?.fontSize && iconSource === 'inner',
+        [`${classPrefix}-btn__before-icon`]: iconType === 'text-with-icon' && _iconPosition === 'before',
+        [`${classPrefix}-btn__after-icon`]: iconType === 'text-with-icon' && _iconPosition === 'after',
+        [`${classPrefix}-icon--inherit`]: style?.fontSize && iconSource === 'inner',
       });
       this.setData({ cls, iconCls, textCls, _icon, _iconType, _formType });
     },

package/components/wd-menu-layout/index.js

@@ -67,7 +67,7 @@ Component({
       this.setData({ visible: false });
     },
     menuClick(params) {
-      this.triggerEvent('menuClick', params);
+      this.triggerEvent('menuClick', { ...params, item: params.detail?.item });
     },
   },
 });

package/package.json

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