@cloudbase/weda-ui 3.20.1 → 3.20.2

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

@@ -8,7 +8,7 @@ export namespace propTypes {
     const APIKEY: PropTypes.Requireable<string>;
     const showLngLat: PropTypes.Requireable<boolean>;
     const showMap: PropTypes.Requireable<boolean>;
-    const defauleShowLocation: PropTypes.Requireable<boolean>;
+    const defaultShowLocation: PropTypes.Requireable<boolean>;
     const drag: PropTypes.Requireable<boolean>;
     const zoom: PropTypes.Requireable<boolean>;
     const disabled: PropTypes.Requireable<boolean>;
@@ -31,8 +31,8 @@ export namespace defaultProps {
     export { showLngLat_1 as showLngLat };
     const showMap_1: boolean;
     export { showMap_1 as showMap };
-    const defauleShowLocation_1: boolean;
-    export { defauleShowLocation_1 as defauleShowLocation };
+    const defaultShowLocation_1: boolean;
+    export { defaultShowLocation_1 as defaultShowLocation };
     const drag_1: boolean;
     export { drag_1 as drag };
     const zoom_1: boolean;

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

@@ -11,7 +11,7 @@ export const propTypes = {
     APIKEY: PropTypes.string,
     showLngLat: PropTypes.bool,
     showMap: PropTypes.bool,
-    defauleShowLocation: PropTypes.bool,
+    defaultShowLocation: PropTypes.bool,
     drag: PropTypes.bool,
     zoom: PropTypes.bool,
     disabled: PropTypes.bool,
@@ -30,7 +30,7 @@ export const defaultProps = {
     APIKEY: '',
     showLngLat: false,
     showMap: false,
-    defauleShowLocation: false,
+    defaultShowLocation: false,
     drag: true,
     zoom: true,
     disabled: false,

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

@@ -52,33 +52,24 @@ export default function LocationH5(props) {
     const currentLocations = useRef();
     const customLocation = useRef();
     useEffect(() => {
-        if (value || !currentLocations.current)
-            return;
-        setUserSelectStatus('');
-        // 重置表单时
-        const { poiname, detailedAddress, latlng: { lat, lng }, } = currentLocations.current;
-        let location = {
-            poiname,
-            detailedAddress,
-            latlng: { lat, lng },
-        };
-        if (locationType === 1) {
-            location.locationType = 1;
+        if (locationType !== 3) {
+            // 默认位置选择无时【locationType=1】
+            let location = {
+                latlng: {
+                    lat: 39.98410411,
+                    lng: 116.307503,
+                },
+                poiname: '',
+                detailedAddress: '',
+                locationType,
+            };
+            // 默认位置选择当前用户位置时【locationType=2】
+            if (locationType === 2 && currentLocations.current) {
+                location = currentLocations.current;
+            }
+            setLocation(location);
+            setUserSelectStatus((location === null || location === void 0 ? void 0 : location.detailedAddress) ? 'selected' : '');
         }
-        setLocation(location);
-    }, [value, locationType]);
-    useEffect(() => {
-        let loc = {
-            latlng: {
-                lat: 39.98410411,
-                lng: 116.307503,
-            },
-            poiname: '',
-            detailedAddress: '',
-            locationType,
-        };
-        setLocation(loc);
-        // 暂不支持自定位置，初始化表单值都是{}
     }, [locationType]);
     useEffect(() => {
         if (checkCustomLocation(value)) {
@@ -91,8 +82,26 @@ export default function LocationH5(props) {
                 latlng: { lng: coordinates[0], lat: coordinates[1] },
             };
             customLocation.current = value;
-            setUserSelectStatus('selected');
             setLocation(loc);
+            setUserSelectStatus('selected');
+        }
+        else {
+            // 默认位置选择无时【locationType=1】
+            let location = {
+                latlng: {
+                    lat: 39.98410411,
+                    lng: 116.307503,
+                },
+                poiname: '',
+                detailedAddress: '',
+                locationType,
+            };
+            // 默认位置选择当前用户位置时【locationType=2】
+            if (locationType === 2 && currentLocations.current) {
+                location = currentLocations.current;
+            }
+            setLocation(location);
+            setUserSelectStatus((location === null || location === void 0 ? void 0 : location.poiname) ? 'selected' : '');
         }
     }, [value]);
     // 获取定位信息

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

@@ -13,10 +13,10 @@ const Header = ({ onClick, isEdit, info, disabled, showLngLat, locationType, dat
         if (locationType === 1 && info.locationType === 1) {
             status = false;
         }
-        else if (locationType === 2 && !dataSourceStatus) {
+        else if ([2, 3].includes(locationType) && !dataSourceStatus) {
             status = false;
         }
-        else if (locationType === 2 && !apiKeyStatus.status) {
+        else if ([2, 3].includes(locationType) && !apiKeyStatus.status) {
             status = false;
         }
         else if (!currentLocStatus) {

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

@@ -56,6 +56,26 @@ export default function LocationPC(props) {
         dataSourceStatus,
         eventsChange,
     });
+    useEffect(() => {
+        if (locationType !== 3) {
+            // 默认位置选择无时【locationType=1】
+            let location = {
+                latlng: {
+                    lat: 39.98410411,
+                    lng: 116.307503,
+                },
+                poiname: '',
+                detailedAddress: '',
+                locationType,
+            };
+            // 默认位置选择当前用户位置时【locationType=2】
+            if (locationType === 2 && currentLocations.current) {
+                location = currentLocations.current;
+            }
+            setLocation(location);
+            setUserSelectStatus((location === null || location === void 0 ? void 0 : location.detailedAddress) ? 'selected' : '');
+        }
+    }, [locationType]);
     useEffect(() => {
         if (checkCustomLocation(value)) {
             // 表单为新增时回传点位信息
@@ -70,23 +90,25 @@ export default function LocationPC(props) {
             setLocation(loc);
             setUserSelectStatus('selected');
         }
-    }, [value]);
-    useEffect(() => {
-        if (value || !currentLocations.current)
-            return;
-        setUserSelectStatus('');
-        // 重置表单时
-        const { poiname, detailedAddress, latlng: { lat, lng }, } = currentLocations.current;
-        let location = {
-            poiname,
-            detailedAddress,
-            latlng: { lat, lng },
-        };
-        if (locationType === 1) {
-            location.locationType = 1;
+        else {
+            // 默认位置选择无时【locationType=1】
+            let location = {
+                latlng: {
+                    lat: 39.98410411,
+                    lng: 116.307503,
+                },
+                poiname: '',
+                detailedAddress: '',
+                locationType,
+            };
+            // 默认位置选择当前用户位置时【locationType=2】
+            if (locationType === 2 && currentLocations.current) {
+                location = currentLocations.current;
+            }
+            setLocation(location);
+            setUserSelectStatus((location === null || location === void 0 ? void 0 : location.poiname) ? 'selected' : '');
         }
-        setLocation(location);
-    }, [value, locationType]);
+    }, [value]);
     const showToast = (message) => {
         weui.toast(message, {
             duration: 3000,
@@ -156,31 +178,6 @@ export default function LocationPC(props) {
             });
         }
     }, [dataSource]);
-    useEffect(() => {
-        let loc = {
-            latlng: {
-                lat: 39.98410411,
-                lng: 116.307503,
-            },
-            poiname: '',
-            detailedAddress: '',
-            locationType,
-        };
-        switch (locationType) {
-            case 2:
-                loc = {
-                    latlng: {
-                        lat: location.latlng.lat,
-                        lng: location.latlng.lng,
-                    },
-                    poiname: location.poiname,
-                    detailedAddress: location.detailedAddress,
-                };
-                break;
-        }
-        setLocation(loc);
-        // 暂不支持自定位置，初始化表单值都是{}
-    }, [locationType]);
     const getIsShowMap = () => {
         let status = showMap;
         if (locationType === 1 && location.locationType === 1) {

package/dist/web/components/form-location/index.d.ts

@@ -30,7 +30,7 @@ declare const FormLocation: React.ForwardRefExoticComponent<CommonPropsType & {
     customRange: number;
     requiredFlag: boolean;
     requiredMsg: string;
-    defauleShowLocation: boolean;
+    defaultShowLocation: boolean;
     dataSource: Record<string, unknown>;
 } & {
     onChange: (v: DataType['value']) => void;

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

@@ -5,10 +5,10 @@ import Location from '../form/location';
 import Tips from '../form/tips';
 import { useFormInputTrait } from '../form-input-hooks';
 const FormLocation = React.forwardRef(function FormLocation(props, inputRef) {
-    const { className, id, style, events, required, requiredFlag, label, labelVisible, customRange, dataSource, defauleShowLocation, locationRange, locationType, showLngLat, showMap, zoom, drag, 
+    const { className, id, style, events, required, requiredFlag, label, labelVisible, customRange, dataSource, defaultShowLocation, locationRange, locationType, showLngLat, showMap, zoom, drag, 
     // @ts-expect-error 里面有，但dataForm没有，但json有传
     customLocation, ...restProps } = props;
-    const { value, name, onChange, disabled, layout, readOnly, validateErrorMsg, validateState, visible, } = useFormInputTrait({
+    const { value, name, onChange, disabled, layout, readOnly, validateErrorMsg, validateState, visible } = useFormInputTrait({
         name: restProps.name,
         inputRef,
         required,
@@ -18,6 +18,6 @@ const FormLocation = React.forwardRef(function FormLocation(props, inputRef) {
     if (!visible) {
         return null;
     }
-    return (_jsxs(FormItemWrapper, { children: [_jsx(Location, { id: id, style: style, className: className, events: events, name: name, disabled: disabled, label: label, labelVisible: labelVisible, layout: layout, requiredFlag: required && requiredFlag, value: value, customLocation: customLocation, customRange: customRange, dataSource: dataSource, defauleShowLocation: defauleShowLocation, drag: drag, locationType: locationType, locationRange: locationRange, showLngLat: showLngLat, showMap: showMap, zoom: zoom, onChange: onChange, readOnly: readOnly }), (validateState === 'error' || validateState === 'warn') && (_jsx(Tips, { tips: validateErrorMsg, type: "warn" }))] }));
+    return (_jsxs(FormItemWrapper, { children: [_jsx(Location, { id: id, style: style, className: className, events: events, name: name, disabled: disabled, label: label, labelVisible: labelVisible, layout: layout, requiredFlag: required && requiredFlag, value: value, customLocation: customLocation, customRange: customRange, dataSource: dataSource, defaultShowLocation: defaultShowLocation, drag: drag, locationType: locationType, locationRange: locationRange, showLngLat: showLngLat, showMap: showMap, zoom: zoom, onChange: onChange, readOnly: readOnly }), (validateState === 'error' || validateState === 'warn') && _jsx(Tips, { tips: validateErrorMsg, type: "warn" })] }));
 });
 export default FormLocation;

package/dist/web/components/wd-calendar/wd-calendar.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useMemo, forwardRef, useImperativeHandle, useCallback, } from 'react';
+import { useMemo, forwardRef, useImperativeHandle, useCallback } from 'react';
 import { usePlatform } from '../../utils/platform';
 import { setRefProp } from '../../utils/tool';
 import classNames from '../../utils/classnames';
@@ -12,7 +12,7 @@ import './style';
  * 日历标准化
  */
 export const WdClendar = forwardRef(function WdClendar(props, ref) {
-    const { initVisible = true, configData, events, id, className, style, } = props;
+    const { initVisible = true, configData, events, id, className, style, start = null, end = null } = props;
     const valueStamp = useMemo(() => { var _a, _b; return (_b = (_a = getStartMoment('day', props.value)) === null || _a === void 0 ? void 0 : _a.valueOf()) !== null && _b !== void 0 ? _b : null; }, [props.value]);
     const monthStamp = useMemo(() => { var _a, _b; return (_b = (_a = getStartMoment('month', props.initMonth)) === null || _a === void 0 ? void 0 : _a.valueOf()) !== null && _b !== void 0 ? _b : null; }, [props.initMonth]);
     const [value, setValue] = useSyncValue(valueStamp);
@@ -23,7 +23,7 @@ export const WdClendar = forwardRef(function WdClendar(props, ref) {
     const cls = classNames(blockName, 'weda-ui', `${blockName}-${platform}`, className);
     const { year: monthYear, month: monthMonth } = yearMonthItem;
     const configDataObj = useMemo(() => getConfigDataObj(configData), [configData]);
-    const weeks = useMemo(() => convertWeeks(monthYear, monthMonth, configDataObj), [monthYear, monthMonth, configDataObj]);
+    const weeks = useMemo(() => convertWeeks(monthYear, monthMonth, configDataObj, [start, end]), [monthYear, monthMonth, configDataObj, start, end]);
     // 含转时间戳逻辑
     const setValueMethod = useCallback((v) => {
         var _a;
@@ -45,14 +45,7 @@ export const WdClendar = forwardRef(function WdClendar(props, ref) {
         initMonth: monthValue,
         initVisible,
         value,
-    }), [
-        setValueMethod,
-        setInitMonthMethod,
-        configData,
-        monthValue,
-        initVisible,
-        value,
-    ]);
+    }), [setValueMethod, setInitMonthMethod, configData, monthValue, initVisible, value]);
     // 选中日期
     const handleChange = (item) => {
         var _a, _b;

package/dist/web/components/wd-calendar/weeks.d.ts

@@ -9,7 +9,7 @@ interface IconfigDataObj {
 }
 export declare const blockName = "weda-calendar";
 export declare const getConfigDataObj: (configData?: IconfigData[]) => IconfigDataObj;
-export declare const convertWeeks: (year: any, month: any, configDataObj?: IconfigDataObj) => import("../../utils/hooks/useFormLegacy").IWeekItem[][] | {
+export declare const convertWeeks: (year: any, month: any, configDataObj?: IconfigDataObj, range?: any[]) => import("../../utils/hooks/useFormLegacy").IWeekItem[][] | {
     matchDate?: string;
     disabled?: string | boolean;
     marked?: string | boolean;

package/dist/web/components/wd-calendar/weeks.js

@@ -17,8 +17,8 @@ export const getConfigDataObj = (configData) => {
     return obj;
 };
 // 年月转星期
-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/dist/web/components/wd-form/index.js

@@ -347,7 +347,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
     useSetWidgetApi(() => {
         const r = {
             formType,
-            addFormItem(name, formItem, { initialValue, namePath }) {
+            addFormItem(name, formItem, { initialValue, namePath } = {}) {
                 if (isNil(name) || (typeof name === 'string' && name.length === 0)) {
                     // name 没设置或为空串的时候不受表单容器控制
                     console.warn(`组件 #${formItem === null || formItem === void 0 ? void 0 : formItem.id} 表单key(表单输入类组件 name 属性)没设置或为空串的时候不受表单容器控制`);
@@ -395,8 +395,8 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
                     setValueDebounce(value);
                 }
                 else {
-                    const _formFieldsValue = deepClone(formFieldsValue);
-                    setValueDebounce({ ..._formFieldsValue, ...value });
+                    const _formData = deepClone(formData);
+                    setValueDebounce({ ..._formData, ...value });
                 }
             },
             reset() {
@@ -453,8 +453,6 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
     }, [
         formType,
         submitParams,
-        setValue,
-        setValueDebounce,
         initialValues,
         authValue,
         layout,
@@ -473,6 +471,9 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
         enableSubmit,
         fieldInitValueCache,
         formsItemMap,
+        setValueDebounce,
+        formData,
+        setValue,
         validate,
         eventsRef,
         submit,
@@ -522,8 +523,12 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             return;
         }
         lodashSet(_formData, namePath, value);
-        setValue(_formData);
-    }, [formData, setValue]);
+        if (typeof _formData !== 'object' || _formData === null) {
+            console.warn('setValue data need expect a object but got null', _formData);
+            return;
+        }
+        setFormData(_formData);
+    }, [formData]);
     if (initValueLoadingStatus === 'hidden') {
         return null;
     }

package/dist/web/components/wd-location/wd-location.d.ts

@@ -9,5 +9,5 @@ export declare const WdLocation: React.ForwardRefExoticComponent<WdLocationProps
 export interface WdLocationProps extends CommonPropsType, DataType {
     classRoot?: string;
     customLocation?: any;
-    defauleShowLocation?: any;
+    defaultShowLocation?: any;
 }

package/dist/web/components/wd-location/wd-location.js

@@ -13,7 +13,7 @@ import './style';
  * 地图-标准化
  */
 export const WdLocation = forwardRef(function WdLocation(props, ref) {
-    const { classRoot = 'location', clearable = X_RUNTIME_DEFAULT.clearable, placeholder = '选择地理位置', customLocation, customRange = X_RUNTIME_DEFAULT.customRange, dataSource = X_RUNTIME_DEFAULT._dataSourceInLocation, defauleShowLocation, drag = X_RUNTIME_DEFAULT.drag, locationType = X_RUNTIME_DEFAULT.locationType, locationRange = X_RUNTIME_DEFAULT.locationRange, showLngLat = X_RUNTIME_DEFAULT.showLngLat, showMap = X_RUNTIME_DEFAULT.showMap, zoom = X_RUNTIME_DEFAULT.zoom, events = emptyObject, id, } = props;
+    const { classRoot = 'location', clearable = X_RUNTIME_DEFAULT.clearable, placeholder = '选择地理位置', customLocation, customRange = X_RUNTIME_DEFAULT.customRange, dataSource = X_RUNTIME_DEFAULT._dataSourceInLocation, defaultShowLocation, drag = X_RUNTIME_DEFAULT.drag, locationType = X_RUNTIME_DEFAULT.locationType, locationRange = X_RUNTIME_DEFAULT.locationRange, showLngLat = X_RUNTIME_DEFAULT.showLngLat, showMap = X_RUNTIME_DEFAULT.showMap, zoom = X_RUNTIME_DEFAULT.zoom, events = emptyObject, id, } = props;
     const traitProps = { ...props, inputRef: ref };
     const trait = useFormInputTrait(traitProps);
     const { value, onChange, disabled, readOnly, visible } = trait;
@@ -48,5 +48,5 @@ export const WdLocation = forwardRef(function WdLocation(props, ref) {
     const inputWrapProps = { ...props, classRoot, disabled, ...clearProps };
     if (!visible)
         return null;
-    return (_jsx(WdFormItem, { ...formItemProps, children: _jsx(WdInputGroup, { ...inputGroupProps, children: _jsx(WdInputWrap, { ...inputWrapProps, children: _jsx(RecycleProvider, { recycleBack: setIsInit, children: _jsx(Location, { events: events, labelVisible: false, placeholder: placeholder, value: value, customLocation: customLocation, customRange: customRange, dataSource: dataSource, defauleShowLocation: defauleShowLocation, drag: drag, locationType: locationType, locationRange: locationRange, showLngLat: showLngLat, showMap: showMap, zoom: zoom, readOnly: readOnly, disabled: disabled, decorator: null, onChange: onChange, id: id }) }) }) }) }));
+    return (_jsx(WdFormItem, { ...formItemProps, children: _jsx(WdInputGroup, { ...inputGroupProps, children: _jsx(WdInputWrap, { ...inputWrapProps, children: _jsx(RecycleProvider, { recycleBack: setIsInit, children: _jsx(Location, { events: events, labelVisible: false, placeholder: placeholder, value: value, customLocation: customLocation, customRange: customRange, dataSource: dataSource, defaultShowLocation: defaultShowLocation, drag: drag, locationType: locationType, locationRange: locationRange, showLngLat: showLngLat, showMap: showMap, zoom: zoom, readOnly: readOnly, disabled: disabled, decorator: null, onChange: onChange, id: id }) }) }) }) }));
 });

package/dist/web/components/wd-select/select/selectUI.js

@@ -153,7 +153,10 @@ export function SelectUI(props) {
         // 缓存展示的选中项
         setSelectedItem((selectItem) => {
             const newSelectItem = getSelectedItem(options, value);
-            return (newSelectItem === null || newSelectItem === void 0 ? void 0 : newSelectItem.length) ? newSelectItem : selectItem;
+            if (value !== null && value !== undefined) {
+                return (newSelectItem === null || newSelectItem === void 0 ? void 0 : newSelectItem.length) ? newSelectItem : selectItem;
+            }
+            return newSelectItem;
         });
     }, [options, value]);
     const readValue = useMemo(() => {

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

@@ -18,7 +18,8 @@ export const ExportFileModal = ({ fields, columns, isExportFileModalByApiVisible
             (field === null || field === void 0 ? void 0 : field.format) !== 'many-many' &&
             (field === null || field === void 0 ? void 0 : field.format) !== 'many-one' &&
             (field === null || field === void 0 ? void 0 : field.format) !== 'one-many' &&
-            (field === null || field === void 0 ? void 0 : field.format) !== 'one-one') {
+            (field === null || field === void 0 ? void 0 : field.format) !== 'one-one' &&
+            (field === null || field === void 0 ? void 0 : field.format) !== 'one-one-r') {
             supportFields.push(field);
         }
     });
@@ -36,7 +37,7 @@ export const ExportFileModal = ({ fields, columns, isExportFileModalByApiVisible
         .filter((el) => {
         const field = fields.find((i) => (i === null || i === void 0 ? void 0 : i.name) === (el === null || el === void 0 ? void 0 : el.key) && el.isRelated);
         const format = field === null || field === void 0 ? void 0 : field.format;
-        return el.isRelated && el.isExport && format !== 'many-many' && format !== 'one-many';
+        return el.isRelated && el.isExport && format !== 'many-many' && format !== 'one-many' && format !== 'one-one-r';
     })
         .map((item) => {
         return {

package/dist/web/components/wd-table/hooks/useTableData.js

@@ -19,12 +19,15 @@ export const useTableData = ({ dataSourceAPI, connectorMethod, query, events, is
         const fetchVersion = (fetchRef.current.version = getUuid());
         let data = { records: [], total: 0 };
         setTableLoading(true);
+        let canCallQuerySuccess = true;
         try {
             if (isModel) {
                 if (supportManyRelated) {
                     // select为空对象时报错，避免传空对象给数组
                     const select = (query === null || query === void 0 ? void 0 : query.select) || {};
+                    canCallQuerySuccess = false;
                     if (Object.keys(select).length !== 0) {
+                        canCallQuerySuccess = true;
                         data = await dataSourceAPI.getRecordListV2(query, { swr });
                         data.records = data.records || [];
                     }
@@ -50,9 +53,11 @@ export const useTableData = ({ dataSourceAPI, connectorMethod, query, events, is
             else {
                 setTableData(records);
             }
-            events === null || events === void 0 ? void 0 : events.querySuccess({
-                data: Object.assign({}, data, query),
-            });
+            if (canCallQuerySuccess) {
+                events === null || events === void 0 ? void 0 : events.querySuccess({
+                    data: Object.assign({}, data, query),
+                });
+            }
             (records === null || records === void 0 ? void 0 : records.length) === 0 &&
                 (events === null || events === void 0 ? void 0 : events.queryEmpty({
                     data: Object.assign({}, data, query),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.20.1",
+  "version": "3.20.2",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",