@cloudbase/weda-ui 3.13.7 → 3.14.1

package/dist/web/components/form/location/common/mapChoose.js

@@ -5,7 +5,7 @@ import * as React from 'react';
 import classNames from '../../../../utils/classnames';
 import debounce from '../../../../utils/debounce';
 import { tmapApiUrl } from '../constants';
-import { getTMap, calculateDistance, base64LocationIcon, } from '../../../../utils/tmap';
+import { getTMap, calculateDistance, base64LocationIcon } from '../../../../utils/tmap';
 import { errorHandler } from '../../../../utils/error';
 import { Icon } from 'tea-component';
 import { inH5IsMobile } from '../../../../utils/platform';
@@ -54,7 +54,7 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
         function loadScript() {
             const script = document.createElement('script');
             script.type = 'text/javascript';
-            script.src = `${tmapApiUrl}?v=2.exp&key=${APIKEY}&callback=init&libraries=service`;
+            script.src = `${tmapApiUrl}?v=2.exp&key=${APIKEY}&libraries=service`;
             script.onload = () => {
                 initMap();
             };
@@ -69,7 +69,6 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
         else {
             loadScript();
         }
-        exploreNear('updateCenter');
         return () => {
             mapRef.current && mapRef.current.destroy();
         };
@@ -80,16 +79,26 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
     const initMap = () => {
         if (!getTMap())
             return;
-        const TMap = getTMap();
-        //定义地图中心点坐标
-        const center = new TMap.LatLng(lat, lng);
-        //定义map变量，调用 TMap.Map() 构造函数创建地图
-        mapRef.current = new TMap.Map(document.getElementById(`form-map-choose-${mapDomName.current}`), {
-            center,
-            zoom: 16, //设置地图缩放级别
-        });
-        initMarker(TMap, mapRef.current);
-        getRadius() && initCircle(TMap, mapRef.current);
+        try {
+            const TMap = getTMap();
+            //定义地图中心点坐标
+            const center = new TMap.LatLng(lat, lng);
+            //定义map变量，调用 TMap.Map() 构造函数创建地图
+            mapRef.current = new TMap.Map(document.getElementById(`form-map-choose-${mapDomName.current}`), {
+                center,
+                zoom: 16, //设置地图缩放级别
+            });
+            initMarker(TMap, mapRef.current);
+            getRadius() && initCircle(TMap, mapRef.current);
+            exploreNear('updateCenter');
+        }
+        catch (error) {
+            errorHandler({
+                code: 'WdLocation.initMap',
+                error,
+                message: `初始化地图失败，请检查APIKEY【${APIKEY}】是否正确，或者检查是否有配额`,
+            });
+        }
     };
     const initMarker = (TMap, map) => {
         const canLoad = lat && lng && TMap && map;
@@ -234,11 +243,15 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
             }
         })
             .catch((error) => {
+            var _a;
             setSearchLoadingStatus(false);
             setRealLocation({ lat, lng }, []);
             errorHandler({
                 code: 'WdLocation.exploreNear',
                 error,
+                message: ((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('调用量已达到上限'))
+                    ? `附近搜索失败，请检查APIKEY【${APIKEY}】是否正确，调整/ws/place/v1/explore配额`
+                    : '',
             });
         });
     }, 500);
@@ -270,9 +283,13 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
             }
         })
             .catch((error) => {
+            var _a;
             errorHandler({
                 code: 'WdLocation.getAddress',
                 error,
+                message: ((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('调用量已达到上限'))
+                    ? `地址解析失败，请检查APIKEY【${APIKEY}】是否正确，调整/ws/geocoder/v1/?address=*配额`
+                    : '',
             });
             let item = {
                 id: 'current-location',
@@ -323,9 +340,13 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
                 }
             })
                 .catch((error) => {
+                var _a;
                 errorHandler({
                     code: 'WdLocation.getSuggestion',
                     error,
+                    message: ((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('调用量已达到上限'))
+                        ? `关键词输入提示失败，请检查APIKEY【${APIKEY}】是否正确，调整/ws/place/v1/suggestion配额`
+                        : '',
                 });
             });
         }
@@ -415,14 +436,14 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
                         e.stopPropagation();
                     }, ref: searchListRef, onScroll: searchListOnScroll, children: (isSearch ? searchList : exploreList).map((item, index) => (_jsx("div", { className: "weda-ui_mapChoose_search_list_li", onClick: () => {
                             chooseLoction(item);
-                        }, children: _jsxs("div", { className: "weda-ui_mapChoose_search_list_li_wrap", children: [_jsx("div", { className: "weda-ui_mapChoose_search_list_li_title", children: item.title }), _jsx("div", { className: "weda-ui_mapChoose_search_list_li_con", children: item.address }), item.id === chooseLoc.id && (_jsx("span", { className: "weda-ui_mapChoose_search_list_li_con_choosed" }))] }) }, index))) })] }));
+                        }, children: _jsxs("div", { className: "weda-ui_mapChoose_search_list_li_wrap", children: [_jsx("div", { className: "weda-ui_mapChoose_search_list_li_title", children: item.title }), _jsx("div", { className: "weda-ui_mapChoose_search_list_li_con", children: item.address }), item.id === chooseLoc.id && _jsx("span", { className: "weda-ui_mapChoose_search_list_li_con_choosed" })] }) }, index))) })] }));
     };
     const renderOutTip = () => {
         return (_jsxs("div", { className: classNames({
                 'weda-ui_mapChoose_outTip': true,
                 'weda-ui_mapChoose_outTip_block': isOutofrange,
                 'weda-ui_mapChoose_outTip_pc': isPC,
-            }), children: [isOutofrange && (_jsx(Icon, { type: "warning", size: "default", color: "#ED7B2F", style: { marginRight: '9px' } })), isOutofrange && _jsx("span", { children: "\u5B9A\u4F4D\u8D85\u51FA\u5141\u8BB8\u8303\u56F4,\u8BF7\u8C03\u6574" })] }));
+            }), children: [isOutofrange && _jsx(Icon, { type: "warning", size: "default", color: "#ED7B2F", style: { marginRight: '9px' } }), isOutofrange && _jsx("span", { children: "\u5B9A\u4F4D\u8D85\u51FA\u5141\u8BB8\u8303\u56F4,\u8BF7\u8C03\u6574" })] }));
     };
     const getRadius = () => {
         let radius = 0;
@@ -437,6 +458,7 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
     // 获取设备最新位置
     const getLatestLc = function () {
         return new Promise((resolve) => {
+            var _a;
             try {
                 if (userLocation) {
                     resolve(userLocation);
@@ -470,6 +492,9 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
                 errorHandler({
                     code: 'WdLocation.getLatestLocation',
                     error: e,
+                    message: ((_a = e === null || e === void 0 ? void 0 : e.message) === null || _a === void 0 ? void 0 : _a.includes('调用量已达到上限'))
+                        ? `坐标转换失败，请检查APIKEY【${APIKEY}】是否正确，调整/ws/geocoder/v1/?location=*配额`
+                        : '',
                 });
                 resolve(null);
             }

package/dist/web/components/statusContent/index.css

@@ -57,6 +57,7 @@
 .wd-status-content .wd-status-content__content.table {
   background-color: unset;
   height: 160px;
+  display: flex;
 }
 .wd-status-content .wd-status-content__content.listview {
   background-color: unset;

package/dist/web/components/wd-image/ImagePreview.js

@@ -24,13 +24,13 @@ export const ImagePreview = (props) => {
     const previewStyle = platform === 'h5'
         ? {
             touchAction: 'none',
-            backgroundImage: `url('${realSrc || src}')`,
+            // backgroundImage: `url('${realSrc || src}')`,
             transform: `translate(${translateX}px, ${translateY}px) scale(${previewScale})`,
             ...style,
         }
         : {
             touchAction: 'none',
-            backgroundImage: `url('${realSrc || src}')`,
+            // backgroundImage: `url('${realSrc || src}')`,
             transform: `rotate(${rotate}deg)`,
             ...style,
         };
@@ -100,7 +100,7 @@ export const ImagePreview = (props) => {
                                         e.stopPropagation();
                                     }
                                     setVisible(false);
-                                }, className: `${classPrefix}-image-mask__close-btn`, children: _jsx("i", { className: `${classPrefix}-image-mask__icon-close` }) }), _jsx("div", { ...bind(), className: `${classPrefix}-image-preview`, style: previewStyle }), platform === 'pc' && (_jsxs("div", { className: `${classPrefix}-image-preview-toolbar`, children: [(previewImageList === null || previewImageList === void 0 ? void 0 : previewImageList.length) > 1 && (_jsxs(_Fragment, { children: [_jsx("span", { className: "wd-icon-wrap wd-event-tap", children: _jsx(WdIcon, { name: 'td:chevron-left', size: "sm", events: {
+                                }, className: `${classPrefix}-image-mask__close-btn`, children: _jsx("i", { className: `${classPrefix}-image-mask__icon-close` }) }), _jsx("div", { ...bind(), className: `${classPrefix}-image-preview ${classPrefix}-${platform}-image-preview`, style: previewStyle, children: _jsx("img", { style: { backgroundImage: `url('${realSrc || src}')` }, className: `${classPrefix}-image-preview-img`, src: realSrc || src }) }), platform === 'pc' && (_jsxs("div", { className: `${classPrefix}-image-preview-toolbar`, children: [(previewImageList === null || previewImageList === void 0 ? void 0 : previewImageList.length) > 1 && (_jsxs(_Fragment, { children: [_jsx("span", { className: "wd-icon-wrap wd-event-tap", children: _jsx(WdIcon, { name: 'td:chevron-left', size: "sm", events: {
                                                         tap: (arg, { originEvent: e }) => {
                                                             e === null || e === void 0 ? void 0 : e.stopPropagation();
                                                             const index = previewImageList.findIndex((i) => i === currentImg);

package/dist/web/components/wd-store-home/index.css

@@ -25,8 +25,10 @@
   border-radius: 100%;
   margin-right: 15px;
 }
-.wd-store-home__footer {
+.wd-store-home__wrap .wd-store-home__footer {
   border-top: 1px solid #f2f2f2;
+}
+.wd-store-home__footer {
   font-size: 12px;
   padding: 5px 0;
   display: flex;

package/dist/web/components/wd-store-product/index.d.ts

@@ -2,7 +2,7 @@
 import type { CommonPropsType } from '../../types';
 import type { DataType } from '../../../configs/components/wd-store-product';
 import './style';
-export default function WdStoreProduct({ className, id }: WdStoreProductProps): JSX.Element;
+export default function WdStoreProduct(props: WdStoreProductProps): JSX.Element;
 interface WdStoreProductProps extends CommonPropsType, DataType {
 }
 export { type WdStoreProductProps };

package/dist/web/components/wd-store-product/index.js

@@ -4,10 +4,11 @@ import './style';
 import WdButton from '../wd-button';
 import { useCanPreview } from '../../utils/hooks/useCanPreview';
 import { useConfig } from '../../utils/config-context';
-export default function WdStoreProduct({ className, id }) {
+export default function WdStoreProduct(props) {
+    const { className, id, customContent, children } = props;
     const { classPrefix } = useConfig();
     const canPreview = useCanPreview();
     if (!canPreview)
         return null;
-    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(Bubble, { placement: "auto", openDelay: 300, content: _jsxs(_Fragment, { children: ["\u8BE5\u7EC4\u4EF6\u5FC5\u987B\u5728\u5C0F\u7A0B\u5E8F\u771F\u5B9E\u73AF\u5883\u4F7F\u7528\u624D\u80FD\u591F\u770B\u5230\u5B9E\u9645\u6548\u679C\u3002", _jsx("br", {}), _jsx("a", { href: "https://developers.weixin.qq.com/miniprogram/dev/component/store-product.html", target: "_blank", rel: "noreferrer", children: "\u67E5\u770B\u8BF4\u660E" })] }), children: _jsxs("div", { className: `${className} ${classPrefix}-store-product__wrap`, id: id, children: [_jsxs("div", { className: `${classPrefix}-store-home__content`, children: [_jsx("img", { className: `${classPrefix}-store-product__img`, src: "https://qcloudimg.tencent-cloud.cn/raw/4a29d51b504f12b4933ce4490110b4dc.svg", alt: "" }), _jsxs("div", { className: `${classPrefix}-store-product__text`, children: [_jsxs("div", { children: [_jsx("p", { className: `${classPrefix}-store-home__title`, children: "\u5546\u54C1\u540D\u79F0" }), _jsx("span", { className: `${classPrefix}-store-home__label`, children: "\u5546\u54C1\u6807\u7B7E" })] }), _jsxs("div", { className: `${classPrefix}-store-product__text__footer`, children: [_jsx("p", { className: "price", children: "\u00A5\u4EF7\u683C \u8D77" }), " ", _jsx(WdButton, { text: "\u8D2D\u4E70" })] })] })] }), _jsxs("div", { className: `${classPrefix}-store-home__footer`, children: [_jsx("i", { className: `${classPrefix}-store-home__icon` }), "\u5C0F\u5E97\u540D\u79F0"] })] }) }) }));
+    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(Bubble, { placement: "auto", openDelay: 300, content: _jsxs(_Fragment, { children: ["\u8BE5\u7EC4\u4EF6\u5FC5\u987B\u5728\u5C0F\u7A0B\u5E8F\u771F\u5B9E\u73AF\u5883\u4F7F\u7528\u624D\u80FD\u591F\u770B\u5230\u5B9E\u9645\u6548\u679C\u3002", _jsx("br", {}), _jsx("a", { href: "https://developers.weixin.qq.com/miniprogram/dev/component/store-product.html", target: "_blank", rel: "noreferrer", children: "\u67E5\u770B\u8BF4\u660E" })] }), children: _jsxs("div", { className: `${className} ${customContent ? '' : classPrefix + '-store-product__wrap'}`, id: id, children: [customContent ? (children) : (_jsx("div", { className: `${classPrefix}-store-home__content`, children: _jsxs(_Fragment, { children: [_jsx("img", { className: `${classPrefix}-store-product__img`, src: "https://qcloudimg.tencent-cloud.cn/raw/4a29d51b504f12b4933ce4490110b4dc.svg", alt: "" }), _jsxs("div", { className: `${classPrefix}-store-product__text`, children: [_jsxs("div", { children: [_jsx("p", { className: `${classPrefix}-store-home__title`, children: "\u5546\u54C1\u540D\u79F0" }), _jsx("span", { className: `${classPrefix}-store-home__label`, children: "\u5546\u54C1\u6807\u7B7E" })] }), _jsxs("div", { className: `${classPrefix}-store-product__text__footer`, children: [_jsx("p", { className: "price", children: "\u00A5\u4EF7\u683C \u8D77" }), " ", _jsx(WdButton, { text: "\u8D2D\u4E70" })] })] })] }) })), _jsxs("div", { className: `${classPrefix}-store-home__footer`, children: [_jsx("i", { className: `${classPrefix}-store-home__icon` }), "\u5C0F\u5E97\u540D\u79F0"] })] }) }) }));
 }

package/dist/web/components/wd-table/components/FilterFieldsPanel/index.js

@@ -9,7 +9,7 @@ import { filterFieldsGenerate } from './filterFieldsGenerate';
 import { WdButton } from '../../../wd-button';
 import { usePlatform } from '../../../../utils/platform';
 import { useSetWidgetApi } from '../../../../utils/widget-api/use-set-widget-api';
-const getFilterConfig = (data) => data.map(({ name, label, value, fieldCalculationOption = [], fieldCalculation, }) => ({
+const getFilterConfig = (data) => data.map(({ name, label, value, fieldCalculationOption = [], fieldCalculation }) => ({
     name,
     label,
     value,
@@ -18,7 +18,7 @@ const getFilterConfig = (data) => data.map(({ name, label, value, fieldCalculati
 }));
 // 筛选表单
 export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
-    const { filterFields, fetchData, openMobileFilter, setOpenMobileFilter, setFilterConfig, } = props;
+    const { filterFields, fetchData, openMobileFilter, setOpenMobileFilter, setFilterConfig } = props;
     const num = 2;
     const maxlength = 3;
     const { classPrefix } = useConfig();
@@ -27,7 +27,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
     const [initFilterData, setInitFilterData] = useState([]);
     const [filterData, setFilterData] = useState([]);
     const updateFilterData = (filterFieldItemConfig) => {
-        const newData = filterData.map((i) => i.id === filterFieldItemConfig.id ? filterFieldItemConfig : i);
+        const newData = filterData.map((i) => (i.id === filterFieldItemConfig.id ? filterFieldItemConfig : i));
         setFilterData(newData);
         setFilterConfig(getFilterConfig(newData));
     };
@@ -54,9 +54,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
     const searchHandle = (searchData = filterData) => {
         let searchValues = [];
         const filterValues = searchData.filter((i) => {
-            if (Array.isArray(i.value) &&
-                i.filterType === 'number' &&
-                i.fieldCalculation.value === 'scope') {
+            if (Array.isArray(i.value) && i.filterType === 'number' && i.fieldCalculation.value === 'scope') {
                 // 若筛选字段为number类型，且为范围选择时，只要有一个值则返回
                 return i.value[0] || i.value[1];
             }
@@ -72,10 +70,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                         var _a;
                         if (n.$and) {
                             return {
-                                $and: [
-                                    ...n.$and,
-                                    { [i.name]: { [(_a = i === null || i === void 0 ? void 0 : i.fieldCalculation) === null || _a === void 0 ? void 0 : _a.value]: '1' } },
-                                ],
+                                $and: [...n.$and, { [i.name]: { [(_a = i === null || i === void 0 ? void 0 : i.fieldCalculation) === null || _a === void 0 ? void 0 : _a.value]: '1' } }],
                             };
                         }
                         return n;
@@ -90,6 +85,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
         });
         // 值筛选条件
         filterValues.forEach((i) => {
+            var _a, _b, _c;
             switch (i.fieldCalculation.value) {
                 case 'scope':
                     if (i.filterType === 'number') {
@@ -126,17 +122,17 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                 case 'exclude':
                     searchValues.push({
                         key: i.name,
-                        val: `^((?!${i.value}).)*$`,
+                        val: `^((?!${(_a = i.value) === null || _a === void 0 ? void 0 : _a.trim()}).)*$`,
                         rel: 'regex',
                     });
                     break;
                 case 'startWith':
-                    searchValues.push({ key: i.name, val: `^${i.value}`, rel: 'regex' });
+                    searchValues.push({ key: i.name, val: `^${(_b = i.value) === null || _b === void 0 ? void 0 : _b.trim()}`, rel: 'regex' });
                     break;
                 default: {
                     const searchItem = {
                         key: i.name,
-                        val: i.value,
+                        val: (_c = i.value) === null || _c === void 0 ? void 0 : _c.trim(),
                         rel: i.fieldCalculation.value,
                     };
                     if (i.filterType === 'number') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.13.7",
+  "version": "3.14.1",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -43,7 +43,7 @@
     "prestart:e2e-server": "node ./tools/e2e-prepare.mjs",
     "start:e2e-server": "node ./lowcode-comps/e2e-server.js",
     "test:e2e-component": "npm run build-mp && npx cypress run --component",
-    "test:e2e-cals": "start-server-and-test start:e2e-server 2333 'npx cypress run -b chrome --headless'",
+    "test:e2e-cals": "WAIT_ON_TIMEOUT=900000 start-server-and-test start:e2e-server 2333 'npx cypress run -b chrome --headless'",
     "test:manual-e2e-cals": "start-server-and-test start:e2e-server 2333 'npx cypress open -b chrome'",
     "test:e2e": "npm run test:e2e-component && npm run test:e2e-cals",
     "posttest:e2e-cals": "npm run e2e:report",
@@ -85,7 +85,7 @@
   "description": "腾讯云微搭低代码组件库模板",
   "dependencies": {
     "@antv/g6": "^4.8.5",
-    "@cloudbase/weda-client": "^1.1.17",
+    "@cloudbase/weda-client": "^1.1.21",
     "@codemirror/autocomplete": "^6.16.0",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",