@vtx/modals2 6.0.0-beta.3 → 6.0.0-beta.30

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

@@ -3,15 +3,17 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { useMemo } from 'react';
+import Appraisal from "../_components/vm-appraisal-info";
 import VmRepairMaintain from "../_components/vm-repair-maintain";
 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 { translateLocaleText } from "./../hooks/useTranslation.ts";
+import { BaseInfo, BaseInfoZdReborn, Calendar, CalendarZdReborn, Metering, MeteringZdReborn, WorkCondition } from "../vtx-df-modal/components";
+import { translateLocaleText } from "./../hooks/useTranslation.js";
 // import Appraisal from '../vm-appraisal-info';
 import VmCustom from "../_components/vm-custom";
-import VmVideo from "../_components/vm-video";
+import VmVideo, { insertVideoTab } from "../_components/vm-video";
 import useGetConfig from "../_hooks/useGetConfig";
+import { useZdService } from "../_hooks/useUmsService";
 import { CommonService } from "../_service";
 import VtxBaseModal from "../vtx-base-modal";
 import { BaseService } from "../vtx-df-modal/api";
@@ -24,7 +26,7 @@ var TABS_VIDEO = 'video';
 var TABS_APPRAISAL = 'appraisal';
 var TABS_RM = 'rm';
 var TABS_Calendar = 'calendar';
-var VtxDfModal = function VtxDfModal(props) {
+var VtxZzzModal = function VtxZzzModal(props) {
   var id = props.id,
     title = props.title,
     subTitle = props.subTitle,
@@ -39,6 +41,8 @@ var VtxDfModal = function VtxDfModal(props) {
     tabChose = props.tabChose,
     _props$showCollect = props.showCollect,
     showCollect = _props$showCollect === void 0 ? true : _props$showCollect;
+  var serviceConfig = useZdService();
+  var zdReborn = (serviceConfig === null || serviceConfig === void 0 ? void 0 : serviceConfig.zdService) === 'reborn';
   var _CommonService$useBas = CommonService.useBaseInfo(id, (customMapInfo === null || customMapInfo === void 0 ? void 0 : customMapInfo.coordinate) || 'wgs84'),
     info = _CommonService$useBas.info,
     photos = _CommonService$useBas.photos;
@@ -54,11 +58,13 @@ var VtxDfModal = function VtxDfModal(props) {
   }];
   var _useGetConfig = useGetConfig(info === null || info === void 0 ? void 0 : info.typeCode, tabs),
     tabsData = _useGetConfig.tabsData;
-  var _CommonService$useLmD = CommonService.useLmDetail(id),
-    detail = _CommonService$useLmD.detail;
+  var _CommonService = CommonService[zdReborn ? 'useLmDetailZdReborn' : 'useLmDetail'](id),
+    detail = _CommonService.detail;
   var _BaseService$useRealt = BaseService.useRealtimeMonitor(info === null || info === void 0 ? void 0 : info.code),
     realtimeMonitor = _BaseService$useRealt.realtimeMonitor;
-  var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode)),
+  var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode) && (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
+      return ele.key === 'video';
+    })) > -1),
     channels = _useGetChannels.channels;
   // realtimeRes为空则无工况，beenWeigh为false则无计量
   var tabsList = useMemo(function () {
@@ -68,36 +74,37 @@ var VtxDfModal = function VtxDfModal(props) {
         return ele.key !== 'metering';
       });
     }
-    if (tabsList.findIndex(function (ele) {
-      return ele.key === 'video';
-    }) > -1) {
-      if ((channels === null || channels === void 0 ? void 0 : channels.length) < 1) {
-        tabsList = tabsList.filter(function (ele) {
-          return ele.key !== 'video';
-        });
-      }
-    }
-    return tabsList;
+    return insertVideoTab(tabsList, channels);
   }, [JSON.stringify(tabsData), JSON.stringify(channels), JSON.stringify(detail)]);
-  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, !(detail !== null && detail !== void 0 && detail.beenWeigh) && !(realtimeMonitor !== null && realtimeMonitor !== void 0 && realtimeMonitor.length) ? /*#__PURE__*/_jsx(DefaultBaseInfo, {
+  var ZLBase = zdReborn ? BaseInfoZdReborn : BaseInfo;
+  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, !(detail !== null && detail !== void 0 && detail.beenWeigh) && !(realtimeMonitor !== null && realtimeMonitor !== void 0 && realtimeMonitor.length) ? /*#__PURE__*/_jsx(DefaultBaseInfo, {
     id: id,
     info: info,
     photos: photos,
     mapCenter: mapCenter,
     customMapInfo: customMapInfo
-  }) : /*#__PURE__*/_jsx(BaseInfo, {
+  }) : /*#__PURE__*/_jsx(ZLBase, {
     code: info === null || info === void 0 ? void 0 : info.code,
     hasLm: detail === null || detail === void 0 ? void 0 : detail.beenWeigh,
     realtimeMonitor: realtimeMonitor,
     info: info,
     photos: photos
-  })), TABS_METERING, /*#__PURE__*/_jsx(Metering, {
+  })), TABS_METERING, zdReborn ? /*#__PURE__*/_jsx(MeteringZdReborn, {
+    id: id,
+    deviceId: detail === null || detail === void 0 ? void 0 : detail.deviceId
+  }) : /*#__PURE__*/_jsx(Metering, {
     id: id
   })), TABS_WC, /*#__PURE__*/_jsx(WorkCondition, {
     id: id,
     code: info === null || info === void 0 ? void 0 : info.code
-  })), TABS_Calendar, /*#__PURE__*/_jsx(Calendar, {
+  })), TABS_Calendar, zdReborn ? /*#__PURE__*/_jsx(CalendarZdReborn, {
+    code: info === null || info === void 0 ? void 0 : info.code,
+    deviceId: detail === null || detail === void 0 ? void 0 : detail.deviceId,
+    handleAbility: detail === null || detail === void 0 ? void 0 : detail.handleAbility
+  }) : /*#__PURE__*/_jsx(Calendar, {
     code: info === null || info === void 0 ? void 0 : info.code
+  })), TABS_APPRAISAL, /*#__PURE__*/_jsx(Appraisal, {
+    id: id
   })), TABS_RM, /*#__PURE__*/_jsx(VmRepairMaintain, {
     id: id
   })), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
@@ -133,4 +140,4 @@ var VtxDfModal = function VtxDfModal(props) {
     })
   });
 };
-export default VtxDfModal;
+export default VtxZzzModal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "6.0.0-beta.3",
+  "version": "6.0.0-beta.30",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",
@@ -51,10 +51,10 @@
     "@types/react-dom": "^18.0.0",
     "@umijs/lint": "^4.0.0",
     "@vtx/components": "^4.0.0-beta.58",
+    "@vtx/map-icon": "^2.0.62",
     "@vtx/ol-map": "^2.0.0-beta.16",
-    "@vtx/player": "latest",
+    "@vtx/player": "^1.12.13",
     "@vtx/utils": "^1.0.20",
-    "ol": "6.15.1",
     "antd": "6.0.0",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "babel-eslint": "^10.1.0",
@@ -65,22 +65,22 @@
     "father": "^4.1.0",
     "husky": "^8.0.1",
     "lint-staged": "^13.0.3",
+    "ol": "6.15.1",
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.0.0",
     "prettier-plugin-packagejson": "^2.2.18",
     "react": "18.0.0",
     "react-dom": "18.0.0",
-    "stylelint": "^14.9.1",
-    "@vtx/map-icon": "^2.0.62"
+    "stylelint": "^14.9.1"
   },
   "peerDependencies": {
-    "antd": ">=6",
     "@ant-design/icons": ">=6",
     "@vtx/components": ">=4.0.0-beta.0",
     "@vtx/map-icon": ">=2.0.0",
     "@vtx/ol-map": ">=2.0.0-beta.0",
     "@vtx/player": ">=1.0.0",
     "@vtx/utils": ">=1.0.20",
+    "antd": ">=6",
     "ol": ">=6.15.1",
     "react": ">=18",
     "react-dom": ">=18"