@cloudbase/weda-ui 3.1.1 → 3.1.4

package/dist/web/components/chart/common/core/eChartBar.d.ts

@@ -28,5 +28,41 @@ declare class EchartBar extends EchartBase {
     setDirectionType({ directionType }: {
         directionType: any;
     }): void;
+    setOptions({ directionType, isPile, setColor, isTitle, title, titleLocation, dataSource, filterData, xField, xStatistics, groupKey, groupKeyTimeSpan, xIsCountEmpty, yField, isLegend, legend, legend2, isXaxisName, xAxisName, isXaxisAxisLabelShow, isXaxisAxisTickShow, isXaxisAxisLabelRotate, isYAxisSplitlineLinestyleWidth, yAxisSplitlineLinestyleType, yAxisMax, yAxisMin, isYAxisName, yAxisName, isSeriesShowSymbol, isYAxisShow, isUnit, unit, decimalDigits, suffix, }: {
+        directionType: any;
+        isPile: any;
+        setColor: any;
+        isTitle: any;
+        title: any;
+        titleLocation: any;
+        dataSource: any;
+        filterData: any;
+        xField: any;
+        xStatistics: any;
+        groupKey: any;
+        groupKeyTimeSpan: any;
+        xIsCountEmpty: any;
+        yField: any;
+        isLegend: any;
+        legend: any;
+        legend2: any;
+        isXaxisName: any;
+        xAxisName: any;
+        isXaxisAxisLabelShow: any;
+        isXaxisAxisTickShow: any;
+        isXaxisAxisLabelRotate: any;
+        isYAxisSplitlineLinestyleWidth: any;
+        yAxisSplitlineLinestyleType: any;
+        yAxisMax: any;
+        yAxisMin: any;
+        isYAxisName: any;
+        yAxisName: any;
+        isSeriesShowSymbol: any;
+        isYAxisShow: any;
+        isUnit: any;
+        unit: any;
+        decimalDigits: any;
+        suffix: any;
+    }): Promise<any>;
 }
 import EchartBase from "./eChartBase";

package/dist/web/components/chart/common/core/eChartBar.js

@@ -43,7 +43,9 @@ class EchartBar extends EchartBase {
                             data: [],
                         };
                         sortedXAxisData.forEach((itemSource, index) => {
-                            this.config.series[j].name = itemSource.YLabels[j].Cn_Name;
+                            var _a, _b;
+                            this.config.series[j].name =
+                                (_b = (_a = itemSource.YLabels[j]) === null || _a === void 0 ? void 0 : _a.Cn_Name) !== null && _b !== void 0 ? _b : itemSource.YLabels[j].Name;
                             if ((itemSource.YLabels[j].Value === undefined ||
                                 itemSource.YLabels[j].Value === null) &&
                                 !xIsCountEmpty) {

package/dist/web/components/chart/common/core/eChartLine.d.ts

@@ -24,5 +24,39 @@ declare class EchartLine extends EchartBase {
         decimalDigits: any;
         suffix: any;
     }): void;
+    setOptions({ chartType, isTitle, title, titleLocation, dataSource, filterData, xField, xStatistics, groupKey, groupKeyTimeSpan, xIsCountEmpty, yField, isLegend, legend, legend2, isXaxisName, xAxisName, isXaxisAxisLabelShow, isXaxisAxisTickShow, isXaxisAxisLabelRotate, isYAxisSplitlineLinestyleWidth, yAxisSplitlineLinestyleType, yAxisMax, yAxisMin, isYAxisName, yAxisName, isSeriesShowSymbol, isYAxisShow, isUnit, unit, decimalDigits, suffix, }: {
+        chartType: any;
+        isTitle: any;
+        title: any;
+        titleLocation: any;
+        dataSource: any;
+        filterData: any;
+        xField: any;
+        xStatistics: any;
+        groupKey: any;
+        groupKeyTimeSpan: any;
+        xIsCountEmpty: any;
+        yField: any;
+        isLegend: any;
+        legend: any;
+        legend2: any;
+        isXaxisName: any;
+        xAxisName: any;
+        isXaxisAxisLabelShow: any;
+        isXaxisAxisTickShow: any;
+        isXaxisAxisLabelRotate: any;
+        isYAxisSplitlineLinestyleWidth: any;
+        yAxisSplitlineLinestyleType: any;
+        yAxisMax: any;
+        yAxisMin: any;
+        isYAxisName: any;
+        yAxisName: any;
+        isSeriesShowSymbol: any;
+        isYAxisShow: any;
+        isUnit: any;
+        unit: any;
+        decimalDigits: any;
+        suffix: any;
+    }): Promise<void>;
 }
 import EchartBase from "./eChartBase";

package/dist/web/components/chart/common/core/eChartLine.js

@@ -43,7 +43,9 @@ class EchartLine extends EchartBase {
                             data: [],
                         };
                         sortedXAxisData.forEach((itemSource, index) => {
-                            this.config.series[j].name = itemSource.YLabels[j].Cn_Name;
+                            var _a, _b;
+                            this.config.series[j].name =
+                                (_b = (_a = itemSource.YLabels[j]) === null || _a === void 0 ? void 0 : _a.Cn_Name) !== null && _b !== void 0 ? _b : itemSource.YLabels[j].Name;
                             if ((itemSource.YLabels[j].Value === undefined ||
                                 itemSource.YLabels[j].Value === null) &&
                                 !xIsCountEmpty) {

package/dist/web/components/chart/common/core/eChartPie.d.ts

@@ -24,5 +24,27 @@ declare class EchartPie extends EchartBase {
         decimalDigits: any;
         suffix: any;
     }): void;
+    setOptions({ chartType, isTitle, title, titleLocation, dataSource, filterData, setColor, xField, xStatistics, xIsCountEmpty, yField, isLegend, legend, legend2, isSeriesShowSymbol, isPercent, isUnit, unit, decimalDigits, suffix, }: {
+        chartType: any;
+        isTitle: any;
+        title: any;
+        titleLocation: any;
+        dataSource: any;
+        filterData: any;
+        setColor: any;
+        xField: any;
+        xStatistics: any;
+        xIsCountEmpty: any;
+        yField: any;
+        isLegend: any;
+        legend: any;
+        legend2: any;
+        isSeriesShowSymbol: any;
+        isPercent: any;
+        isUnit: any;
+        unit: any;
+        decimalDigits: any;
+        suffix: any;
+    }): Promise<void>;
 }
 import EchartBase from "./eChartBase";

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

@@ -35,7 +35,7 @@ name = 'formCheckbox', label = '标题', labelVisible = true, format = '', enumN
     // 两次range不同时, 需要刷新checkedItems
     const prevRangeRef = React.useRef();
     React.useEffect(() => {
-        if (!isObjectEqual(prevRangeRef.current, option)) {
+        if (!isObjectEqual(prevRangeRef.current, option, true)) {
             prevRangeRef.current = JSON.parse(JSON.stringify(option));
             setCheckedItems(fromEntries(option.map(({ value, checked }) => [value, !!checked])));
         }

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

@@ -7,3 +7,7 @@
   padding-left: 1.71429rem;
   padding-right: 1.71429rem;
 }
+
+.weda-form-toast .weui-icon_toast {
+  display: none !important;
+}

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

@@ -1,13 +1,32 @@
 /// <reference types="react" />
-import './index.css';
 import type { CommonFormPropsType } from '../types';
-export default function Form({ className, contentSlot, style, id, layout, }: {
+import './index.css';
+/**
+ * 表单容器组件
+ */
+export default function Form({ className, contentSlot, style, id, layout, formType, datasourceType, dataSourceName, _id, methodGetItem, paramGetItem, events, appCloud, }: {
     className: any;
     contentSlot: any;
     style: any;
     id: any;
     layout: any;
+    formType: any;
+    datasourceType: any;
+    dataSourceName: any;
+    _id: any;
+    methodGetItem: any;
+    paramGetItem: any;
+    events: any;
+    appCloud?: any;
 }): JSX.Element;
 export interface PropsType extends CommonFormPropsType {
     contentSlot?: any;
+    formType?: string;
+    datasourceType?: string;
+    dataSourceName?: string;
+    _id?: string;
+    methodCreate?: string;
+    methodGetItem?: string;
+    paramGetItem?: any;
+    methodUpdate?: string;
 }

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

@@ -1,19 +1,16 @@
 import * as React from 'react';
 import classNames from '../../../utils/classnames';
+import { ConfigProvider, Form as TeaForm, message as TeaMessage, } from 'tea-component';
+import { usePlatform, isInIde } from '../../../utils/platform';
+import { callDataSource, callConnector } from '../../../utils/tcb';
+import weui from '../../../utils/weui';
 import './index.css';
-import { ConfigProvider, Form as TeaForm } from 'tea-component';
-import { usePlatform } from '../../../utils/platform';
-export default function Form({ 
-// 系统属性
-className, 
-// 组件属性
-// title,
-// description,
-// tips,
-contentSlot, 
-// buttonSlot,
-style, id, layout, }) {
-    const platform = usePlatform();
+/**
+ * 表单容器组件
+ */
+export default function Form({ className, contentSlot, style, id, layout, formType, datasourceType, dataSourceName, _id, methodGetItem, paramGetItem, events, appCloud = { callDataSource, callConnector }, }) {
+    const platform = usePlatform(); // h5 | web
+    const isDataModel = !['connector', 'custom-connector'].includes(datasourceType); // 是否为数据模型，兼容历史 undefined
     const cls = classNames({
         'weda-ui': true,
         'weda-form': true,
@@ -22,10 +19,87 @@ style, id, layout, }) {
         'gsd-h5-react-form-pc': platform === 'pc',
         [className]: className,
     });
-    if (platform === 'pc') {
+    const timeRef = React.useRef(null);
+    React.useEffect(() => {
+        const getData = async () => {
+            var _a, _b;
+            try {
+                let initValue = {};
+                if (isDataModel) {
+                    // 数据模型查询条件
+                    if (formType === 'edit' && dataSourceName) {
+                        initValue = await appCloud.callDataSource({
+                            dataSourceName,
+                            methodName: 'wedaGetItem',
+                            params: { _id },
+                        }, true);
+                        if (Object.keys(initValue).length !== 0) {
+                            (_a = events === null || events === void 0 ? void 0 : events.onInitValue) === null || _a === void 0 ? void 0 : _a.call(events, initValue);
+                        }
+                        else {
+                            alertError(platform);
+                        }
+                    }
+                }
+                else {
+                    // 连接器查询条件
+                    if (formType === 'edit' &&
+                        dataSourceName &&
+                        methodGetItem &&
+                        paramGetItem) {
+                        initValue = await appCloud.callConnector({
+                            dataSourceName,
+                            methodName: methodGetItem,
+                            params: paramGetItem,
+                        }, true);
+                        if (Object.keys(initValue).length !== 0) {
+                            (_b = events === null || events === void 0 ? void 0 : events.onInitValue) === null || _b === void 0 ? void 0 : _b.call(events, initValue);
+                        }
+                    }
+                }
+            }
+            catch (e) {
+                alertError(platform);
+            }
+        };
+        if (dataSourceName && formType === 'edit') {
+            if ((isDataModel && _id) ||
+                (!isDataModel && paramGetItem && methodGetItem)) {
+                clearTimeout(timeRef.current);
+                timeRef.current = setTimeout(() => getData(), 100);
+            }
+        }
+    }, [
+        formType,
+        isDataModel,
+        dataSourceName,
+        _id,
+        platform,
+        methodGetItem,
+        paramGetItem,
+    ]);
+    // pc 渲染
+    const renderPc = () => {
         return (React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },
             React.createElement(TeaForm, { layout: layout, className: cls, style: style, id: id }, contentSlot)));
+    };
+    // h5 渲染
+    const renderH5 = () => {
+        return (React.createElement("div", { className: cls, style: style, id: id },
+            React.createElement("div", { className: "weui-cells__group weui-cells__group_form" }, contentSlot)));
+    };
+    return platform === 'pc' ? renderPc() : renderH5();
+}
+/**
+ * 根据平台不同，展示不同的错误提示消息
+ */
+function alertError(platform = 'h5', message = '更新场景下未查询到数据') {
+    if (isInIde())
+        return;
+    if (platform === 'h5') {
+        weui.toast(message, { className: 'weda-form-toast' });
+    }
+    else {
+        TeaMessage.error({ content: message });
     }
-    return (React.createElement("div", { className: cls, style: style, id: id },
-        React.createElement("div", { className: "weui-cells__group weui-cells__group_form" }, contentSlot)));
 }

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

@@ -103,6 +103,10 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
                         width: 70,
                         height: 70,
                         src: base64LocationIcon,
+                        anchor: {
+                            x: 35,
+                            y: 30,
+                        },
                     }),
                 },
                 geometries: [
@@ -119,9 +123,7 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
                 ],
             });
             // 监听中心点变化事件，更新marker的位置
-            map.on('center_changed', updateCenter);
-            map.on('drag', clearChooseLoc);
-            map.on('zoom', clearChooseLoc);
+            map.on('drag', mapDrag);
         }
     };
     const initCircle = (TMap, map) => {
@@ -149,23 +151,14 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
             new TMap.MultiCircle(circle);
         }
     };
-    const clearChooseLoc = () => {
-        setChooseLoc({});
-    };
-    const updateCenter = () => {
+    const mapDrag = () => {
         const TMap = getTMap();
         const canLoad = TMap && lat && lng && mapRef.current;
         if (canLoad) {
             const currentLocationsLatlng = currentLocations.latlng;
-            const nowPosition = new TMap.LatLng(currentLocationsLatlng.lat, currentLocationsLatlng.lng);
             let centerPosition = mapRef.current.getCenter();
             centerRef.current = centerPosition;
             markerRef.current.updateGeometries([
-                {
-                    id: `pointer-origin-${mapDomName}`,
-                    styleId: 'originPointer',
-                    position: nowPosition,
-                },
                 {
                     id: `pointer-${mapDomName}`,
                     styleId: 'pointer',
@@ -174,21 +167,27 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
             ]);
             exploreNear('updateCenter');
             // 计算距离
-            if (getRadius()) {
-                let latlng1 = {
-                    latitude: currentLocationsLatlng.lat,
-                    longitude: currentLocationsLatlng.lng,
-                };
-                let latlng2 = {
-                    latitude: centerPosition.getLat(),
-                    longitude: centerPosition.getLng(),
-                };
-                const distance = calculateDistance(latlng1, latlng2);
-                let isOutof = getRadius() && getRadius() < distance;
-                setIsOutofrange(isOutof);
-                if (!isPC) {
-                    changeSearchBoxHeight(false, isOutof);
-                }
+            compareDistance(currentLocationsLatlng, {
+                lat: centerPosition.getLat(),
+                lng: centerPosition.getLng(),
+            });
+        }
+    };
+    const compareDistance = (currentLocation, centerPosition) => {
+        if (getRadius()) {
+            let latlng1 = {
+                latitude: currentLocation.lat,
+                longitude: currentLocation.lng,
+            };
+            let latlng2 = {
+                latitude: centerPosition.lat,
+                longitude: centerPosition.lng,
+            };
+            const distance = calculateDistance(latlng1, latlng2);
+            let isOutof = getRadius() && getRadius() < distance;
+            setIsOutofrange(isOutof);
+            if (!isPC) {
+                changeSearchBoxHeight(false, isOutof, true);
             }
         }
     };
@@ -217,23 +216,88 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
                 let list = [...exploreList, ...res.data];
                 if (searchListPageSize.current === 1) {
                     list = res.data;
+                    setRealLocation({ lat, lng }, list);
+                }
+                else {
+                    setExploreList(list);
                 }
-                setExploreList(list);
+            }
+            else {
+                setRealLocation({ lat, lng }, []);
             }
         })
             .catch((error) => {
             setSearchLoadingStatus(false);
+            setRealLocation({ lat, lng }, []);
             console.log('explore error', error);
         });
     }, 500);
+    // 逆解析查询当前经纬度地址
+    const setRealLocation = (location, list) => {
+        const { lat, lng } = location;
+        let TMap = getTMap();
+        const Geocoder = new TMap.service.Geocoder();
+        Geocoder.getAddress({
+            location: new TMap.LatLng(lat, lng),
+        })
+            .then(({ status, result }) => {
+            var _a;
+            if (status == 0) {
+                let address = result.address;
+                let title = (_a = result === null || result === void 0 ? void 0 : result.formatted_addresses) === null || _a === void 0 ? void 0 : _a.recommend;
+                let item = {
+                    id: 'current-location',
+                    location: {
+                        lat,
+                        lng,
+                    },
+                    title: title ? title : address,
+                    address,
+                };
+                setChooseLoc(item);
+                changeLocation(item);
+                setExploreList([item, ...list]);
+            }
+        })
+            .catch((error) => {
+            console.log('getAddress error', error);
+            let item = {
+                id: 'current-location',
+                location: {
+                    lat,
+                    lng,
+                },
+                title: '[位置]',
+                address: '暂无地址信息',
+            };
+            setChooseLoc(item);
+            changeLocation(item);
+            setExploreList([item]);
+        });
+    };
     const chooseLoction = (value, type) => {
         const TMap = getTMap();
         //定义地图中心点坐标
         const center = new TMap.LatLng(value.location.lat, value.location.lng);
         mapRef.current.setCenter(center);
+        markerRef.current.updateGeometries([
+            {
+                id: `pointer-${mapDomName}`,
+                styleId: 'pointer',
+                position: center,
+            },
+        ]);
         setChooseLoc(value);
         changeLocation(value);
-        type && cancleSearch();
+        if (type) {
+            setExploreList([]);
+            cancleSearch();
+            mapDrag();
+        }
+        else {
+            const currentLocationsLatlng = currentLocations.latlng;
+            compareDistance(currentLocationsLatlng, value.location);
+        }
     };
     const changeSearchValue = (event) => {
         if (event.target.value) {
@@ -284,12 +348,9 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
         document.getElementsByClassName('map-choose-header_search_input')[0].blur();
         touchCoordinate.current.startY = event.changedTouches[0].clientY;
     };
-    const changeSearchBoxHeight = (status, currentOutofrange) => {
+    const changeSearchBoxHeight = (status, currentOutofrange, isInDrag) => {
         // 搜索区域默认 328px ，上拉 75% ，当超出范围多一个超出提示 46px
-        let isOut = isOutofrange;
-        if (currentOutofrange) {
-            isOut = currentOutofrange;
-        }
+        let isOut = isInDrag ? currentOutofrange : isOutofrange;
         const boxHeight = Math.ceil(clientHeight * 0.75);
         let searchBoxHeights = isOut ? 328 - 46 : 328;
         if (status) {
@@ -400,6 +461,7 @@ export default function MapChoose({ changeLocation, onConfirm, onClose, currentL
             mapRef.current.setCenter(nowPosition);
             searchListPageSize.current = 1;
             setChooseLoc({});
+            mapDrag();
         }
     };
     const getConfirm = () => {

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

@@ -13,10 +13,9 @@ export namespace propTypes {
     const zoom: PropTypes.Requireable<boolean>;
     const disabled: PropTypes.Requireable<boolean>;
     const requiredFlag: PropTypes.Requireable<boolean>;
-    const decorator: PropTypes.Requireable<any[] | PropTypes.ReactNodeLike>;
+    const decorator: PropTypes.Requireable<PropTypes.ReactNodeLike>;
     const value: PropTypes.Requireable<object>;
     const locationType: PropTypes.Requireable<number>;
-    const customLocation: PropTypes.Requireable<object>;
     const dataSource: PropTypes.Requireable<object>;
 }
 export namespace defaultProps {
@@ -44,8 +43,6 @@ export namespace defaultProps {
     export { requiredFlag_1 as requiredFlag };
     const locationType_1: number;
     export { locationType_1 as locationType };
-    const customLocation_1: {};
-    export { customLocation_1 as customLocation };
     export namespace value_1 {
         const address: string;
         namespace geopoint {

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

@@ -19,7 +19,6 @@ export const propTypes = {
     decorator: PropTypes.oneOfType([PropTypes.array, PropTypes.node]),
     value: PropTypes.object,
     locationType: PropTypes.number,
-    customLocation: PropTypes.object,
     dataSource: PropTypes.object,
 };
 export const defaultProps = {
@@ -37,7 +36,6 @@ export const defaultProps = {
     disabled: false,
     requiredFlag: false,
     locationType: 1,
-    customLocation: {},
     // 模型应用属性
     value: {
         address: '',

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

@@ -30,5 +30,7 @@ export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsCh
     }>>;
     currentLocStatus: boolean;
     currentLocations: React.MutableRefObject<undefined>;
+    customLocation: React.MutableRefObject<undefined>;
+    checkCustomLocation: (params: any) => boolean;
 };
 import * as React from "react";

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

@@ -14,6 +14,18 @@ export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsCh
     });
     const [currentLocStatus, setCurrentLocStatus] = useState(false);
     const currentLocations = useRef();
+    const customLocation = useRef();
+    const checkCustomLocation = (params) => {
+        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 (((_a = params === null || params === void 0 ? void 0 : params.geopoint) === null || _a === void 0 ? void 0 : _a.type) != 'Point') {
+            status = false;
+        }
+        return status;
+    };
     useEffect(() => {
         if (!dataSourceStatus ||
             !APIKEY ||
@@ -31,12 +43,17 @@ export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsCh
             script.onload = () => {
                 let geolocation = new window.qq.maps.Geolocation();
                 geolocation.getIpLocation(({ city, lat, lng, addr }) => {
+                    setApiKeyStatus({ status: true, message: '' });
+                    setCurrentLocStatus(true);
                     let locations = {
                         poiname: city + addr,
                         detailedAddress: city + addr,
                         latlng: { lat, lng },
                         locationType,
                     };
+                    currentLocations.current = locations;
+                    if (checkCustomLocation(customLocation.current))
+                        return;
                     setLocation(locations);
                     eventsChange &&
                         eventsChange({
@@ -45,9 +62,6 @@ export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsCh
                             latitude: lat,
                             longitude: lng,
                         }, locationType === 1);
-                    currentLocations.current = locations;
-                    setApiKeyStatus({ status: true, message: '' });
-                    setCurrentLocStatus(true);
                 }, (error) => {
                     console.log('error loc', error);
                     currentLocations.current = null;
@@ -84,5 +98,7 @@ export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsCh
         setApiKeyStatus,
         currentLocStatus,
         currentLocations,
+        customLocation,
+        checkCustomLocation,
     };
 }

package/dist/web/components/form/location/components/LocationH5/index.css

@@ -69,7 +69,7 @@
   height: 1.25em;
 }
 .form-location-addr > div {
-  margin-left: 0.85714rem;
+  margin-left: 0.57143rem;
 }
 .form-map-container {
   padding: 0 1.14286rem 1.14286rem 1.14286rem;