@cloudbase/weda-ui-mp 3.20.0 → 3.20.2

package/components/form/location/index.js

@@ -47,7 +47,7 @@ Component({
       type: Boolean,
       value: true,
     },
-    defauleShowLocation: {
+    defaultShowLocation: {
       type: Boolean,
       value: true,
     },
@@ -107,9 +107,7 @@ Component({
       const { locationType, dataSource } = this.properties;
       const getReverseGeocoder = async (location) => {
         const { isApikeyStatus } = this.data;
-        let key = isApikeyStatus.apiKey
-          ? isApikeyStatus.apiKey
-          : await this.getApikey(dataSource.name, 'get');
+        let key = isApikeyStatus.apiKey ? isApikeyStatus.apiKey : await this.getApikey(dataSource.name, 'get');
         if (key) {
           qqmapsdk = new QQMapWX({
             key: key,
@@ -123,9 +121,7 @@ Component({
                   poiname: result?.formatted_addresses?.recommend,
                   detailedAddress: result?.address,
                 };
-                let isCustomLocation = this.checkCustomLocation(
-                  this.properties.value
-                );
+                let isCustomLocation = this.checkCustomLocation(this.properties.value);
                 if (isCustomLocation) {
                   this.setData({
                     currentLocations: detailLocation,
@@ -156,16 +152,10 @@ Component({
             detailedAddress: '',
           };
           // 表单为新增时回传点位信息
-          let isCustomLocation = this.checkCustomLocation(
-            this.properties.value
-          );
+          let isCustomLocation = this.checkCustomLocation(this.properties.value);
           let customLocation = {
-            latitude: isCustomLocation
-              ? this.properties.value?.geopoint?.coordinates[1]
-              : '',
-            longitude: isCustomLocation
-              ? this.properties.value?.geopoint?.coordinates[0]
-              : '',
+            latitude: isCustomLocation ? this.properties.value?.geopoint?.coordinates[1] : '',
+            longitude: isCustomLocation ? this.properties.value?.geopoint?.coordinates[0] : '',
             poiname: this.properties.value?.address,
             detailedAddress: this.properties.value?.detailedAddress,
           };
@@ -176,10 +166,7 @@ Component({
               message: '',
             },
           });
-          this.setLocation(
-            isCustomLocation ? customLocation : location,
-            isCustomLocation
-          );
+          this.setLocation(isCustomLocation ? customLocation : location, isCustomLocation);
           if (!isCustomLocation) {
             locationType !== 1 && this.setData({ isAddrShow: true });
           } else {
@@ -199,10 +186,7 @@ Component({
       };
       const getCustomInfoLocation = () => {
         let customInfoLocation = customInfo.getCurrentLocation();
-        if (
-          !!customInfoLocation &&
-          typeof customInfoLocation.then === 'function'
-        ) {
+        if (!!customInfoLocation && typeof customInfoLocation.then === 'function') {
           customInfoLocation
             .then((res) => {
               drowMapMarks(res);
@@ -410,10 +394,7 @@ Component({
       this.changeValueFormat(location);
     },
     checkCustomLocation(params) {
-      if (
-        !params?.address ||
-        (params?.geopoint?.type && params?.geopoint?.type != 'Point')
-      ) {
+      if (!params?.address || (params?.geopoint?.type && params?.geopoint?.type != 'Point')) {
         return false;
       }
       return true;
@@ -465,11 +446,7 @@ Component({
     value: function (value) {
       const currentLocations = this.data.currentLocations;
       if (value || !currentLocations.latitude) {
-        const {
-          geopoint: { coordinates } = {},
-          address: poiname,
-          detailedAddress,
-        } = value || {};
+        const { geopoint: { coordinates } = {}, address: poiname, detailedAddress } = value || {};
 
         if (!coordinates?.[0]) return;
 
@@ -512,7 +489,7 @@ Component({
         {
           'weui-flex': isFlex,
           [className]: className,
-        }
+        },
       );
       this.setData({ cls });
     },

package/components/form-field-behavior/item-behavior.js

@@ -272,7 +272,7 @@ export default Behavior({
       type: Boolean,
       value: false,
     },
-    defauleShowLocation: {
+    defaultShowLocation: {
       type: Boolean,
       value: true,
     },

package/components/form-location/index.js

@@ -31,7 +31,7 @@ Component({
       type: Boolean,
       value: true,
     },
-    defauleShowLocation: {
+    defaultShowLocation: {
       type: Boolean,
       value: true,
     },

package/components/form-location/index.wxml

@@ -14,7 +14,7 @@
       customLocation="{{customLocation}}"
       customRange="{{customRange}}"
       dataSource="{{dataSource}}"
-      defauleShowLocation="{{defauleShowLocation}}"
+      defaultShowLocation="{{defaultShowLocation}}"
       drag="{{drag}}"
       locationType="{{locationType}}"
       locationRange="{{locationRange}}"

package/components/wd-calendar/index.js

@@ -1,11 +1,6 @@
 /* eslint-disable @typescript-eslint/no-magic-numbers */
 import { commonCompBehavior } from '../../utils/common-behavior';
-import {
-  getStartMoment,
-  convertValueToDateItem,
-  getYMD,
-  convertMethodParam,
-} from '../../utils/getFormLegacy';
+import { getStartMoment, convertValueToDateItem, getYMD, convertMethodParam } from '../../utils/getFormLegacy';
 import { WEEKS, getConfigDataObj, convertWeeks } from './weeks';
 
 Component({
@@ -41,6 +36,12 @@ Component({
       type: Array,
       value: [],
     },
+    start: {
+      type: null,
+    },
+    end: {
+      type: null,
+    },
   },
   data: {
     currentValue: null, // 时间戳
@@ -114,10 +115,7 @@ Component({
       const { _oldCurrentValue, _oldCurrentMonthValue } = this.data;
       const currentValue = getStartMoment('day', value, false)?.valueOf();
       const currentMonthValue = getStartMoment('month', initMonth)?.valueOf();
-      if (
-        currentValue !== _oldCurrentValue ||
-        currentMonthValue !== _oldCurrentMonthValue
-      ) {
+      if (currentValue !== _oldCurrentValue || currentMonthValue !== _oldCurrentMonthValue) {
         this.setData({
           currentValue,
           currentMonthValue,
@@ -136,12 +134,14 @@ Component({
       const checkedDay = getYMD(dateItem);
       this.setData({ checkedDay });
     },
-    'currentMonthValue,configDataObj': function (
-      currentMonthValue,
-      configDataObj
-    ) {
-      const { year, month } = convertValueToDateItem(currentMonthValue);
-      const weeks = convertWeeks(year, month, configDataObj);
+    'currentMonthValue,configDataObj,start,end': function (currentMonthValue, configDataObj, start, end) {
+      const dateItem = convertValueToDateItem(currentMonthValue);
+      if (!dateItem) {
+        console.error('Invalid date item returned from convertValueToDateItem');
+        return;
+      }
+      const { year, month } = dateItem;
+      const weeks = convertWeeks(year, month, configDataObj, [start, end]);
       const yearMonthDisplay = `${year}年${month + 1}月`;
       this.setData({ weeks, yearMonthDisplay });
     },

package/components/wd-calendar/weeks.js

@@ -1,9 +1,4 @@
-import {
-  getStartMoment,
-  convertValueToDateItem,
-  getYMD,
-  convertYearMonthToWeeks,
-} from '../../utils/getFormLegacy';
+import { getStartMoment, convertValueToDateItem, getYMD, convertYearMonthToWeeks } from '../../utils/getFormLegacy';
 
 export const WEEKS = ['日', '一', '二', '三', '四', '五', '六'];
 export const BLOCK_NAME = 'weda-calendar';
@@ -25,8 +20,8 @@ export const getConfigDataObj = (configData) => {
 };
 
 // 带上外部配置，转星期
-export const convertWeeks = (year, month, configDataObj) => {
-  const weeks = convertYearMonthToWeeks(year, month, null, {
+export const convertWeeks = (year, month, configDataObj, range) => {
+  const weeks = convertYearMonthToWeeks(year, month, range, {
     isPreNext: true,
     isDynamic: true,
   });

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,36 +286,41 @@ 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-image/wd-image.wxss

@@ -14,6 +14,7 @@
 
 .wd-image {
   max-width: 100%;
+  vertical-align: middle;
 }
 
 @media screen and (max-width: 768px) {

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-location/index.wxml

@@ -31,7 +31,7 @@
           customLocation="{{customLocation}}"
           customRange="{{customRange}}"
           dataSource="{{dataSource}}"
-          defauleShowLocation="{{defauleShowLocation}}"
+          defaultShowLocation="{{defaultShowLocation}}"
           drag="{{drag}}"
           locationType="{{locationType}}"
           locationRange="{{locationRange}}"

package/components/wd-modal/index.js

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

package/components/wd-tabs/index.wxml

@@ -2,7 +2,7 @@
   <view class="{{classPrefix + '-tabs__header'}}">
     <view class="{{classPrefix + '-tabs__header-item-wrap' }}">
       <view class="{{classPrefix + '-tabs__header-item-content'}}">
-        <scroll-view scroll-x="true" scroll-into-view="{{scrollId}}" class="{{classPrefix + '-tabs__scroll'}}" enable-flex="true" wx:if="{{direction!=='vertical'}}">
+        <scroll-view scroll-x="true" scroll-into-view="{{scrollId}}" class="{{classPrefix + '-tabs__scroll'}}" enable-flex="true" enhanced="{{true}}"  show-scrollbar="{{false}}" wx:if="{{direction!=='vertical'}}" >
           <view wx:for="{{list}}" class="{{classPrefix + '-tabs__item'}} {{item.selected?'is-selected':''}} {{item.isDisabled?'is-disabled':''}}" wx:for-index="index" wx:for-item="item" wx:key="index" id="{{'cell-'+index}}" bindtap="onItemClick" data-value="{{index}}" data-item="{{item}}">
             <view wx-if="{{item.iconType !== 'none' && item.iconPosition === 'prefix'}}" class="{{classPrefix + '-tabs__item-icon'}}">
               <wd-icon type="{{item.iconType}}" name="{{ item.iconType === 'inner' ? item.innerIcon : item.outerImage}}" src="{{item.iconType === 'custom' ? item.outerImage : ''}}" size="xs" />

package/package.json

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

package/utils/enum.js

@@ -1051,6 +1051,7 @@ export const PROPS_WHERE_REL_MEMBER = [].concat(PROPS_WHERE_REL, [
 export const WD_LOCATION_TYPE = [
   { label: '无', value: 1 },
   { label: '用户当前位置', value: 2 },
+  { label: '自定义位置', value: 3 },
 ];
 
 export const WD_LOCATION_RANGE = [