@cloudbase/weda-ui-mp 3.18.8 → 3.20.0

package/components/lottery/index.js

@@ -138,6 +138,10 @@ Component({
       type: Array,
       value: [],
     },
+    duration: {
+      type: Number,
+      value: 2000,
+    },
   },
   lifetimes: {
     attached() {
@@ -153,7 +157,7 @@ Component({
     },
     clickLotteryButton: function (_, force) {
       const { lotteryList } = this.data;
-      const { prizeResult, enablePrize, clickLotteryEnable } = this.properties;
+      const { prizeResult, enablePrize, clickLotteryEnable, duration } = this.properties;
       //触发外部事件
       this.triggerEvent('clickLotteryButton', {});
 
@@ -178,10 +182,7 @@ Component({
       let intervalId = setInterval(() => {
         //再次获取抽奖结果
         let prizeResultNew = this.properties.prizeResult;
-        if (
-          prizeResultNew == null ||
-          (!this.properties.enablePrize && !force)
-        ) {
+        if (prizeResultNew == null || (!this.properties.enablePrize && !force)) {
           //如果是禁止，立马停止
           clearInterval();
           this.setData({
@@ -261,7 +262,7 @@ Component({
       // eslint-disable-next-line rulesdir/no-timer
       setTimeout(() => {
         isTimeout = true;
-      }, 3000);
+      }, duration);
     },
   },
   observers: {
@@ -293,7 +294,7 @@ Component({
         list.map(async (item) => {
           const src = await getTempFileURL(item.src);
           return { ...item, src };
-        })
+        }),
       );
       this.setData({
         lotteryList: realList,

package/components/wd-form-arr/index.js

@@ -72,9 +72,9 @@ Component({
          * 用于同步子组件的默认值
          * @param params
          */
-        __setValueImmediate__(params) {
-          that.changeByChildFormObj(params);
-        },
+        // __setValueImmediate__(params) {
+        //   that.changeByChildFormObj(params);
+        // },
         /**
          * 嵌套表单内部子组件值改变时，触发嵌套表单组件的值更新
          * @param params.name 子组件名称
@@ -269,16 +269,16 @@ Component({
         parentForm?.updateFormContext();
       }
 
-      if (params.name) {
-        // 触发父级嵌套表单值更新
-        parentFormObj?.__setValueImmediate__?.({
-          name: params.name,
-          value: params.value,
-        });
-      } else if (parentFormObj?.formObjName) {
-        // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
-        parentFormObj?.__setValueImmediate__?.({ name, value });
-      }
+      // if (params.name) {
+      //   // 触发父级嵌套表单值更新
+      //   parentFormObj?.__setValueImmediate__?.({
+      //     name: params.name,
+      //     value: params.value,
+      //   });
+      // } else if (parentFormObj?.formObjName) {
+      //   // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
+      //   parentFormObj?.__setValueImmediate__?.({ name, value });
+      // }
     },
     /**
      * 子组件默认值变更，触发嵌套表单值更新
@@ -286,41 +286,36 @@ Component({
      * @param params.value
      */
     changeByChildFormObj(params) {
-      const { objValue, name } = this.data;
-      const value = deepClone(objValue);
-      lodashSet(value, getValueName(params.name, name), params.value);
-
-      const tempValue = this.getTempValue(value);
-
-      const tempObjValue = this.getTempValue(objValue);
-      if (equal(tempValue, tempObjValue)) {
-        return;
-      }
-      this.setData({ objValue: value || [] });
-
-      const parentFormObj = this.getParentFormObj();
-      const parentForm = this.getParentForm();
-
-      if (params.name) {
-        // 判断是否将当前的name前缀加上，以便父级嵌套表单更新值
-        const nameTemp = `${!params.name.startsWith(name) && name ? `${name}.` : ''}${params.name}`;
-        // 将值同步给父级嵌套表单
-        parentFormObj?.__setValueImmediate__?.({
-          name: nameTemp,
-          value: params.value,
-        });
-      } else if (parentFormObj?.formObjName) {
-        // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
-        parentFormObj?.__setValueImmediate__?.({ name, value });
-      }
-
-      if (!parentFormObj && parentForm) {
-        // 触发父级普通表单值更新
-        // 子组件向上同步值，不调用setValue
-        // parentForm?.setValue?.({ [name]: value }, false, true);
-        // 刷新父级普通表单的formData
-        parentForm?.updateFormContext();
-      }
+      // const { objValue, name } = this.data;
+      // const value = deepClone(objValue);
+      // lodashSet(value, getValueName(params.name, name), params.value);
+      // const tempValue = this.getTempValue(value);
+      // const tempObjValue = this.getTempValue(objValue);
+      // if (equal(tempValue, tempObjValue)) {
+      //   return;
+      // }
+      // this.setData({ objValue: value || [] });
+      // const parentFormObj = this.getParentFormObj();
+      // const parentForm = this.getParentForm();
+      // if (params.name) {
+      //   // 判断是否将当前的name前缀加上，以便父级嵌套表单更新值
+      //   const nameTemp = `${!params.name.startsWith(name) && name ? `${name}.` : ''}${params.name}`;
+      //   // 将值同步给父级嵌套表单
+      //   parentFormObj?.__setValueImmediate__?.({
+      //     name: nameTemp,
+      //     value: params.value,
+      //   });
+      // } else if (parentFormObj?.formObjName) {
+      //   // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
+      //   parentFormObj?.__setValueImmediate__?.({ name, value });
+      // }
+      // if (!parentFormObj && parentForm) {
+      //   // 触发父级普通表单值更新
+      //   // 子组件向上同步值，不调用setValue
+      //   // parentForm?.setValue?.({ [name]: value }, false, true);
+      //   // 刷新父级普通表单的formData
+      //   parentForm?.updateFormContext();
+      // }
     },
   },
   observers: {

package/components/wd-form-obj/index.js

@@ -61,9 +61,9 @@ Component({
          * 用于同步子组件的默认值
          * @param params
          */
-        __setValueImmediate__(params) {
-          that.changeByChildFormObj(params);
-        },
+        // __setValueImmediate__(params) {
+        //   that.changeByChildFormObj(params);
+        // },
         /**
          * 嵌套表单内部子组件值改变时，触发嵌套表单组件的值更新
          * @param params.name 子组件名称
@@ -213,16 +213,16 @@ Component({
         parentForm?.updateFormContext();
       }
 
-      if (params.name) {
-        // 触发父级嵌套表单值更新
-        parentFormObj?.__setValueImmediate__?.({
-          name: params.name,
-          value: params.value,
-        });
-      } else if (parentFormObj?.formObjName) {
-        // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
-        parentFormObj?.__setValueImmediate__?.({ name, value });
-      }
+      // if (params.name) {
+      //   // 触发父级嵌套表单值更新
+      //   parentFormObj?.__setValueImmediate__?.({
+      //     name: params.name,
+      //     value: params.value,
+      //   });
+      // } else if (parentFormObj?.formObjName) {
+      //   // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
+      //   parentFormObj?.__setValueImmediate__?.({ name, value });
+      // }
 
       this.triggerOnDataChange(value);
     },
@@ -231,42 +231,42 @@ Component({
      * @param params.name
      * @param params.value
      */
-    changeByChildFormObj(params) {
-      const { objValue, name } = this.data;
-      const value = deepClone(objValue);
-      lodashSet(value, getValueName(params.name, name), params.value);
+    // changeByChildFormObj(params) {
+    //   const { objValue, name } = this.data;
+    //   const value = deepClone(objValue);
+    //   lodashSet(value, getValueName(params.name, name), params.value);
 
-      if (equal(value, objValue)) {
-        return;
-      }
+    //   if (equal(value, objValue)) {
+    //     return;
+    //   }
 
-      const parentFormObj = this.getParentFormObj();
-      const parentForm = this.getParentForm();
+    //   const parentFormObj = this.getParentFormObj();
+    //   const parentForm = this.getParentForm();
 
-      if (params.name) {
-        // 判断是否将当前的name前缀加上，以便父级嵌套表单更新值
-        const nameTemp = `${!params.name.startsWith(name) && name ? `${name}.` : ''}${params.name}`;
-        // 将值同步给父级嵌套表单
-        parentFormObj?.__setValueImmediate__?.({
-          name: nameTemp,
-          value: params.value,
-        });
-      } else if (parentFormObj?.formObjName) {
-        // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
-        parentFormObj?.__setValueImmediate__?.({ name, value });
-      }
+    //   if (params.name) {
+    //     // 判断是否将当前的name前缀加上，以便父级嵌套表单更新值
+    //     const nameTemp = `${!params.name.startsWith(name) && name ? `${name}.` : ''}${params.name}`;
+    //     // 将值同步给父级嵌套表单
+    //     parentFormObj?.__setValueImmediate__?.({
+    //       name: nameTemp,
+    //       value: params.value,
+    //     });
+    //   } else if (parentFormObj?.formObjName) {
+    //     // 外部直接调用formObj.setValue的情况下，触发父级嵌套表单值更新
+    //     parentFormObj?.__setValueImmediate__?.({ name, value });
+    //   }
 
-      if (!parentFormObj && parentForm) {
-        // 触发父级普通表单值更新
-        // 子组件向上同步值，不调用setValue
-        // parentForm?.setValue?.({ [name]: value }, false, true);
-        // 刷新父级普通表单的formData
-        parentForm?.updateFormContext();
-      }
+    //   if (!parentFormObj && parentForm) {
+    //     // 触发父级普通表单值更新
+    //     // 子组件向上同步值，不调用setValue
+    //     // parentForm?.setValue?.({ [name]: value }, false, true);
+    //     // 刷新父级普通表单的formData
+    //     parentForm?.updateFormContext();
+    //   }
 
-      this.setData({ objValue: value || {} });
-      this.updateWidgetAPI();
-    },
+    //   this.setData({ objValue: value || {} });
+    //   this.updateWidgetAPI();
+    // },
   },
   observers: {
     'disabled, readOnly': function (disabled, readOnly) {

package/components/wd-input/inner-input/index.js

@@ -35,7 +35,7 @@ Component({
     placeholderCls: `${WD_PREFIX}-form-input-wrap__placeholder weui-input__placeholder`,
     cls: '',
     currentInputValue: '',
-    _hasClearIcon: false,
+    hasClearIcon: false,
     isFocus: false,
     counter: 0,
 
@@ -102,9 +102,9 @@ Component({
   },
   observers: {
     'disabled,clearable,isFocus,currentInputValue': function (disabled, clearable, isFocus, currentInputValue) {
-      const _hasClearIcon = clearable && isFocus && !disabled && currentInputValue?.length > 0;
+      const hasClearIcon = clearable && isFocus && !disabled && currentInputValue?.length > 0;
       const counter = typeof currentInputValue === 'string' ? currentInputValue.length : 0;
-      this.setData({ _hasClearIcon, counter });
+      this.setData({ hasClearIcon, counter });
     },
     'disabled,size,classRoot,wrapClassName,before,after': function (
       disabled,

package/components/wd-input/inner-input/index.wxml

@@ -56,14 +56,14 @@
         </view>
 
         <!-- 清除按钮 -->
-        <block wx:if="{{_hasClearIcon}}">
-          <view class="{{inputWrap}}__after" >
+        <block wx:if="{{hasClearIcon}}">
+          <view class="{{inputWrap}}__after">
             <wd-icon className="{{classPrefix}}-icon__trigger" name="td:close-circle-filled" size="{{iconSize}}" bind:touchstart="handleClear"></wd-icon>
           </view>
         </block>
 
         <!-- 后缀图标 -->
-        <block wx:if="{{!_hasClearIcon && suffixType}}">
+        <block wx:if="{{!hasClearIcon && suffixType}}">
           <view class="{{inputWrap}}__after" data-type="suffix" bind:tap="inputAdornmentClick">
             <wd-icon name="{{suffixIcon}}" type="{{suffixType}}" src="{{suffixSrc}}" size="{{iconSize}}" className="{{root}}__icon-after"></wd-icon>
           </view>

package/components/wd-modal/index.js

@@ -76,7 +76,7 @@ Component({
      * 控制弹窗打开/关闭
      * @param {Boolean} isOpen
      */
-    dealShow(isOpen, params, isTrigger = true) {
+    dealShow(isOpen, params) {
       let setImmediately = {
         maskPreToShow: true,
         isMaskShow: !isOpen,
@@ -92,9 +92,8 @@ Component({
       }
 
       this.setData(setImmediately);
-      if (isTrigger) {
-        this.triggerEvent(isOpen ? 'open' : 'close', params);
-      }
+
+      this.triggerEvent(isOpen ? 'open' : 'close', params);
     },
     /**
      * 关闭弹窗
@@ -163,9 +162,6 @@ Component({
         modalBdClasses,
       });
     },
-    defaultShow: function (defaultShow) {
-      this.dealShow(defaultShow, {}, false);
-    },
     'isBdShow,openInfo,closeInfo': function () {
       this.updateWidgetAPI();
     },

package/components/wd-textarea/index.js

@@ -26,6 +26,7 @@ Component({
     placeholderCls: `${WD_PREFIX}-form-input-wrap__placeholder weui-input__placeholder`,
     _size: 'md',
     _focus: false,
+    isiOS: false,
   },
   methods: {
     handleChange: function (e) {
@@ -98,6 +99,8 @@ Component({
     attached: function () {
       this.init();
       this.updateWidgetAPI();
+      const isiOS = wx.getSystemInfoSync().system.includes('iOS');
+      this.setData({ isiOS });
     },
   },
 });

package/components/wd-textarea/index.wxml

@@ -22,7 +22,19 @@
     borderedH5="{{borderedH5}}"
   >
     <view class="{{cls}}" wx:if="{{!readOnly}}">
-      <textarea placeholder-class="{{placeholderCls}}" auto-focus="{{focus}}" auto-height="{{autoHeight}}" cursor-spacing="{{cursorSpacing}}" focus="{{focus}}" placeholder="{{placeholder}}" value="{{value}}" disabled="{{disabled}}" maxlength="{{maxLength}}" bind:input="handleChange" bind:focus="handleFocus" bind:blur="handleBlur" bindconfirm="handleConfirm"></textarea>
+    <block wx:if="{{autoHeight}}" >
+    <view class="wd-textarea__content">
+        <textarea class="wd-textarea__content_input" placeholder-class="{{placeholderCls}}" auto-focus="{{focus}}" cursor-spacing="{{cursorSpacing}}" focus="{{focus}}" placeholder="{{placeholder}}" value="{{value}}" disabled="{{disabled}}" maxlength="{{maxLength}}" bind:input="handleChange" bind:focus="handleFocus" bind:blur="handleBlur" bindconfirm="handleConfirm"></textarea>
+        <text class="wd-textarea__content_text">
+        {{value}}</text>
+    </view>
+    </block>
+    <block wx:else>
+    <textarea class="{{isiOS?'wd-textarea__ios':''}}" placeholder-class="{{placeholderCls}}" auto-focus="{{focus}}" auto-height="{{autoHeight}}" cursor-spacing="{{cursorSpacing}}" focus="{{focus}}" placeholder="{{placeholder}}" value="{{value}}" disabled="{{disabled}}" maxlength="{{maxLength}}" bind:input="handleChange" bind:focus="handleFocus" bind:blur="handleBlur" bindconfirm="handleConfirm"></textarea>
+    </block>
+    </view>
+    <view>
+
       <block wx:if="{{counterVisible}}">
         <label class="{{countCls}}">{{counter}}/{{maxLength}}</label>
       </block>

package/components/wd-textarea/index.wxss

@@ -5,3 +5,8 @@
 @import '../wd-input-wrap/wd-input-wrap.wxss';
 
 @import './wd-textarea.wxss';
+
+.wd-mp-textarea-root .wd-form-input-wrap textarea.wd-textarea__ios {
+  width: 100%;
+  height: 3rem;
+}

package/components/wxOpenApi/phone/index.js

@@ -53,19 +53,9 @@ Component({
   },
   methods: {
     async getPhoneNumber(e) {
-      if (
-        e?.detail?.errMsg?.includes('fail') ||
-        e?.detail?.errno ||
-        !e?.detail?.code
-      ) {
-        console.warn(
-          '获取手机号失败:',
-          e?.detail || { errMsg: '可能基础库版本过低' }
-        );
-        this.triggerEvent(
-          'phonefail',
-          e?.detail || { errMsg: '获取手机号失败，可能基础库版本过低' }
-        );
+      if (e?.detail?.errMsg?.includes('fail') || e?.detail?.errno || !e?.detail?.code) {
+        console.warn('获取手机号失败:', e?.detail || { errMsg: '可能基础库版本过低' });
+        this.triggerEvent('phonefail', e?.detail || { errMsg: '获取手机号失败，可能基础库版本过低' });
         return;
       }
       const res = await callWedaApi({
@@ -75,6 +65,7 @@ Component({
           Method: 'InvokeComponentWxData',
           ReqBody: JSON.stringify({ code: e?.detail?.code }),
         },
+        wxAppId: wx.getAccountInfoSync()?.miniProgram?.appId,
       });
       if (!res?.Data) {
         this.triggerEvent('phonefail', { errMsg: '获取手机号失败' });

package/package.json

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