@cloudbase/weda-ui 3.1.1 → 3.1.2

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/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/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/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: [

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;

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/h5.js

@@ -147,19 +147,21 @@ defaultRegion, defaultMutiRegion, regionType, separator, onChange, }) {
     // 获取数据列表中主列字段，将其作为选项
     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: '' });
+        if (primaryField) {
+            if (records && records.length !== 0) {
+                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]);
     // 获取数据列表

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

@@ -89,19 +89,21 @@ function SelectPc({ where, dataSourceName, viewId, format, primaryField, enumNam
     // 获取数据列表中主列字段，将其作为选项
     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 === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: '' });
+        if (primaryField) {
+            if (records && records.length !== 0) {
+                const option = records.map((item) => {
+                    return {
+                        label: item[primaryField] || item._id,
+                        value: item._id,
+                    };
+                });
+                setOption(option);
+            }
+            else {
+                setOption([{ label: '', value: '' }]);
+                setSelectedValue('');
+                (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: '' });
+            }
         }
     }, [records]);
     // 获取数据源列表

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

@@ -70,10 +70,13 @@ label, labelVisible, value: initialValue, readOnly, layout, requiredFlag, onChan
     ];
     // 修改img显示逻辑
     const blockRenderFn = (contentBlock, { editor, editorState }) => {
+        var _a;
         if (contentBlock.getType() === 'atomic') {
-            const entity = editorState
-                .getCurrentContent()
-                .getEntity(contentBlock.getEntityAt(0));
+            const entityKey = contentBlock.getEntityAt(0);
+            if (entityKey) {
+                return null;
+            }
+            const entity = (_a = editorState === null || editorState === void 0 ? void 0 : editorState.getCurrentContent()) === null || _a === void 0 ? void 0 : _a.getEntity();
             if (entity.getType() === 'IMAGE') {
                 return {
                     component: RichTextImg,

package/dist/web/utils/isObjectEqual.d.ts

@@ -1,2 +1,2 @@
 export function serde(a: any): any;
-export default function _default(a: any, b: any, shouldSerde?: boolean): boolean;
+export default function _default(a: any, b: any, shouldSerde?: boolean): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -126,7 +126,6 @@
     "jest-canvas-mock": "^2.4.0",
     "jest-environment-jsdom": "^27",
     "jest-preview": "^0.2.5",
-    "less": "^4.1.2",
     "miniprogram-simulate": "^1.5.7",
     "nano-staged": "^0.8.0",
     "pinst": "^3.0.0",
@@ -142,7 +141,7 @@
     "swc-plugin-coverage-instrument": "^0.0.6",
     "ts-loader": "^8.2.0",
     "typescript": "^4.6.4",
-    "webpack": "4.44.2",
+    "webpack": "^5.73.0",
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.9.0",
     "zx": "^5.2.0"
@@ -168,4 +167,4 @@
     "excludeAfterRemap": false,
     "report-dir": "cypress-coverage"
   }
-}
+}

package/CHANGELOG.md

@@ -1,7 +0,0 @@
-# @cloudbase/weda-ui
-
-## 3.1.0
-
-### Minor Changes
-
-- c3fe2b052: 支持大仓模式开发