@vtx/modals2 5.0.47 → 5.0.48

package/lib/_components/vm-map/index.js

@@ -14,6 +14,8 @@ import { Circle, Dom, FeatureLayer, Map } from '@vtx/ol-map';
 import { useUpdateEffect } from 'ahooks';
 import { Tooltip } from 'antd';
 import classNames from 'classnames';
+import { register } from 'ol/proj/proj4';
+import proj4 from 'proj4';
 import { useEffect, useRef, useState } from 'react';
 import useSettings from "../../_hooks/useSettings";
 import "./index.less";
@@ -40,6 +42,7 @@ export default function VmOlMap(_ref) {
     isDark = _useSettings.isDark,
     theme = _useSettings.theme,
     mapInfo = _useSettings.mapInfo;
+  var projectionRef = useRef(mapInfo.epsg ? "EPSG:".concat(mapInfo.epsg) : 'EPSG:4326');
   var _useState3 = useState({
       data: [],
       style: {}
@@ -49,6 +52,11 @@ export default function VmOlMap(_ref) {
     setNewPoints = _useState4[1];
   useEffect(function () {
     if (mapInfo !== null && mapInfo !== void 0 && mapInfo.longitude) {
+      if (mapInfo.epsg) {
+        projectionRef.current = "EPSG:".concat(mapInfo.epsg);
+        proj4.defs("EPSG:".concat(mapInfo.epsg), mapInfo.proj4);
+        register(proj4);
+      }
       setDefaultCenter([mapInfo.longitude, mapInfo.latitude]);
     }
   }, [mapInfo]);
@@ -202,6 +210,7 @@ export default function VmOlMap(_ref) {
       zoom: 16,
       dark: isDark || theme === 'blue',
       tk: "1adbb6e47668cb33757cd799548bf1f4",
+      projection: projectionRef.current,
       customBaseLayers: layers.length > 0 ? function () {
         return layers;
       } : null,

package/lib/_service/index.js

@@ -9,11 +9,12 @@ import { useRequest } from 'ahooks';
 var CommonService = {
   useBaseInfo: function useBaseInfo(id) {
     var _baseInfoRes$data, _baseInfoRes$data2, _tabConfig$data;
+    var coordType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'wgs84';
     var _useRequest = useRequest(function () {
         return request.get('/cloud/jcss-reborn/facility/get', {
           data: {
             id: id,
-            coordType: 'wgs84'
+            coordType: coordType
           }
         });
       }, {

package/lib/vtx-default-modal/index.js

@@ -7,14 +7,14 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 /**
  * 通用弹窗
  */
-import { VmCustom, VmRepairMaintain, VmVideo } from "../_components";
-import Appraisal from "../vtx-kh-modal/components/Record";
 import { useMemo } from 'react';
+import { VmCustom, VmRepairMaintain, VmVideo } from "../_components";
 import useGetChannels from "../_hooks/useGetChannels";
 import useGetConfig from "../_hooks/useGetConfig";
 import { CommonService } from "../_service";
 import VtxBaseModal from "../vtx-base-modal";
 import Metering from "../vtx-df-modal/components/Metering";
+import Appraisal from "../vtx-kh-modal/components/Record";
 import { BaseInfo } from "./components";
 import "./style";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
@@ -43,7 +43,7 @@ var VtxDefaultModal = function VtxDefaultModal(props) {
     key: TABS_BASE,
     title: '总览信息'
   }];
-  var _CommonService$useBas = CommonService.useBaseInfo(id, 'wgs84'),
+  var _CommonService$useBas = CommonService.useBaseInfo(id, (customMapInfo === null || customMapInfo === void 0 ? void 0 : customMapInfo.coordinate) || 'wgs84'),
     photos = _CommonService$useBas.photos,
     info = _CommonService$useBas.info;
   var _useGetConfig = useGetConfig(info === null || info === void 0 ? void 0 : info.typeCode, tabs),

package/lib/vtx-df-modal/index.js

@@ -39,7 +39,7 @@ var VtxDfModal = function VtxDfModal(props) {
     showCollect = _props$showCollect === void 0 ? true : _props$showCollect,
     _props$zdReborn = props.zdReborn,
     zdReborn = _props$zdReborn === void 0 ? false : _props$zdReborn;
-  var _CommonService$useBas = CommonService.useBaseInfo(id),
+  var _CommonService$useBas = CommonService.useBaseInfo(id, (customMapInfo === null || customMapInfo === void 0 ? void 0 : customMapInfo.coordinate) || 'wgs84'),
     info = _CommonService$useBas.info,
     photos = _CommonService$useBas.photos;
   var tabs = [{

package/lib/vtx-zzz-modal/index.js

@@ -8,12 +8,12 @@ import useGetChannels from "../_hooks/useGetChannels";
 import { BaseInfo as DefaultBaseInfo } from "../vtx-default-modal/components";
 import { BaseInfo, Calendar, Metering, WorkCondition } from "../vtx-df-modal/components";
 // import Appraisal from '../vm-appraisal-info';
-import VmVideo from "../_components/vm-video";
-import { CommonService } from "../_service";
-import { BaseService } from "../vtx-df-modal/api";
 import VmCustom from "../_components/vm-custom";
+import VmVideo from "../_components/vm-video";
 import useGetConfig from "../_hooks/useGetConfig";
+import { CommonService } from "../_service";
 import VtxBaseModal from "../vtx-base-modal";
+import { BaseService } from "../vtx-df-modal/api";
 import "../vtx-df-modal/style";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 var TABS_BASE = 'base';
@@ -38,7 +38,7 @@ var VtxDfModal = function VtxDfModal(props) {
     tabChose = props.tabChose,
     _props$showCollect = props.showCollect,
     showCollect = _props$showCollect === void 0 ? true : _props$showCollect;
-  var _CommonService$useBas = CommonService.useBaseInfo(id),
+  var _CommonService$useBas = CommonService.useBaseInfo(id, (customMapInfo === null || customMapInfo === void 0 ? void 0 : customMapInfo.coordinate) || 'wgs84'),
     info = _CommonService$useBas.info,
     photos = _CommonService$useBas.photos;
   var tabs = [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "5.0.47",
+  "version": "5.0.48",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",
@@ -40,9 +40,12 @@
     "@types/react-dom": "^18.0.0",
     "@umijs/lint": "^4.0.0",
     "@vtx/components": "^3.1.166",
-    "@vtx/ol-map": "^1.0.151",
+    "@vtx/ol-map": "^1.0.170",
     "@vtx/player": "latest",
     "@vtx/utils": "^1.0.20",
+    "@turf/turf": "^7.3.4",
+    "ol": "6.15.1",
+    "proj4": "^2.20.8",
     "ahooks": "^3.1.5",
     "antd": "^4.24.16",
     "antd-dayjs-webpack-plugin": "^1.0.6",