@cloudbase/weda-ui 3.3.0 → 3.3.2

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

@@ -3,7 +3,7 @@
 import * as React from 'react';
 import * as PropTypes from 'prop-types';
 import { tmapApiUrl } from '../constants';
-import { getTMap } from '../../../../utils/tmap';
+import { getTMap } from '../common/tmap';
 const { useEffect, useRef, useState } = React;
 const defaultLatLng = {
     lat: null,
@@ -36,7 +36,7 @@ export default function MapView({ APIKEY = '', drag = true, zoom = true, latlng
             setMapStatus(true);
         }
         catch (error) {
-            console.log('initMap error', error);
+            console.error('initMap error', error);
         }
     };
     const initMarker = () => {
@@ -64,7 +64,7 @@ export default function MapView({ APIKEY = '', drag = true, zoom = true, latlng
             }
         }
         catch (err) {
-            console.log('initMarker err', err);
+            console.error('initMarker err', err);
         }
     };
     useEffect(() => {
@@ -83,7 +83,7 @@ export default function MapView({ APIKEY = '', drag = true, zoom = true, latlng
                 initMap();
             };
             script.onerror = (err) => {
-                console.log('loadScript err', err);
+                console.error('loadScript err', err);
             };
             document.body.appendChild(script);
         }
@@ -97,12 +97,15 @@ export default function MapView({ APIKEY = '', drag = true, zoom = true, latlng
             mapRef.current = null;
             setMapStatus(false);
         };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [APIKEY]);
     useEffect(() => {
         mapRef.current && mapRef.current.setDraggable(drag);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [drag, mapRef.current]);
     useEffect(() => {
         mapRef.current && getTMap() && removeOrAddZoom(mapRef.current, getTMap());
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [zoom, mapRef.current]);
     useEffect(() => {
         const TMap = getTMap();
@@ -121,7 +124,7 @@ export default function MapView({ APIKEY = '', drag = true, zoom = true, latlng
                 ]);
             }
             catch (error) {
-                console.log('updateGeometries error view', error);
+                console.error('updateGeometries error view', error);
             }
         }
     }, [lat, lng, mapStatus]);
@@ -144,7 +147,7 @@ export default function MapView({ APIKEY = '', drag = true, zoom = true, latlng
             }
         }
         catch (error) {
-            console.log('removeOrAddZoom error', error);
+            console.error('removeOrAddZoom error', error);
         }
     };
     // 移除缩放控件

package/dist/web/components/form/location/common/propsConfig.d.ts

@@ -13,7 +13,7 @@ export namespace propTypes {
     const zoom: PropTypes.Requireable<boolean>;
     const disabled: PropTypes.Requireable<boolean>;
     const requiredFlag: PropTypes.Requireable<boolean>;
-    const decorator: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+    const decorator: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
     const value: PropTypes.Requireable<object>;
     const locationType: PropTypes.Requireable<number>;
     const dataSource: PropTypes.Requireable<object>;

package/dist/web/components/form/location/common/useLocationInfo.d.ts

@@ -1,4 +1,4 @@
-export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsChange, dataSourceStatus, }: {
+export default function useLocationInfo({ apiKey, locationType, eventsChange, dataSourceStatus, }: {
     apiKey: any;
     locationType: any;
     eventsChange: any;

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

@@ -63,7 +63,7 @@ export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsCh
                             longitude: lng,
                         }, locationType === 1);
                 }, (error) => {
-                    console.log('error loc', error);
+                    console.error('error loc', error);
                     currentLocations.current = null;
                     setApiKeyStatus({
                         status: false,
@@ -75,7 +75,7 @@ export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsCh
                 });
             };
             script.onerror = (error) => {
-                console.log('Geolocation script onerror', error);
+                console.error('Geolocation script onerror', error);
                 setApiKeyStatus({
                     status: false,
                     message: '定位失败',
@@ -90,6 +90,7 @@ export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsCh
             document.body.appendChild(script);
         }
         loadScript();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [APIKEY, locationType]);
     return {
         location,

package/dist/web/components/form/location/components/LocationH5/location.h5.js

@@ -69,6 +69,7 @@ export default function LocationH5(props) {
             events.change && events.change(res);
         }
         setLocation(location);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [value, locationType]);
     useEffect(() => {
         let loc = {
@@ -83,6 +84,7 @@ export default function LocationH5(props) {
         setLocation(loc);
         // 暂不支持自定位置，初始化表单值都是{}
         events.change({ value: {} });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [locationType]);
     useEffect(() => {
         if (checkCustomLocation(value)) {
@@ -150,7 +152,7 @@ export default function LocationH5(props) {
                             });
                     }
                 }, (error) => {
-                    console.log('error loc', error);
+                    console.error('error loc', error);
                     currentLocations.current = null;
                     setApiKeyStatus({
                         status: false,
@@ -162,7 +164,7 @@ export default function LocationH5(props) {
                 });
             };
             script.onerror = (error) => {
-                console.log('Geolocation script onerror', error);
+                console.error('Geolocation script onerror', error);
                 setApiKeyStatus({
                     status: false,
                     message: '定位失败',
@@ -177,6 +179,7 @@ export default function LocationH5(props) {
             document.body.appendChild(script);
         }
         loadScript();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [APIKEY, locationType, dataSourceStatus]);
     useEffect(() => {
         // 调用连接器数据源方法
@@ -199,7 +202,7 @@ export default function LocationH5(props) {
                 }
             })
                 .catch((error) => {
-                console.log('datasources error', error);
+                console.error('datasources error', error);
                 setDataSourceStatus({
                     status: false,
                     message: error,

package/dist/web/components/form/location/components/LocationPC/location.PC.js

@@ -66,6 +66,7 @@ export default function LocationPC(props) {
             customLocation.current = value;
             setLocation(loc);
         }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [value]);
     useEffect(() => {
         if (value || !currentLocations.current)
@@ -91,6 +92,7 @@ export default function LocationPC(props) {
             });
         }
         setLocation(location);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [value, locationType]);
     const showToast = (message) => {
         weui.toast(message, {
@@ -142,7 +144,7 @@ export default function LocationPC(props) {
                 }
             })
                 .catch((error) => {
-                console.log('datasources error', error);
+                console.error('datasources error', error);
                 setDataSourceStatus({
                     status: false,
                     message: error,
@@ -156,6 +158,7 @@ export default function LocationPC(props) {
             });
             showToast('请配置地图连接器');
         }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [dataSource]);
     useEffect(() => {
         let loc = {
@@ -187,6 +190,7 @@ export default function LocationPC(props) {
             poiname: loc.poiname,
             detailedAddress: loc.detailedAddress,
         }, true);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [locationType]);
     const getIsShowMap = () => {
         let status = showMap;

package/dist/web/components/form/location/index.js

@@ -4,8 +4,15 @@ import './index.css';
 import { usePlatform } from '../../../utils/platform';
 import LocationH5 from './components/LocationH5/location.h5';
 import LocationPC from './components/LocationPC/location.PC';
+import { CommonErrorBoundary } from '../../common/error-boundary';
+import { useLoopRenderDetect } from '../../common/use-loop-render-detect';
 export default function Location(props) {
+    return (React.createElement(CommonErrorBoundary, null,
+        React.createElement(LocationImpl, { ...props })));
+}
+function LocationImpl(props) {
     const platform = usePlatform();
+    useLoopRenderDetect();
     if ((props === null || props === void 0 ? void 0 : props.showType) === 'pc') {
         return React.createElement(LocationPC, { ...props });
     }

package/dist/web/components/form/radio/index.js

@@ -38,18 +38,18 @@ label = '标题', labelVisible = true, format = '', enumName = '', name = 'formR
             prevRangeRef.current = option;
             setCheckedItemValue((_a = option.find((item) => item.checked)) === null || _a === void 0 ? void 0 : _a.value);
         }
-    });
+    }, [option]);
     useEffect(() => {
         // 如果绑定字段类型为枚举，且传入自定义选项集的名称则默认使用自定义选项集的内容作为选项
         if (format === 'x-enum' && enumName) {
             fetchData({ OptNameList: [enumName], PageIndex: 1, PageSize: 10 });
         }
-    }, []);
+    }, [enumName, format]);
     useEffect(() => {
         if (format !== 'x-enum') {
             setOption(range);
         }
-    }, [range]);
+    }, [format, range]);
     const fetchData = async (param) => {
         var _a, _b, _c;
         const data = await callWedaApi({

package/dist/web/components/form/select/h5.d.ts

@@ -13,4 +13,4 @@ export declare const formatDateModeValue: (result?: any[], dateMode?: string) =>
 /**
  * 不同时间模式对应的展示格式
  */
-export declare const getDateModeFormat: (dateMode?: string) => "YYYY" | "YYYY-MM" | "YYYY-MM-DD";
+export declare const getDateModeFormat: (dateMode?: string) => "YYYY" | "YYYY-MM" | "YYYY-MM-DD" | "YYYY-MM-DD HH:mm:ss";

package/dist/web/components/form/select/h5.js

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import ReactDOM from 'react-dom';
 import weui from '../../../utils/weui';
 import classNames from '../../../utils/classnames';
 import isObjectEqual from '../../../utils/isObjectEqual';
@@ -8,6 +9,8 @@ import { timePicker, yearPicker, monthPicker } from './time';
 import { emptyObject } from '../../../utils/constant';
 import { PureSelectH5 } from './dropdown-select/ui';
 import { useOptions } from './use-options';
+import AllTimePicker from './allTimePicker';
+import { getIOSNotNaNDate } from './allTimePicker/dataUtils';
 export default function Select({ 
 // 系统属性
 events = emptyObject, 
@@ -27,10 +30,12 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
     const [regioDepth, setRegionDepth] = React.useState(3);
     const [regionData, setRegionData] = React.useState([]);
     const [regionTree, setRegionTree] = React.useState([]);
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const [typeRegion, setTypeRegion] = React.useState(regionType);
     const [region, setRegion] = React.useState(defaultRegion);
     const [mutiRegion, setMutiRegion] = React.useState([]);
     const [selectedValue, setSelectedValue] = React.useState(defaultValue);
+    const allTime = React.useRef();
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef({});
     React.useEffect(() => {
@@ -70,9 +75,17 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
                 defaultMutiRegion,
             };
         }
-    });
+    }, [
+        defaultValue,
+        defaultDate,
+        defaultTime,
+        defaultRegion,
+        defaultMutiRegion,
+        regionType,
+        dateMode,
+    ]);
     //实现初始值触发change事件
-    const defaultMutiRegionChange = function (treeValue, defaultMutiRegion) {
+    const defaultMutiRegionChange = React.useCallback(function (treeValue, defaultMutiRegion) {
         var _a;
         const defaultValue = defaultMutiRegion
             ? defaultMutiRegion.split(',')
@@ -91,7 +104,7 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
             });
             (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: defaultMutiRegion, result: changeValue });
         }
-    };
+    }, [events]);
     React.useEffect(() => {
         if (mode == 'region' || mode == 'mutiRegion') {
             if (regionData.length < 1) {
@@ -126,7 +139,13 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
                 break;
             }
         }
-    }, [regionType, mode, regionData]);
+    }, [
+        regionType,
+        mode,
+        regionData,
+        defaultMutiRegionChange,
+        defaultMutiRegion,
+    ]);
     const onDateclick = function () {
         const options = {
             className: 'weda-ui weda-picker',
@@ -155,10 +174,42 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
             // 年月，2 列
             monthPicker({ ...options });
         }
-        else {
+        else if (dateMode === 'day') {
             // 年月日，3 列
             weui.datePicker({ id: String(Date.now()), ...options });
         }
+        else {
+            // 年月日时分秒，4列
+            const div = document.createElement('div');
+            div.className = options.className;
+            ReactDOM.render(React.createElement(AllTimePicker, { startDate: startDate, endDate: endDate, defaultDate: defaultDate, onAllTimeCallback: onAllTimeCallback }), div);
+            allTime.current = div;
+        }
+    };
+    const onAllTimeCallback = (result) => {
+        var _a;
+        const div = allTime.current;
+        const unmountResult = ReactDOM.unmountComponentAtNode(div);
+        if (unmountResult && div.parentNode) {
+            div.parentNode.removeChild(div);
+        }
+        if (result !== undefined && result.length > 0) {
+            const time = result[0] +
+                '-' +
+                result[1] +
+                '-' +
+                result[2] +
+                ' ' +
+                result[3] +
+                ':' +
+                result[4] +
+                ':' +
+                result[5];
+            setDate(time);
+            (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, {
+                value: new Date(getIOSNotNaNDate(time)).getTime(),
+            });
+        }
     };
     const onTimeClick = function () {
         const options = {
@@ -215,7 +266,6 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
             onConfirm(result) {
                 var _a;
                 const value = result.map((item) => item.value);
-                //const value=regionValueSplit(typeRegion,defaultvalue);
                 mode == 'region' ? setRegion(value) : setMutiRegion(value);
                 const changeValue = mode == 'region' ? value : value.join(',');
                 onChange && onChange(changeValue);
@@ -229,7 +279,7 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
                     }),
                 });
             },
-            onChange(result) { },
+            onChange() { },
             className: 'weda-ui weda-picker',
             id: new Date().valueOf(),
         }, regionTree);
@@ -346,6 +396,10 @@ export function decodeIsoDatetime(isoStringOrTimesnap, type, dateMode = 'day') {
         }
     }
     else {
+        if (isoStringOrTimesnap.toString().length === 4) {
+            // 添加默认的日期，防止格式化日期异常
+            isoStringOrTimesnap = isoStringOrTimesnap + '-01-01 08:00:00';
+        }
         return moment(isoStringOrTimesnap).format(getDateModeFormat(dateMode));
     }
 }
@@ -404,6 +458,8 @@ export const getDateModeFormat = (dateMode = 'day') => {
             return 'YYYY-MM';
         case 'day':
             return 'YYYY-MM-DD';
+        case 'datetime':
+            return 'YYYY-MM-DD HH:mm:ss';
         default:
             return 'YYYY-MM-DD';
     }

package/dist/web/components/form/select/index.d.ts

@@ -1,12 +1,13 @@
 /// <reference types="react" />
+import 'moment/locale/zh-cn';
 import type { CommonFormPropsType } from '../types';
 export declare const moment: any;
 export default function Select(props: any): JSX.Element;
 export interface PropsType extends CommonFormPropsType {
     size: 's' | 'm' | 'l' | 'full';
     placeholder: string;
-    mode: 'selector' | 'date' | 'time' | 'region' | 'mutiRegion';
-    dateMode: 'day' | 'month' | 'year';
+    mode: 'selector' | 'date' | 'time' | 'datetime' | 'region' | 'mutiRegion';
+    dateMode: 'day' | 'month' | 'year' | 'datetime';
     range?: any[];
     defaultValue?: string;
     dataSourceName?: string;

package/dist/web/components/form/select/index.js

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import * as _moment from 'moment';
+import 'moment/locale/zh-cn';
 import { usePlatform } from '../../../utils/platform';
 import SelectH5, { decodeIsoDatetime } from './h5';
 import classNames from '../../../utils/classnames';
@@ -11,11 +12,18 @@ import { emptyObject } from '../../../utils/constant';
 import { PureSelectPc } from './dropdown-select/ui';
 import { useOptions } from './use-options';
 import { getRegionTree, getAreaCode } from './region';
+import { CommonErrorBoundary } from '../../common/error-boundary';
+import { useLoopRenderDetect } from '../../common/use-loop-render-detect';
 // @ts-ignore TODO: fix 与plugin构建阶段效果不同
 export const moment = (typeof _moment === 'function' ? _moment : _moment.default);
 export default function Select(props) {
+    return (React.createElement(CommonErrorBoundary, null,
+        React.createElement(SelectImpl, { ...props })));
+}
+function SelectImpl(props) {
     const { id, style, className, label = '标题', labelVisible = true, layout = 'horizontal', requiredFlag = false, size = 'l', decorator, } = props;
     const platform = usePlatform();
+    useLoopRenderDetect();
     let selectEl;
     if (platform === 'h5') {
         selectEl = React.createElement(SelectH5, { ...props });
@@ -99,7 +107,7 @@ function SelectPc({ where, dataSourceName, viewId, format, primaryField, enumNam
             hasChange = true;
         }
         if (((_b = prevDefaultRef.current) === null || _b === void 0 ? void 0 : _b.defaultDate) !== defaultDate) {
-            setDate(decodeIsoDatetime(defaultDate, 'date'));
+            setDate(decodeIsoDatetime(defaultDate, 'date', dateMode));
             hasChange = true;
         }
         if (((_c = prevDefaultRef.current) === null || _c === void 0 ? void 0 : _c.defaultTime) !== defaultTime) {
@@ -124,7 +132,14 @@ function SelectPc({ where, dataSourceName, viewId, format, primaryField, enumNam
                 defaultMutiRegion,
             };
         }
-    });
+    }, [
+        defaultValue,
+        defaultDate,
+        defaultTime,
+        defaultRegion,
+        defaultMutiRegion,
+        dateMode,
+    ]);
     React.useEffect(() => {
         if (mode == 'region' || mode == 'mutiRegion') {
             if (regionData.length < 1) {
@@ -206,6 +221,14 @@ function SelectPc({ where, dataSourceName, viewId, format, primaryField, enumNam
                 else if (dateMode === 'month') {
                     return (React.createElement(DatePicker.MonthPicker, { className: sizeClassName, ...dateProps }));
                 }
+                else if (dateMode === 'datetime') {
+                    const startFormat = decodeIsoDatetime(startDate, 'date', 'datetime');
+                    const endFormat = decodeIsoDatetime(endDate, 'date', 'datetime');
+                    return (React.createElement(DatePicker, { showTime: true, className: sizeClassName, ...dateProps, range: [
+                            moment(startFormat, 'YYYY-MM-DD HH:mm:ss'),
+                            moment(endFormat, 'YYYY-MM-DD HH:mm:ss'),
+                        ] }));
+                }
                 else {
                     return React.createElement(DatePicker, { className: sizeClassName, ...dateProps });
                 }

package/dist/web/components/form/select/use-options.js

@@ -98,6 +98,6 @@ export function useOptions(params) {
         if (state.status === 'success') {
             setOptions(state.result);
         }
-    }, [state, state.status]);
+    }, [setOptions, state, state.status]);
     return [options];
 }

package/dist/web/components/form/select/year.js

@@ -58,7 +58,7 @@ export default function YearPicker(props) {
  * 获取当前20年，page 表示分页，1表示下一页，-1表示上一页
  * @returns [][]
  */
-const getYears = (currentYear, page = 0, range = []) => {
+const getYears = (currentYear, page = 0) => {
     currentYear = currentYear || new Date().getFullYear();
     const startYear = (Math.floor(parseInt(currentYear) / 20) + page) * 20;
     const pageYears = Array.from({ length: 5 }).map((item, i1) => Array.from({ length: 4 }).map((item, i2) => i1 * 4 + i2 + startYear + ''));

package/dist/web/components/form/switch/index.js

@@ -31,7 +31,7 @@ label = '标题', labelVisible = true, checked: defaultChecked, layout = 'horizo
     // 现在低码组件往源码组件传入的id不唯一, 暂时使用hashcode替代
     const hashcode = getLocalCounter();
     const _id = `switch-${hashcode}`;
-    const switchElement = platform === 'h5' ? (React.createElement("div", { className: subCls },
+    const switchElement = platform === 'h5' ? (React.createElement("div", { className: subCls, "data-testid": "form-switch" },
         isFlex ? React.createElement("div", { className: "weui-cell__bd" }) : null,
         React.createElement("div", { className: isFlex ? 'weui-cell__ft' : 'weui-cell__bd' },
             React.createElement("label", { htmlFor: _id, key: _id, className: "weui-switch-cp" },
@@ -45,7 +45,7 @@ label = '标题', labelVisible = true, checked: defaultChecked, layout = 'horizo
                 const originEvent = context.event;
                 setChecked(value);
                 events.change({ value }, { originEvent });
-            } })));
+            }, "data-testid": "form-switch" })));
     return renderDecorator(switchElement, decorator)({
         id,
         className: cls,

package/dist/web/components/form/textarea/index.js

@@ -51,7 +51,7 @@ label = '标题', labelVisible = true, defaultValue = '', placeholder = '请输
     }
     else {
         textAreaElement = (React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },
-            React.createElement(Input.TextArea, { size: size, placeholder: placeholder, value: value, onChange: onChange, onFocus: onFocus, onBlur: onBlur, maxLength: maxLength, disabled: disabled, autoFocus: autoFocus, showCount: true })));
+            React.createElement(Input.TextArea, { "data-testid": "weui-textarea-test", size: size, placeholder: placeholder, value: value, onChange: onChange, onFocus: onFocus, onBlur: onBlur, maxLength: maxLength, disabled: disabled, autoFocus: autoFocus, showCount: true })));
     }
     return renderDecorator(textAreaElement, decorator)({
         id,