@vtx/modals2 5.0.55 → 5.0.57

package/lib/_components/vm-video/HistoryGrid.js

@@ -4,14 +4,16 @@ import VmEmpty from "../vm-empty";
 import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _channel$list;
   var channel = props.channel,
     onClose = props.onClose;
   var name = "".concat(channel === null || channel === void 0 ? void 0 : channel.deviceName, "-").concat(channel === null || channel === void 0 ? void 0 : channel.channelName);
+  var url = (channel === null || channel === void 0 ? void 0 : channel.totalTimeUrl) || (channel === null || channel === void 0 || (_channel$list = channel.list) === null || _channel$list === void 0 || (_channel$list = _channel$list[0]) === null || _channel$list === void 0 ? void 0 : _channel$list.playbackUrl);
   var gridItemRef = useRef(null);
   return /*#__PURE__*/_jsx("div", {
     className: "vm-video-content-container",
     ref: gridItemRef,
-    children: channel !== null && channel !== void 0 && channel.totalTimeUrl ? /*#__PURE__*/_jsxs(_Fragment, {
+    children: url ? /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsxs("div", {
         className: "vm-video-content-container-header",
         children: [/*#__PURE__*/_jsx("span", {
@@ -29,7 +31,7 @@ var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
           ref: ref,
           beenHasVideo: channel.beenHasVideo // 对讲
           ,
-          url: channel.totalTimeUrl,
+          url: url,
           type: channel === null || channel === void 0 ? void 0 : channel.player,
           deviceIp: channel.deviceIp,
           devicePort: channel.devicePort,

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

@@ -128,13 +128,14 @@ var VmVideo = function VmVideo(_ref) {
       channelNum: values.channelNum,
       deviceId: channel.videoDeviceId
     }).then(function (res) {
-      var _res$data;
-      if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.totalTimeUrl)) {
+      var _data$list;
+      var data = (res === null || res === void 0 ? void 0 : res.data) || {};
+      if (!(data !== null && data !== void 0 && data.totalTimeUrl) && !((_data$list = data.list) !== null && _data$list !== void 0 && (_data$list = _data$list[0]) !== null && _data$list !== void 0 && _data$list.playbackUrl)) {
         message.info('未查询到视频!');
         return;
       }
       setState({
-        history: res === null || res === void 0 ? void 0 : res.data
+        history: data
       });
     });
   };

package/lib/vtx-cc-cp-modal/index.js

@@ -11,15 +11,15 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useMemoizedFn } from 'ahooks';
+import dayjs from 'dayjs';
 import React, { useMemo, useState } from 'react';
+import { VmCustom } from "../_components";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
 import VtxCarModal from "../vtx-car-modal";
 import VtxRestaurantModal from "../vtx-restaurant-modal";
 import { AlarmInfo, BaseInfo, Calendar, ExceptionInfo, Restaurant, SyInfo } from "./components";
 import "./style";
-import { VmCustom } from "../_components";
-import dayjs from 'dayjs';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var TABS_SY = 'sy';
@@ -97,6 +97,7 @@ var VtxCcCpModal = function VtxCcCpModal(props) {
       date: date
     };
   }, [id, date]);
+  var tabContents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {})), TABS_RESTAURANT, /*#__PURE__*/_jsx(Restaurant, {})), TABS_SY, /*#__PURE__*/_jsx(SyInfo, {})), TABS_WARNNING, /*#__PURE__*/_jsx(AlarmInfo, {})), TABS_EXECEPTION, /*#__PURE__*/_jsx(ExceptionInfo, {})), TABS_CALENDAR, /*#__PURE__*/_jsx(Calendar, {}));
   // 自定义页签可配置多个，包含custom即可
   if (tabsData !== null && tabsData !== void 0 && tabsData.length) {
     tabsData.forEach(function (ele) {
@@ -119,7 +120,7 @@ var VtxCcCpModal = function VtxCcCpModal(props) {
         tabs: tabsData,
         tabChose: tabChose,
         date: date,
-        contents: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {})), TABS_RESTAURANT, /*#__PURE__*/_jsx(Restaurant, {})), TABS_SY, /*#__PURE__*/_jsx(SyInfo, {})), TABS_WARNNING, /*#__PURE__*/_jsx(AlarmInfo, {})), TABS_EXECEPTION, /*#__PURE__*/_jsx(ExceptionInfo, {})), TABS_CALENDAR, /*#__PURE__*/_jsx(Calendar, {}))
+        contents: tabContents
       })
     }), carModal.visible && /*#__PURE__*/_jsx(VtxCarModal, _objectSpread(_objectSpread({}, carModal), {}, {
       theme: theme,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "5.0.55",
+  "version": "5.0.57",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",