@cloudbase/weda-ui-mp 3.20.1 → 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-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-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-select/select/index.js

@@ -147,7 +147,7 @@ Component({
         _option = range;
       }
       const label = this.getLabels(value, _option);
-      const checkRange = this.getChecks(value, _option, this.data.displayValue);
+      const checkRange = this.getChecks(value, _option);
       // 默认
       this.setData({
         option: checkRange,
@@ -284,13 +284,13 @@ Component({
         this._fetchData({ pageNo, searchValue });
       }
     },
-    getLabels: function (values, options, _preLabel) {
+    getLabels: function (values, options) {
       let labels = values;
       if (Array.isArray(values) && Array.isArray(options)) {
         const rm = arrayToMap(options, 'value');
         labels = values.map((d) => {
           const obj = rm[d];
-          let item = lodashGet(obj, 'text') ?? lodashGet(obj, 'label') ?? _preLabel ?? d;
+          let item = lodashGet(obj, 'text') ?? lodashGet(obj, 'label') ?? d;
           return textToString(item);
         });
       }

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.1",
+  "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 = [