@cloudbase/weda-ui 3.1.1 → 3.1.4

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

@@ -16,7 +16,7 @@ export default function LocationH5(props) {
     // 系统属性
     id, className, style, events, 
     // 组件属性
-    value, label, labelVisible, showLngLat, showMap, drag, zoom, disabled, requiredFlag, decorator, customLocation, locationType, dataSource, layout, locationRange, customRange, } = props;
+    value, label, labelVisible, showLngLat, showMap, drag, zoom, disabled, requiredFlag, decorator, locationType, dataSource, layout, locationRange, customRange, } = props;
     const cls = classNames({
         'weda-ui': true,
         cloudbase_standard: true,
@@ -39,6 +39,7 @@ export default function LocationH5(props) {
         latlng: { lat: 39.98410411, lng: 116.307503 },
     });
     const currentLocations = useRef();
+    const customLocation = useRef();
     useEffect(() => {
         if (value || !currentLocations.current)
             return;
@@ -78,46 +79,24 @@ export default function LocationH5(props) {
             detailedAddress: '',
             locationType,
         };
-        switch (locationType) {
-            case 3:
-                if (checkCustomLocation(customLocation)) {
-                    showToast('位置输入格式错误请检查');
-                    return;
-                }
-                else {
-                    loc = {
-                        latlng: {
-                            lat: customLocation.latitude,
-                            lng: customLocation.longitude,
-                        },
-                        poiname: customLocation.poiname,
-                    };
-                }
-                break;
-        }
         setLocation(loc);
         // 暂不支持自定位置，初始化表单值都是{}
         events.change({ value: {} });
     }, [locationType]);
     useEffect(() => {
-        if (locationType != 3) {
-            return;
-        }
-        if (checkCustomLocation(customLocation)) {
-            showToast('位置输入格式错误请检查');
-            return;
+        if (checkCustomLocation(value)) {
+            // 表单为新增时回传点位信息
+            const { address, detailedAddress, geopoint } = value;
+            const coordinates = (geopoint === null || geopoint === void 0 ? void 0 : geopoint.coordinates) || [];
+            let loc = {
+                poiname: address,
+                detailedAddress: detailedAddress,
+                latlng: { lng: coordinates[0], lat: coordinates[1] },
+            };
+            customLocation.current = value;
+            setLocation(loc);
         }
-        let { latitude, longitude, poiname } = customLocation;
-        let loc = {
-            latlng: {
-                lat: latitude,
-                lng: longitude,
-            },
-            poiname: poiname,
-            detailedAddress: '',
-        };
-        setLocation(loc);
-    }, [customLocation, locationType]);
+    }, [value]);
     // 获取定位信息
     useEffect(() => {
         if (!dataSourceStatus.status ||
@@ -138,6 +117,11 @@ export default function LocationH5(props) {
                 let getLocationType = inH5IsMobile() ? 'getLocation' : 'getIpLocation';
                 geolocation[getLocationType]((ipLocation) => {
                     const { city, lat, lng, addr } = ipLocation;
+                    setApiKeyStatus({
+                        status: true,
+                        message: '',
+                    });
+                    setCurrentLocStatus(true);
                     let loc = {
                         poiname: city + addr,
                         detailedAddress: city + addr,
@@ -146,10 +130,12 @@ export default function LocationH5(props) {
                     if (locationType === 1) {
                         loc.locationType = 1;
                     }
-                    setLocation(loc);
                     currentLocations.current = loc;
+                    // 表单为新增时检查是否为回传点位信息
+                    if (checkCustomLocation(customLocation.current))
+                        return;
+                    setLocation(loc);
                     if (locationType === 2) {
-                        loc.locationType = 1;
                         events.change &&
                             events.change({
                                 value: {
@@ -162,11 +148,6 @@ export default function LocationH5(props) {
                                 },
                             });
                     }
-                    setApiKeyStatus({
-                        status: true,
-                        message: '',
-                    });
-                    setCurrentLocStatus(true);
                 }, (error) => {
                     console.log('error loc', error);
                     currentLocations.current = null;
@@ -233,20 +214,15 @@ export default function LocationH5(props) {
         }
     }, [dataSource]);
     const checkCustomLocation = (params) => {
-        let { latitude, longitude } = params;
-        let message = '';
-        if (Object.prototype.toString.call(params) !== '[object Object]') {
-            return (message = '位置输入格式错误 请检查');
-        }
-        else if (!latitude || !Number(latitude)) {
-            return (message = '位置输入格式错误 请检查');
-        }
-        else if (!longitude || !Number(longitude)) {
-            return (message = '位置输入格式错误 请检查');
+        var _a;
+        let status = true;
+        if (!(params === null || params === void 0 ? void 0 : params.address) || !(params === null || params === void 0 ? void 0 : params.detailedAddress)) {
+            status = false;
         }
-        else if (!params) {
-            return (message = '位置输入格式错误 请检查');
+        else if (((_a = params === null || params === void 0 ? void 0 : params.geopoint) === null || _a === void 0 ? void 0 : _a.type) != 'Point') {
+            status = false;
         }
+        return status;
     };
     const showToast = (message) => {
         weui.toast(message, {

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

@@ -19,7 +19,7 @@ export default function LocationPC(props) {
     // 系统属性
     id, className, style, events, 
     // 组件属性
-    value, label, labelVisible, customLocation, locationType, showLngLat, showMap, drag, zoom, disabled, requiredFlag, decorator, dataSource, layout, locationRange, customRange, } = props;
+    value, label, labelVisible, locationType, showLngLat, showMap, drag, zoom, disabled, requiredFlag, decorator, dataSource, layout, locationRange, customRange, } = props;
     const cls = classNames({
         'weda-ui': true,
         cloudbase_standard: true,
@@ -47,12 +47,26 @@ export default function LocationPC(props) {
                 value: noaddr ? {} : res,
             });
     };
-    const { location, setLocation, apiKeyStatus, setApiKeyStatus, currentLocStatus, currentLocations, } = useLocationInfo({
+    const { location, setLocation, apiKeyStatus, setApiKeyStatus, currentLocStatus, currentLocations, customLocation, checkCustomLocation, } = useLocationInfo({
         apiKey: APIKEY,
         locationType,
         dataSourceStatus,
         eventsChange,
     });
+    useEffect(() => {
+        if (checkCustomLocation(value)) {
+            // 表单为新增时回传点位信息
+            const { address, detailedAddress, geopoint } = value;
+            const coordinates = (geopoint === null || geopoint === void 0 ? void 0 : geopoint.coordinates) || [];
+            let loc = {
+                poiname: address,
+                detailedAddress: detailedAddress,
+                latlng: { lng: coordinates[0], lat: coordinates[1] },
+            };
+            customLocation.current = value;
+            setLocation(loc);
+        }
+    }, [value]);
     useEffect(() => {
         if (value || !currentLocations.current)
             return;
@@ -164,20 +178,6 @@ export default function LocationPC(props) {
                     detailedAddress: location.detailedAddress,
                 };
                 break;
-            case 3:
-                if (checkCustomLocation(customLocation)) {
-                    showToast('位置输入格式错误 请检查');
-                }
-                else {
-                    loc = {
-                        latlng: {
-                            lat: customLocation.latitude,
-                            lng: customLocation.longitude,
-                        },
-                        poiname: customLocation.poiname,
-                    };
-                }
-                break;
         }
         setLocation(loc);
         // 暂不支持自定位置，初始化表单值都是{}
@@ -188,41 +188,6 @@ export default function LocationPC(props) {
             detailedAddress: loc.detailedAddress,
         }, true);
     }, [locationType]);
-    useEffect(() => {
-        if (locationType != 3) {
-            return;
-        }
-        if (checkCustomLocation(customLocation)) {
-            showToast('位置输入格式错误 请检查');
-            return;
-        }
-        let { latitude, longitude, poiname, detailedAddress } = customLocation;
-        let loc = {
-            latlng: {
-                lat: latitude,
-                lng: longitude,
-            },
-            poiname,
-            detailedAddress,
-        };
-        setLocation(loc);
-    }, [customLocation, locationType]);
-    const checkCustomLocation = (params) => {
-        let { latitude, longitude } = params;
-        let message = '';
-        if (Object.prototype.toString.call(params) !== '[object Object]') {
-            return (message = '位置输入格式错误 请检查');
-        }
-        else if (!latitude || !Number(latitude)) {
-            return (message = '位置输入格式错误 请检查');
-        }
-        else if (!longitude || !Number(longitude)) {
-            return (message = '位置输入格式错误 请检查');
-        }
-        else if (!params) {
-            return (message = '位置输入格式错误 请检查');
-        }
-    };
     const getIsShowMap = () => {
         let status = showMap;
         if (locationType === 1 && location.locationType === 1) {

package/dist/web/components/form/select/dropdown-select/ui.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="react" />
+import { SelectProps } from 'tea-component';
+interface IPureSelectProps extends Pick<SelectProps, 'size' | 'disabled' | 'value' | 'placeholder'> {
+    name?: string;
+    options: {
+        label: string;
+        value: string;
+    }[];
+    onChange: (v: string) => void;
+    layout?: 'horizontal' | 'vertical';
+    className?: string;
+}
+export declare function PureSelectPc(props: IPureSelectProps): JSX.Element;
+export declare function PureSelectH5(props: IPureSelectProps): JSX.Element;
+export {};

package/dist/web/components/form/select/dropdown-select/ui.js

@@ -0,0 +1,55 @@
+import React, { useMemo } from 'react';
+import { ConfigProvider, Select as TeaSelect, } from 'tea-component';
+import classNames from '../../../../utils/classnames';
+import { noop } from '../../../../utils/constant';
+import { useSyncValue } from '../../../../utils/useSyncValue';
+import weui from '../../../../utils/weui';
+export function PureSelectPc(props) {
+    const { size, onChange = noop, disabled, placeholder } = props;
+    const [value, setValue] = useSyncValue(props.value);
+    const options = useMemo(() => {
+        var _a;
+        return ((_a = props.options) !== null && _a !== void 0 ? _a : []).map((opt) => ({
+            text: opt.label,
+            value: opt.value,
+        }));
+    }, [props.options]);
+    return (React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },
+        React.createElement("div", { "data-testid": "form-select" },
+            React.createElement(TeaSelect, { matchButtonWidth: true, size: size, onChange: (v) => {
+                    onChange(v);
+                    setValue(v);
+                }, disabled: disabled, value: value, type: "simulate", appearance: "button", placeholder: placeholder, options: options }))));
+}
+export function PureSelectH5(props) {
+    const { placeholder, name, disabled, onChange = noop, options, layout, className, } = props;
+    const [value, setValue] = useSyncValue(props.value);
+    const subCls = classNames({
+        'weui-cell': true,
+        'weui-cell_active': true,
+        'weui-cell_form': true,
+        'weui-flex__item': layout !== 'vertical',
+        'weui-cell_disabled': disabled,
+    });
+    const onClick = () => {
+        weui.picker(options, {
+            id: String(Date.now()),
+            defaultValue: [value || options[0].value],
+            onConfirm(result) {
+                const item = result[0];
+                setValue(item.value);
+                onChange(item.value);
+            },
+            className,
+        });
+    };
+    const currentLabel = useMemo(() => {
+        const currentOpt = options.find((opt) => opt.value === value);
+        if (!currentOpt)
+            return '';
+        return currentOpt.label;
+    }, [options, value]);
+    return (React.createElement("div", { className: subCls },
+        React.createElement("div", { className: "weui-cell__bd weui-flex" },
+            React.createElement("input", { onClick: onClick, className: "weui-input", type: "select", name: name, placeholder: placeholder, value: currentLabel, disabled: disabled, autoComplete: 'off', readOnly: true, "data-testid": "form-item-select" }))));
+}

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { PropsType } from './index';
-export default function Select({ events, name, placeholder, layout, mode, dateMode, disabled, range, where, primaryField, tipBlock, enumName, dataSourceName, viewId, format, defaultValue, startDate, endDate, defaultDate, startTime, endTime, defaultTime, defaultRegion, defaultMutiRegion, regionType, separator, onChange, }: PropsType): JSX.Element;
+export default function Select({ events, name, placeholder, layout, mode, dateMode, disabled, range, where, primaryField, enumName, dataSourceName, viewId, format, defaultValue, startDate, endDate, defaultDate, startTime, endTime, defaultTime, defaultRegion, defaultMutiRegion, separator, regionType, onChange, }: PropsType): JSX.Element;
 export declare function decodeIsoDatetime(isoStringOrTimesnap: any, type: any, dateMode?: string): any;
 /**
  * 根据时间模式，构造 new Date()的传参格式单个日期和时间组件值

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

@@ -5,35 +5,32 @@ import isObjectEqual from '../../../utils/isObjectEqual';
 import { regionPicker, getRegionTree, getAreaCode } from './region/index';
 import { defaultProps, moment } from './index';
 import { timePicker, yearPicker, monthPicker } from './time';
-import { callDataSource, callWedaApi } from '../../../utils/tcb';
-import destr from 'destr';
 import { emptyObject } from '../../../utils/constant';
-import { getWhereList } from '../../../utils/platform';
+import { PureSelectH5 } from './dropdown-select/ui';
+import { useOptions } from './use-options';
 export default function Select({ 
 // 系统属性
 events = emptyObject, 
 // 组件属性
 name, placeholder, layout, mode, dateMode = 'day', disabled = false, 
 // selector mode
-range = defaultProps.range, where, primaryField, tipBlock, enumName, dataSourceName, viewId, format, defaultValue, 
+range = defaultProps.range, where, primaryField, enumName, dataSourceName, viewId, format, defaultValue, 
 // date mode
 startDate, endDate, defaultDate, 
 // time mode
 startTime, endTime, defaultTime, 
 // region mode
-defaultRegion, defaultMutiRegion, regionType, separator, onChange, }) {
+defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
     var _a;
     const [date, setDate] = React.useState(decodeIsoDatetime(defaultDate, 'date', dateMode));
     const [time, setTime] = React.useState(decodeIsoDatetime(defaultTime, 'time'));
     const [regioDepth, setRegionDepth] = React.useState(3);
     const [regionData, setRegionData] = React.useState([]);
     const [regionTree, setRegionTree] = React.useState([]);
+    const [typeRegion, setTypeRegion] = React.useState(regionType);
     const [region, setRegion] = React.useState(defaultRegion);
     const [mutiRegion, setMutiRegion] = React.useState([]);
-    const [typeRegion, setTypeRegion] = React.useState(regionType);
     const [selectedValue, setSelectedValue] = React.useState(defaultValue);
-    const [option, setOption] = React.useState([{ label: '', value: '' }]);
-    const [records, setRecords] = React.useState([]);
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef({});
     React.useEffect(() => {
@@ -95,7 +92,7 @@ defaultRegion, defaultMutiRegion, regionType, separator, onChange, }) {
             (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: defaultMutiRegion, result: changeValue });
         }
     };
-    const regionTreeMode = React.useMemo(() => {
+    React.useEffect(() => {
         if (mode == 'region' || mode == 'mutiRegion') {
             if (regionData.length < 1) {
                 getAreaCode().then((value) => {
@@ -130,95 +127,6 @@ defaultRegion, defaultMutiRegion, regionType, separator, onChange, }) {
             }
         }
     }, [regionType, mode, regionData]);
-    React.useEffect(() => {
-        // tcb过滤参数
-        const whereEffected = [].concat(getWhereList(where));
-        if ((format === 'father-son' || format === 'related') &&
-            dataSourceName &&
-            viewId) {
-            fetchData({
-                dataSourceName: dataSourceName,
-                viewId: viewId,
-                methodName: 'wedaGetRecords',
-                params: whereEffected,
-            });
-        }
-    }, [where]);
-    // 获取数据列表中主列字段，将其作为选项
-    React.useEffect(() => {
-        var _a;
-        if (records && records.length !== 0 && primaryField) {
-            const option = records.map((item) => {
-                return {
-                    label: item[primaryField] || item._id,
-                    value: item._id,
-                };
-            });
-            setOption(option);
-        }
-        else {
-            setOption([{ label: '', value: '' }]);
-            setSelectedValue('');
-            (_a = events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: '' });
-        }
-    }, [records]);
-    // 获取数据列表
-    const fetchData = async (param) => {
-        let pageNo = 1;
-        const pageSize = 200;
-        let records = [];
-        let total = 99999;
-        for (let index = 0; index < Math.floor(total / pageSize) + 1; index++) {
-            const data = await callDataSource({
-                dataSourceName: param.dataSourceName,
-                viewId: param.viewId,
-                methodName: param.methodName,
-                params: {
-                    where: param.params,
-                    pageNo: pageNo,
-                    pageSize: pageSize,
-                },
-            });
-            pageNo = pageNo + 1;
-            if (data === null || data === void 0 ? void 0 : data.records) {
-                total = (data === null || data === void 0 ? void 0 : data.total) || 0;
-                records = records.concat(data === null || data === void 0 ? void 0 : data.records);
-            }
-        }
-        if (records) {
-            setRecords(records);
-        }
-    };
-    React.useEffect(() => {
-        // 如果绑定字段类型为枚举，且传入自定义选项集的名称则默认使用自定义选项集的内容作为选项
-        if (format === 'x-enum' && enumName) {
-            fetchEnumData({ OptNameList: [enumName], PageIndex: 1, PageSize: 10 });
-        }
-    }, [enumName]);
-    // 获取自定义选项集
-    const fetchEnumData = async (param) => {
-        var _a, _b;
-        const data = await callWedaApi({
-            action: 'DescribeGeneralOptionsDetailList',
-            data: param,
-        });
-        const config = (_b = destr((_a = data === null || data === void 0 ? void 0 : data.Items[0]) === null || _a === void 0 ? void 0 : _a.Config)) !== null && _b !== void 0 ? _b : [];
-        const enumOption = config.map((item) => {
-            return {
-                label: item.value,
-                value: item.key,
-            };
-        });
-        setOption(enumOption);
-    };
-    const isFlex = layout !== 'vertical';
-    const subCls = classNames({
-        'weui-cell': true,
-        'weui-cell_active': true,
-        'weui-cell_form': true,
-        'weui-flex__item': isFlex,
-        'weui-cell_disabled': disabled,
-    });
     const onDateclick = function () {
         const options = {
             className: 'weda-ui weda-picker',
@@ -272,48 +180,20 @@ defaultRegion, defaultMutiRegion, regionType, separator, onChange, }) {
             },
         });
     };
-    const onSelect = function () {
-        if (format === 'father-son' ||
-            format === 'related' ||
-            format === 'x-enum') {
-            weui.picker(option, {
-                id: String(Date.now()),
-                defaultValue: [selectedValue || option[0].value],
-                onConfirm(result) {
-                    var _a;
-                    const item = result[0];
-                    setSelectedValue(item === null || item === void 0 ? void 0 : item.value);
-                    (_a = events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: item === null || item === void 0 ? void 0 : item.value });
-                },
-                className: 'weda-ui weda-picker',
-            });
-        }
-        else {
-            weui.picker(range, {
-                id: String(Date.now()),
-                defaultValue: [selectedValue || range[0].value],
-                onConfirm(result) {
-                    var _a;
-                    const item = result[0];
-                    setSelectedValue(item === null || item === void 0 ? void 0 : item.value);
-                    (_a = events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: item === null || item === void 0 ? void 0 : item.value });
-                },
-                className: 'weda-ui weda-picker',
-            });
-        }
-    };
     let regionTimer;
     const momentClick = async () => {
-        regionTimer = setInterval(() => {
-            setTimeout(() => {
-                if (regionTree.length != 0) {
-                    onRegionClick();
-                }
-            }, 0);
-        }, regionTree.length == 0 ? 500 : 0);
+        const cb = () => {
+            clearTimeout(regionTimer);
+            if (regionTree.length > 0) {
+                onRegionClick();
+            }
+            else {
+                setTimeout(cb, 200);
+            }
+        };
+        regionTimer = setTimeout(cb, 200);
     };
     const onRegionClick = function () {
-        clearInterval(regionTimer);
         let defaultValue = [];
         if (mode == 'region') {
             defaultRegion && defaultRegion.length <= 0
@@ -363,10 +243,6 @@ defaultRegion, defaultMutiRegion, regionType, separator, onChange, }) {
                 onTimeClick();
                 break;
             }
-            case 'selector': {
-                onSelect();
-                break;
-            }
             case 'region': {
                 momentClick();
                 break;
@@ -381,16 +257,9 @@ defaultRegion, defaultMutiRegion, regionType, separator, onChange, }) {
         }
     };
     const result = React.useMemo(() => {
-        var _a, _b;
+        var _a;
         let selectLabel = '';
-        if (format === 'father-son' ||
-            format === 'related' ||
-            format === 'x-enum') {
-            selectLabel = (_a = (option !== null && option !== void 0 ? option : []).find((item) => item.value === selectedValue)) === null || _a === void 0 ? void 0 : _a.label;
-        }
-        else {
-            selectLabel = (_b = (range !== null && range !== void 0 ? range : []).find((item) => item.value === selectedValue)) === null || _b === void 0 ? void 0 : _b.label;
-        }
+        selectLabel = (_a = (range !== null && range !== void 0 ? range : []).find((item) => item.value === selectedValue)) === null || _a === void 0 ? void 0 : _a.label;
         return {
             selector: selectLabel,
             date: date,
@@ -398,7 +267,42 @@ defaultRegion, defaultMutiRegion, regionType, separator, onChange, }) {
             region: (region || []).join(separator),
             mutiRegion: mutiRegion,
         };
-    }, [range, selectedValue, date, time, region, separator, mutiRegion, option]);
+    }, [range, selectedValue, date, time, region, separator, mutiRegion]);
+    const subCls = classNames({
+        'weui-cell': true,
+        'weui-cell_active': true,
+        'weui-cell_form': true,
+        'weui-flex__item': layout !== 'vertical',
+        'weui-cell_disabled': disabled,
+    });
+    let params = {
+        controlledValue: range,
+    };
+    if (format === 'father-son' || format === 'related') {
+        params = {
+            format,
+            dataSourceName,
+            viewId,
+            where,
+            primaryField,
+            controlledValue: range,
+        };
+    }
+    else if (format === 'x-enum') {
+        params = {
+            format,
+            enumName,
+            controlledValue: range,
+        };
+    }
+    const [options] = useOptions(params);
+    if (mode === 'selector') {
+        return (React.createElement(PureSelectH5, { className: "weda-ui weda-picker", name: name, value: selectedValue, placeholder: placeholder, disabled: disabled, options: options, onChange: (value) => {
+                var _a;
+                setSelectedValue(value);
+                (_a = events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
+            } }));
+    }
     return (React.createElement("div", { className: subCls },
         React.createElement("div", { className: "weui-cell__bd weui-flex" },
             React.createElement("input", { onClick: onClick, className: "weui-input", type: "select", name: name, placeholder: placeholder, value: (_a = result[mode]) !== null && _a !== void 0 ? _a : '', disabled: disabled, autoComplete: 'off', readOnly: true, "data-testid": "form-item-select" }))));

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

@@ -12,7 +12,7 @@ export interface PropsType extends CommonFormPropsType {
     dataSourceName?: string;
     viewId?: string;
     enumName?: string;
-    format?: string;
+    format?: 'father-son' | 'related' | 'x-enum';
     primaryField?: string;
     tipBlock?: any;
     where?: {