@cloudbase/weda-ui-mp 3.18.2 → 3.18.4

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

@@ -7,13 +7,7 @@ import { convertSize } from '../../utils/getFormLegacy';
 import classNames from '../../utils/classnames';
 import { commonCompBehavior } from '../../utils/common-behavior';
 import formFieldBehavior from '../form-field-behavior/form-field-behavior';
-import {
-  dealDecimals,
-  strNumAddCalc,
-  isNumber,
-  dealPercent,
-  getPercentUnit,
-} from './number';
+import { dealDecimals, strNumAddCalc, isNumber, dealPercent, getPercentUnit } from './number';
 import equal from '../../utils/deepEqual';
 
 const getHasClearIcon = (clearable, focus, disabled, readOnly, realValue) =>
@@ -26,12 +20,7 @@ const getRealValue = ({ value, format }) => {
   return Number(v.replace(/,/g, ''));
 };
 
-const judgeRule = ({
-  value = undefined,
-  max = undefined,
-  min = undefined,
-  resultType = 'boolean',
-} = {}) => {
+const judgeRule = ({ value = undefined, max = undefined, min = undefined, resultType = 'boolean' } = {}) => {
   let maxFit = true;
   let minFit = true;
   if (isNumber(max)) {
@@ -45,12 +34,7 @@ const judgeRule = ({
   return resultType === 'boolean' ? maxFit && minFit : { maxFit, minFit };
 };
 
-const getRuleMessage = ({
-  value = undefined,
-  max = undefined,
-  min = undefined,
-  validMsgObj = {},
-} = {}) => {
+const getRuleMessage = ({ value = undefined, max = undefined, min = undefined, validMsgObj = {} } = {}) => {
   const { maxFit, minFit } = judgeRule({
     value,
     max,
@@ -129,7 +113,7 @@ Component({
     inputWrap: `${WD_PREFIX}-form-input-wrap`,
     inputCls: `${WD_PREFIX}-form-input-wrap__input`,
     inputGroup: `${WD_PREFIX}-form-input-group`,
-    placeholderCls: `${WD_PREFIX}-form-input-wrap__placeholder`,
+    placeholderCls: `${WD_PREFIX}-form-input-wrap__placeholder weui-input__placeholder`,
     cls: '',
     formClass: '',
 
@@ -147,21 +131,8 @@ Component({
   },
   methods: {
     updateWidgetAPI: function () {
-      const {
-        name,
-        label,
-        required,
-        visible,
-        disabled,
-        readOnly,
-        before,
-        after,
-        min,
-        max,
-        step,
-        format,
-        value,
-      } = this.data;
+      const { name, label, required, visible, disabled, readOnly, before, after, min, max, step, format, value } =
+        this.data;
       this.setReadonlyAttributes?.({
         name,
         value,
@@ -186,20 +157,12 @@ Component({
     },
     onRealChange(e, type = '', { needSetData = true, value = '' } = {}) {
       const { readOnly, disabled, status, format, step } = this.properties;
-      if (readOnly || disabled || (status && status !== 'edit'))
-        return this.data.realValue;
+      if (readOnly || disabled || (status && status !== 'edit')) return this.data.realValue;
 
-      const { stepPlusDisabled, stepMinusDisabled } = this.getStepDisabled(
-        null,
-        this.data.realValue
-      );
+      const { stepPlusDisabled, stepMinusDisabled } = this.getStepDisabled(null, this.data.realValue);
 
       if (['plus', 'minus'].includes(type)) {
-        if (
-          !isNumber(step) ||
-          (type === 'plus' && stepPlusDisabled) ||
-          (type === 'minus' && stepMinusDisabled)
-        ) {
+        if (!isNumber(step) || (type === 'plus' && stepPlusDisabled) || (type === 'minus' && stepMinusDisabled)) {
           needSetData &&
             this.setData({
               stepPlusDisabled,
@@ -263,10 +226,7 @@ Component({
         return;
       }
 
-      const reg = new RegExp(
-        `^\\D*(\\d*(?:\\.\\d{0,${Math.max(0, 10000)}})?).*$`,
-        'g'
-      );
+      const reg = new RegExp(`^\\D*(\\d*(?:\\.\\d{0,${Math.max(0, 10000)}})?).*$`, 'g');
       value = value.replace(reg, '$1');
 
       if (e.detail.value.startsWith('-')) {
@@ -313,10 +273,8 @@ Component({
         stepPlusDisabled = true;
         stepMinusDisabled = true;
       } else {
-        stepPlusDisabled =
-          isNumber(+realValue) && isNumber(max) && max <= +realValue;
-        stepMinusDisabled =
-          isNumber(+realValue) && isNumber(min) && min >= +realValue;
+        stepPlusDisabled = isNumber(+realValue) && isNumber(max) && max <= +realValue;
+        stepMinusDisabled = isNumber(+realValue) && isNumber(min) && min >= +realValue;
       }
 
       return { stepPlusDisabled, stepMinusDisabled };
@@ -334,7 +292,7 @@ Component({
 
       const { stepPlusDisabled, stepMinusDisabled } = this.getStepDisabled(
         { readOnly, disabled, status, max, min, format },
-        toReal
+        toReal,
       );
 
       const readValue = `${toShow}${getPercentUnit(format)}`;
@@ -342,17 +300,7 @@ Component({
       return { toShow, toReal, stepPlusDisabled, stepMinusDisabled, readValue };
     },
     // 获取显示在输入框的值，非真实值
-    getShowValue({
-      value,
-      thousandShow,
-      decimals,
-      step,
-      max,
-      min,
-      format,
-      type = '',
-      needSetData = true,
-    }) {
+    getShowValue({ value, thousandShow, decimals, step, max, min, format, type = '', needSetData = true }) {
       if (value === '' && !['plus', 'minus'].includes(type)) return '';
 
       if (value === 'null' || value === 'undefined') return '';
@@ -362,9 +310,7 @@ Component({
       let res = `${value}`;
 
       if (isNumber(value) && res.includes('e')) {
-        res = `${res.startsWith('-') ? '-' : ''}${res
-          .replace(/^-/, '')
-          .toLocaleString()}`;
+        res = `${res.startsWith('-') ? '-' : ''}${res.replace(/^-/, '').toLocaleString()}`;
       }
 
       res = res.replace(/ /g, '').replace(/,/g, '');
@@ -383,11 +329,7 @@ Component({
       }
 
       const validMsgObj = getValidMsgObj(format, max, min);
-      const rules = getRules(
-        validMsgObj,
-        this.properties.max,
-        this.properties.min
-      );
+      const rules = getRules(validMsgObj, this.properties.max, this.properties.min);
 
       if (isNumber(this.properties.max) && Number(res) > max) {
         validState = 'error';
@@ -406,9 +348,7 @@ Component({
       // 千分符转换
       if (thousandShow && res !== 'Infinity' && res !== '-Infinity') {
         const temp = res.split('.');
-        res = `${temp[0].replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}${
-          temp[1] ? `.${temp[1]}` : ''
-        }`;
+        res = `${temp[0].replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}${temp[1] ? `.${temp[1]}` : ''}`;
       }
 
       needSetData &&
@@ -422,118 +362,89 @@ Component({
     },
   },
   observers: {
-    'name,value,label,required,visible,disabled,readOnly,before,after,min,max,step,format':
-      function () {
-        this.updateWidgetAPI();
-      },
-    'disabled,readOnly,clearable,isFocus': function (
+    'name,value,label,required,visible,disabled,readOnly,before,after,min,max,step,format': function () {
+      this.updateWidgetAPI();
+    },
+    'disabled,readOnly,clearable,isFocus': function (disabled, readOnly, clearable, isFocus) {
+      const hasClearIcon = getHasClearIcon(clearable, isFocus, disabled, readOnly, this.data.realValue);
+      this.setData({ hasClearIcon });
+    },
+    'disabled,size,wrapClassName,before,after,classRoot,className,stepOption': function (
       disabled,
-      readOnly,
-      clearable,
-      isFocus
+      size,
+      wrapClassName,
+      before,
+      after,
+      classRoot,
+      className,
+      stepOption,
     ) {
-      const hasClearIcon = getHasClearIcon(
-        clearable,
-        isFocus,
-        disabled,
-        readOnly,
-        this.data.realValue
+      const _size = convertSize(size);
+      const { classPrefix, inputWrap } = this.data;
+      const root = `${classPrefix}-${classRoot}`;
+      const cls = classNames(
+        root,
+        inputWrap,
+        this.data.inputGroup,
+        wrapClassName,
+        `size-width-${_size}`,
+        `size-font-${_size}`,
+        `size-height-${_size}`,
+        `${root}-${classRoot}`,
+        {
+          'is-not-h5': true,
+          'size-width-hundred': true,
+          'is-disabled': disabled,
+          [`${classPrefix}-input-number-input-number`]: true,
+          [`${classPrefix}-form-input-wrap--no-border`]: stepOption !== 'both',
+          [`${inputWrap}--no-radius-left`]: before,
+          [`${inputWrap}--no-radius-right`]: after,
+          [`${inputWrap}--no-radius`]: before && after,
+          [`${classPrefix}-form-input-wrap`]: true,
+        },
       );
-      this.setData({ hasClearIcon });
+      const formClass = classNames(className, `${root}--row`, stepOption !== 'both' ? 'input-number-step-right' : '');
+
+      this.setData({ cls, root, _size, formClass });
     },
-    'disabled,size,wrapClassName,before,after,classRoot,className,stepOption':
-      function (
-        disabled,
-        size,
-        wrapClassName,
-        before,
-        after,
-        classRoot,
-        className,
-        stepOption
-      ) {
-        const _size = convertSize(size);
-        const { classPrefix, inputWrap } = this.data;
-        const root = `${classPrefix}-${classRoot}`;
-        const cls = classNames(
-          root,
-          inputWrap,
-          this.data.inputGroup,
-          wrapClassName,
-          `size-width-${_size}`,
-          `size-font-${_size}`,
-          `size-height-${_size}`,
-          `${root}-${classRoot}`,
-          {
-            'is-not-h5': true,
-            'size-width-hundred': true,
-            'is-disabled': disabled,
-            [`${classPrefix}-input-number-input-number`]: true,
-            [`${classPrefix}-form-input-wrap--no-border`]:
-              stepOption !== 'both',
-            [`${inputWrap}--no-radius-left`]: before,
-            [`${inputWrap}--no-radius-right`]: after,
-            [`${inputWrap}--no-radius`]: before && after,
-            [`${classPrefix}-form-input-wrap`]: true,
-          }
-        );
-        const formClass = classNames(
-          className,
-          `${root}--row`,
-          stepOption !== 'both' ? 'input-number-step-right' : ''
-        );
-
-        this.setData({ cls, root, _size, formClass });
-      },
-    'inputValue,format,decimals,min,max,status,readOnly,disabled,after,before,thousandShow,step':
-      function (
-        inputValue,
+    'inputValue,format,decimals,min,max,status,readOnly,disabled,after,before,thousandShow,step': function (
+      inputValue,
+      format,
+      decimals,
+      min,
+      max,
+      status,
+      readOnly,
+      disabled,
+      after,
+      before,
+      thousandShow,
+      step,
+    ) {
+      const { toReal, toShow, stepPlusDisabled, stepMinusDisabled, readValue } = this.getRealAndShowData({
+        value: this.data.isInit ? (isNumber(inputValue) ? inputValue : '') : this.data.realValue,
         format,
         decimals,
         min,
         max,
-        status,
         readOnly,
         disabled,
-        after,
+        status,
         before,
+        after,
         thousandShow,
-        step
-      ) {
-        const {
-          toReal,
-          toShow,
-          stepPlusDisabled,
-          stepMinusDisabled,
-          readValue,
-        } = this.getRealAndShowData({
-          value: this.data.isInit
-            ? isNumber(inputValue)
-              ? inputValue
-              : ''
-            : this.data.realValue,
-          format,
-          decimals,
-          min,
-          max,
-          readOnly,
-          disabled,
-          status,
-          before,
-          after,
-          thousandShow,
-          step,
-        });
+        step,
+      });
 
-        this.setData({
-          readValue,
-          realValue: toReal,
-          showValue: readOnly ? readValue : toShow,
-          stepPlusDisabled,
-          stepMinusDisabled,
-        });
-        this.changeForm({ value: toReal });
-      },
+      this.setData({
+        readValue,
+        realValue: toReal,
+        showValue: readOnly ? readValue : toShow,
+        stepPlusDisabled,
+        stepMinusDisabled,
+      });
+      this.changeForm({ value: toReal });
+    },
     // 监听非输入引起的value变化，比如调用 setValue, clearValue
     value: function (value) {
       const { format } = this.properties;
@@ -573,8 +484,9 @@ Component({
     },
     inputValue: function (inputValue) {
       if (equal(inputValue, this.data._oldInputValue)) return;
-      const { toReal, toShow, stepPlusDisabled, stepMinusDisabled, readValue } =
-        this.getRealAndShowData({ value: inputValue });
+      const { toReal, toShow, stepPlusDisabled, stepMinusDisabled, readValue } = this.getRealAndShowData({
+        value: inputValue,
+      });
 
       this.setData({
         readValue,

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/components/wd-time/index.wxml

@@ -25,7 +25,7 @@
   >
     <wd-input-group before="{{before}}" after="{{after}}" block="{{true}}" size="{{_size}}" classRoot="{{classRoot}}">
       <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="{{clearable && !disabled && (value != null)}}" bind:onClear="handleClear">
-        <input class="{{classPrefix}}-form-select_input" placeholder="{{placeholder}}" value="{{readValue}}" disabled="true" name="{{name}}" bindtap="setPickerVisible" />
+        <input placeholder-class="weui-input__placeholder" class="{{classPrefix}}-form-select_input" placeholder="{{placeholder}}" value="{{readValue}}" disabled="true" name="{{name}}" bindtap="setPickerVisible" />
       </wd-input-wrap>
     </wd-input-group>
   </wd-form-item>

package/package.json

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