@cloudbase/weda-ui-mp 3.20.1 → 3.20.3

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

@@ -2,6 +2,7 @@ import { getCloudInstance, getTempFileURL, getDefaultUploadPath } from '../../..
 import { randomStr } from '../../../utils/platform';
 import { compressImage } from './compress';
 import { isNil } from '../../../utils/lodash';
+import { storageTypeIsHttps } from '../uploaderFile/upload';
 
 Component({
   options: {
@@ -99,6 +100,10 @@ Component({
       type: Object,
       value: null,
     },
+    storageType: {
+      type: String,
+      value: 'cloudID',
+    },
   },
   data: {
     maxCount: 0,
@@ -172,6 +177,17 @@ Component({
             cloudPath,
             filePath,
           });
+          let result = uploadRes.fileID;
+          let file = files?.tempFiles[0];
+          // 小程序自带tempURL 不需要调用 tcb.getTempFileURL 获取
+          if (storageTypeIsHttps(this.data.storageType)) {
+            result = await getTempFileURL(uploadRes.fileID);
+            file = { ...file, url: result };
+          }
+          this.triggerEvent('success', {
+            value: result,
+            file: file,
+          });
           return { fileID: uploadRes.fileID };
         });
         const uploadFileList = await Promise.all(uploadPromise);
@@ -195,11 +211,7 @@ Component({
     },
     uploadSuccess: async function (e) {
       const urls = e.detail.cloudUrls; // uploadFile 获取返回值
-      // 小程序自带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({
         files: this.data.files.concat(e.detail.urls.map((url) => ({ url }))),
@@ -228,8 +240,11 @@ Component({
       }
       this.handleChange(newUrls, true);
     },
-    handleChange: function (values, isDelete = false) {
+    handleChange: async function (values, isDelete = false) {
       let value = values;
+      if (storageTypeIsHttps(this.data.storageType)) {
+        value = await Promise.all(values.map((i) => getTempFileURL(i)));
+      }
       if (this.properties.single) {
         value = values[0] ?? '';
       }

package/components/form/uploaderFile/index.js

@@ -80,6 +80,10 @@ Component({
       type: String,
       value: '点击上传',
     },
+    storageType: {
+      type: String,
+      value: 'cloudID',
+    },
   },
   data: {
     maxCount: 0,

package/components/form/uploaderFile/upload.js

@@ -1,5 +1,7 @@
 import { transSize, randomStr } from '../../../utils/platform';
-import { getCloudInstance, getDefaultUploadPath } from '../../../utils/tcb';
+import { getCloudInstance, getDefaultUploadPath, getTempFileURL } from '../../../utils/tcb';
+
+export const storageTypeIsHttps = (storageType) => storageType === 'https';
 
 const ACTION = { CHOOSE_MEDIA: 'chooseMedia', CHOOSE_MESSAGE_FILE: 'chooseMessageFile' };
 
@@ -226,15 +228,16 @@ const handleUploadFile = async ({
 };
 
 export const upload = (uploadInstance) => {
-  const { config, onSuccess, onFail } = uploadInstance;
+  const { config, onFail } = uploadInstance;
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { action, disabled, maxSize, ..._config } = config;
   if (disabled) return;
   const success = (res) => {
-    const result = handleUpload(res.tempFiles, uploadInstance);
-    onSuccess(result);
+    // 文件选择成功
+    handleUpload(res.tempFiles, uploadInstance);
   };
   const fail = (e) => {
+    // 文件选择失败
     onFail(e);
   };
 
@@ -260,17 +263,35 @@ export const initUploadInstance = ({ action, config, previewFile }, _this) => {
         urls: cloudPathList,
         cloudFile: cloudPathList,
       });
+      const { single, storageType } = _this.data;
       let _value = cloudPathList;
-      if (_this.data.single) {
-        _value = cloudPathList[0] ?? '';
+      if (storageTypeIsHttps(storageType)) {
+        Promise.all(_value.map((i) => getTempFileURL(i))).then((res) => {
+          _value = single ? cloudPathList[0] ?? '' : res;
+          _this.handleChange(_value);
+        });
+      } else {
+        if (single) {
+          _value = cloudPathList[0] ?? '';
+        }
+        _this.handleChange(_value);
       }
-      _this.handleChange(_value);
     },
     onSuccess(res) {
-      _this.triggerEvent('success', {
-        value: res.cloudPath,
-        file: res,
-      });
+      const { storageType } = _this.data;
+      if (storageTypeIsHttps(storageType)) {
+        getTempFileURL(res.cloudPath).then((url) => {
+          _this.triggerEvent('success', {
+            value: url,
+            file: { ...res, url },
+          });
+        });
+      } else {
+        _this.triggerEvent('success', {
+          value: res.cloudPath,
+          file: res,
+        });
+      }
     },
     onFail(e) {
       _this.triggerEvent('error', e);

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/richText/index.wxss

@@ -68,3 +68,7 @@
 .weda-RichTextView ._img {
   vertical-align: middle;
 }
+
+.weda-RichTextView .p {
+  min-height: 1em;
+}

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/components/wd-upload-file/index.js

@@ -30,6 +30,10 @@ Component({
       type: String,
       value: '点击上传',
     },
+    storageType: {
+      type: String,
+      value: 'cloudID',
+    },
   },
   methods: {
     initValue: function () {

package/components/wd-upload-file/index.wxml

@@ -36,6 +36,7 @@
       callbacks="{{callbacks}}"
       uploadButtonText="{{uploadButtonText}}"
       uploadTipText="{{uploadTipText}}"
+      storageType="{{storageType}}"
     />
   </wd-form-item>
 </block>

package/components/wd-upload-image/index.js

@@ -3,7 +3,8 @@ import formFieldBehavior from '../form-field-behavior/form-field-behavior';
 import itemBehavior from '../form-field-behavior/item-behavior';
 import isEqual from '../../utils/deepEqual';
 import { convertSingleValue } from '../../utils/platform';
-import { upload } from '../form/uploaderFile/upload';
+import { upload, storageTypeIsHttps } from '../form/uploaderFile/upload';
+import { getTempFileURL } from '../../utils/tcb';
 
 Component({
   options: {
@@ -44,6 +45,10 @@ Component({
       type: String,
       value: 'normal',
     },
+    storageType: {
+      type: String,
+      value: 'cloudID',
+    },
   },
   data: {
     files: [],
@@ -87,17 +92,35 @@ Component({
             files,
           });
           const cloudPathList = files.map((i) => i.cloudId).filter((j) => !!j);
+          const { single, storageType } = _this.data;
           let _value = cloudPathList;
-          if (_this.data.single) {
-            _value = cloudPathList[0] ?? '';
+          if (storageTypeIsHttps(storageType)) {
+            Promise.all(_value.map((i) => getTempFileURL(i))).then((res) => {
+              _value = single ? cloudPathList[0] ?? '' : res;
+              _this.handleChange({ detail: { value: _value } });
+            });
+          } else {
+            if (single) {
+              _value = cloudPathList[0] ?? '';
+            }
+            _this.handleChange({ detail: { value: _value } });
           }
-          _this.handleChange({ detail: { value: _value } });
         },
         onSuccess(res) {
-          _this.triggerEvent('success', {
-            value: res.cloudPath,
-            file: res,
-          });
+          const { storageType } = _this.data;
+          if (storageTypeIsHttps(storageType)) {
+            getTempFileURL(res.cloudPath).then((url) => {
+              _this.triggerEvent('success', {
+                value: url,
+                file: { ...res, url },
+              });
+            });
+          } else {
+            _this.triggerEvent('success', {
+              value: res.cloudPath,
+              file: res,
+            });
+          }
         },
         onFail(e) {
           _this.triggerEvent('error', e);
@@ -163,13 +186,14 @@ Component({
     'name, value, label, required, visible, disabled, readOnly, sourceType': function () {
       this.updateWidgetAPI();
     },
-    'disabled,sourceType,maxUploadCount,sizeType,maxSize,single': function (
+    'disabled,sourceType,maxUploadCount,sizeType,maxSize,single,storageType': function (
       disabled,
       sourceType,
       maxUploadCount,
       sizeType,
       maxSize,
       single,
+      storageType,
     ) {
       const config = {
         disabled,
@@ -178,6 +202,7 @@ Component({
         sizeType,
         maxSize,
         single,
+        storageType,
       };
       this.setConfig(config);
     },

package/components/wd-upload-image/index.wxml

@@ -39,6 +39,7 @@
       compressQuality="{{compressQuality}}"
       compressedHeight="{{compressedHeight}}"
       compressedWidth="{{compressedWidth}}"
+      storageType="{{storageType}}"
       callbacks="{{callbacks}}"
       bind:change="handleChange"
       sourceType="{{sourceType}}"

package/package.json

@@ -3,7 +3,7 @@
   "miniprogram": "./",
   "packageManager": "yarn@3.0.2",
   "dependencies": {},
-  "version": "3.20.1",
+  "version": "3.20.3",
   "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 = [