@vtx/modals2 6.0.0-beta.1 → 6.0.0-beta.10

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

@@ -1,15 +1,61 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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 { HistoryPlayer } from '@vtx/player';
-import { forwardRef, useRef } from 'react';
+import { forwardRef, useEffect, useRef, useState } from 'react';
 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 _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    url = _useState2[0],
+    setUrl = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    startTime = _useState4[0],
+    setStartTime = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    endTime = _useState6[0],
+    setEndTime = _useState6[1];
   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);
+  useEffect(function () {
+    var _channel$list;
+    var src = (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);
+    if (channel.enableAgent) {
+      if (src.indexOf('http') === -1) {
+        setUrl("".concat(window.location.origin).concat(src));
+      }
+    } else {
+      setUrl(src);
+    }
+    if (channel !== null && channel !== void 0 && channel.totalTimeUrl) {
+      setStartTime(props === null || props === void 0 ? void 0 : props.startTime);
+      setEndTime(props === null || props === void 0 ? void 0 : props.endTime);
+    } else {
+      var _channel$list2, _channel$list3;
+      setStartTime(channel === null || channel === void 0 || (_channel$list2 = channel.list) === null || _channel$list2 === void 0 || (_channel$list2 = _channel$list2[0]) === null || _channel$list2 === void 0 ? void 0 : _channel$list2.beginTime);
+      setEndTime(channel === null || channel === void 0 || (_channel$list3 = channel.list) === null || _channel$list3 === void 0 || (_channel$list3 = _channel$list3[0]) === null || _channel$list3 === void 0 ? void 0 : _channel$list3.endTime);
+    }
+  }, [channel.enableAgent, props.startTime, JSON.stringify(channel)]);
+  useEffect(function () {
+    var _channel$list4;
+    var src = (channel === null || channel === void 0 ? void 0 : channel.totalTimeUrl) || (channel === null || channel === void 0 || (_channel$list4 = channel.list) === null || _channel$list4 === void 0 || (_channel$list4 = _channel$list4[0]) === null || _channel$list4 === void 0 ? void 0 : _channel$list4.playbackUrl);
+    if (channel.enableAgent) {
+      if (src.indexOf('http') === -1) {
+        setUrl("".concat(window.location.origin).concat(src));
+      }
+    } else {
+      setUrl(src);
+    }
+  }, [JSON.stringify(channel)]);
   return /*#__PURE__*/_jsx("div", {
     className: "vm-video-content-container",
     ref: gridItemRef,
@@ -31,7 +77,11 @@ var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
           ref: ref,
           beenHasVideo: channel.beenHasVideo // 对讲
           ,
+          beenHasAudio: channel.beenHasAudio // 音频
+          ,
           url: url,
+          startTime: startTime,
+          endTime: endTime,
           type: channel === null || channel === void 0 ? void 0 : channel.player,
           deviceIp: channel.deviceIp,
           devicePort: channel.devicePort,

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

@@ -1,17 +1,36 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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 { LivePlayer } from '@vtx/player';
-import { forwardRef, useRef } from 'react';
+import { forwardRef, useEffect, useRef, useState } from 'react';
 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 = props.channel,
     onClose = props.onClose;
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    url = _useState2[0],
+    setUrl = _useState2[1];
   var name = "".concat(channel === null || channel === void 0 ? void 0 : channel.deviceName, "-").concat(channel === null || channel === void 0 ? void 0 : channel.channelName);
   var gridItemRef = useRef(null);
+  useEffect(function () {
+    if (channel.enableAgent) {
+      if ((channel === null || channel === void 0 ? void 0 : channel.url.indexOf('http')) === -1) {
+        setUrl("".concat(window.location.origin).concat(channel.url));
+      }
+    } else {
+      setUrl(channel.url);
+    }
+  }, [channel.enableAgent, channel === null || channel === void 0 ? void 0 : channel.url]);
   return /*#__PURE__*/_jsx("div", {
     className: "vm-video-content-container",
     ref: gridItemRef,
-    children: channel !== null && channel !== void 0 && channel.url ? /*#__PURE__*/_jsxs(_Fragment, {
+    children: url ? /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsxs("div", {
         className: "vm-video-content-container-header",
         children: [/*#__PURE__*/_jsx("span", {
@@ -29,7 +48,9 @@ var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
           ref: ref,
           beenHasVideo: channel.beenHasVideo // 对讲
           ,
-          url: channel.url,
+          beenHasAudio: channel.beenHasAudio // 音频
+          ,
+          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

@@ -26,6 +26,29 @@ import "./index.less";
 import RealtimeGrid from "./RealtimeGrid";
 import { translateLocaleText } from "./../../hooks/useTranslation.js";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+export var VIDEO_TAB_KEY = 'video';
+export var getVideoTab = function getVideoTab() {
+  return {
+    key: VIDEO_TAB_KEY,
+    title: translateLocaleText("t('vtxdevicemodal.video')")
+  };
+};
+export var isVideoTab = function isVideoTab(tab) {
+  return (tab === null || tab === void 0 ? void 0 : tab.key) === VIDEO_TAB_KEY || "".concat((tab === null || tab === void 0 ? void 0 : tab.key) || '').endsWith('video');
+};
+export var insertVideoTab = function insertVideoTab() {
+  var tabs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var channels = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  if (!Array.isArray(tabs) || tabs.length === 0) {
+    return tabs;
+  }
+  if (!(channels !== null && channels !== void 0 && channels.length)) {
+    return tabs.filter(function (tab) {
+      return !isVideoTab(tab);
+    });
+  }
+  return tabs;
+};
 var VmVideo = function VmVideo(_ref) {
   var _ref$channels = _ref.channels,
     channels = _ref$channels === void 0 ? [] : _ref$channels;
@@ -62,6 +85,8 @@ var VmVideo = function VmVideo(_ref) {
     endTime = state.endTime,
     history = state.history;
   useEffect(function () {
+    var s,
+      e = '';
     if (dateType === 'custom') {
       setState({
         datePickerDisabled: false
@@ -70,42 +95,47 @@ var VmVideo = function VmVideo(_ref) {
       setState({
         datePickerDisabled: true
       });
-      if (dateType === 'dayBeforeYesterday') {
-        setState({
-          startTime: dayjs().subtract(2, 'day').format('YYYY-MM-DD 00:00:00'),
-          endTime: dayjs().subtract(2, 'day').format('YYYY-MM-DD 23:59:59')
-        });
-      } else if (dateType === 'yesterday') {
-        setState({
-          startTime: dayjs().subtract(1, 'day').format('YYYY-MM-DD 00:00:00'),
-          endTime: dayjs().subtract(1, 'day').format('YYYY-MM-DD 23:59:59')
-        });
-      } else if (dateType === 'today') {
-        setState({
-          startTime: dayjs().format('YYYY-MM-DD 00:00:00'),
-          endTime: dayjs().format('YYYY-MM-DD HH:mm:ss')
-        });
-      }
     }
+    if (dateType === 'dayBeforeYesterday') {
+      s = dayjs().subtract(2, 'day').format('YYYY-MM-DD 00:00:00');
+      e = dayjs().subtract(2, 'day').format('YYYY-MM-DD 23:59:59');
+    } else if (dateType === 'yesterday') {
+      s = dayjs().subtract(1, 'day').format('YYYY-MM-DD 00:00:00');
+      e = dayjs().subtract(1, 'day').format('YYYY-MM-DD 23:59:59');
+    } else {
+      s = dayjs().format('YYYY-MM-DD 00:00:00');
+      e = dayjs().format('YYYY-MM-DD HH:mm:ss');
+    }
+    setState({
+      startTime: s,
+      endTime: e
+    });
+    form.setFieldsValue({
+      beginTime: dayjs(s),
+      endTime: dayjs(e)
+    });
   }, [dateType]);
   useEffect(function () {
     if (channels !== null && channels !== void 0 && channels.length && tabKey === '1') {
-      var _channels$filter;
-      Promise.all(channels === null || channels === void 0 || (_channels$filter = channels.filter(function (ele, index) {
-        return index < 4;
-      })) === null || _channels$filter === void 0 ? void 0 : _channels$filter.map(function (ele) {
+      var defaultCheckedChannels = channels.map(function (channel, index) {
+        return _objectSpread(_objectSpread({}, channel), {}, {
+          checked: index < 4
+        });
+      });
+      Promise.all(channels.slice(0, 4).map(function (ele) {
         return getPreviewUrl({
           channelNum: ele.channelNum,
           deviceId: ele.videoDeviceId
         });
       })).then(function (res) {
-        setCheckedChannels(res === null || res === void 0 ? void 0 : res.map(function (ele, index) {
-          return _objectSpread(_objectSpread({}, ele === null || ele === void 0 ? void 0 : ele.data), {}, {
+        setCheckedChannels(defaultCheckedChannels.map(function (channel, index) {
+          var _res$index;
+          return _objectSpread(_objectSpread(_objectSpread({}, channel), index < 4 ? (_res$index = res[index]) === null || _res$index === void 0 ? void 0 : _res$index.data : {}), {}, {
             checked: index < 4
           });
         }));
       });
-    } else {}
+    }
     if (tabKey === '2') {
       var _channels$;
       form.setFieldsValue({
@@ -158,13 +188,27 @@ var VmVideo = function VmVideo(_ref) {
                   onChange: function onChange(e) {
                     var list = cloneDeep(checkedChannels);
                     if (e.target.checked) {
+                      var selectedCount = list.filter(function (channel) {
+                        return channel.checked;
+                      }).length + 1;
+                      if (selectedCount > 9) {
+                        message.warning('同时播放通道不能超过9路');
+                        return;
+                      }
+                      if (selectedCount > Number(mode)) {
+                        setMode(selectedCount <= 4 ? '4' : '9');
+                      }
                       getPreviewUrl({
                         channelNum: ele.channelNum,
-                        deviceId: ele.deviceId
+                        deviceId: ele.videoDeviceId || ele.deviceId
                       }).then(function (res) {
-                        list[index] = _objectSpread({
+                        var _res$data, _res$data2;
+                        var currentChannel = list[index];
+                        list[index] = _objectSpread(_objectSpread(_objectSpread({}, currentChannel), res.data), {}, {
+                          channelName: currentChannel.channelName || ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.channelName),
+                          deviceName: currentChannel.deviceName || ((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.deviceName),
                           checked: true
-                        }, res.data);
+                        });
                         setCheckedChannels(list);
                       });
                     } else {
@@ -200,8 +244,8 @@ var VmVideo = function VmVideo(_ref) {
                 requiredMark: false,
                 colon: true,
                 initialValues: {
-                  beginTime: startTime ? dayjs(startTime) : dayjs().subtract(1, 'day').startOf('day'),
-                  endTime: endTime ? dayjs(endTime) : dayjs().subtract(1, 'day').endOf('day')
+                  beginTime: startTime ? dayjs(startTime) : dayjs().startOf('day'),
+                  endTime: endTime ? dayjs(endTime) : dayjs().endOf('day')
                 },
                 autoComplete: "off",
                 children: [/*#__PURE__*/_jsx(Form.Item, {
@@ -353,15 +397,23 @@ var VmVideo = function VmVideo(_ref) {
             key: '9'
           }],
           onChange: function onChange(key) {
-            setMode(key);
+            var selectedCount = checkedChannels.filter(function (channel) {
+              return channel.checked;
+            }).length;
+            setMode(selectedCount > Number(key) ? selectedCount <= 4 ? '4' : '9' : key);
           }
         }) : /*#__PURE__*/_jsx(_Fragment, {})
       }), /*#__PURE__*/_jsx("div", {
         className: "vm-video-content _".concat(mode),
-        children: tabKey === '1' ? getGridItems(mode, checkedChannels === null || checkedChannels === void 0 ? void 0 : checkedChannels.filter(function (ele) {
-          return ele.checked;
-        }), setCheckedChannels) : /*#__PURE__*/_jsx(HistoryGrid, {
-          channel: history
+        children: tabKey === '1' ? getGridItems(mode, checkedChannels, setCheckedChannels) : /*#__PURE__*/_jsx(HistoryGrid, {
+          channel: history,
+          startTime: startTime,
+          endTime: endTime,
+          onClose: function onClose() {
+            setState({
+              history: {}
+            });
+          }
         })
       })]
     })]
@@ -369,18 +421,28 @@ var VmVideo = function VmVideo(_ref) {
 };
 export default VmVideo;
 var getGridItems = function getGridItems(latestGrid, channels, setCheckedChannels) {
+  var selectedChannels = channels.filter(function (channel) {
+    return channel.checked;
+  });
   var items = [];
   var _loop = function _loop(i) {
     var element = /*#__PURE__*/_jsx(RealtimeGrid, {
-      channel: channels[i] || {
+      channel: selectedChannels[i] || {
         channelNum: '',
         channelId: ''
       },
       onClose: function onClose() {
         var list = cloneDeep(channels);
-        list[i].checked = false;
-        list[i].url = '';
-        list[i].player = '';
+        var channelIndex = list.findIndex(function (channel) {
+          var _selectedChannels$i;
+          return channel.channelNum === ((_selectedChannels$i = selectedChannels[i]) === null || _selectedChannels$i === void 0 ? void 0 : _selectedChannels$i.channelNum);
+        });
+        if (channelIndex === -1) {
+          return;
+        }
+        list[channelIndex].checked = false;
+        list[channelIndex].url = '';
+        list[channelIndex].player = '';
         setCheckedChannels(list);
       },
       scale: 1

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

@@ -59,13 +59,13 @@
       padding-top: 12px;
       overflow-y: auto;
 
-      .channels--item {
-        svg {
-          transform: translateY(7px);
-          margin-right: 2px;
-        }
-        .ant-checkbox {
-          transform: translateY(-2px);
+      .channels--item {
+        svg {
+          display: block;
+          margin-right: 2px;
+        }
+        .ant-checkbox {
+          top: 0;
         }
         .ant-checkbox-checked .ant-checkbox-inner {
           background-color: var(--check-bg);
@@ -78,13 +78,17 @@
           width: 15px;
           height: 15px;
         }
-        .ant-checkbox-wrapper {
-          font-size: 15px;
-          //   color: var(--modal-title-color);
-        }
-        .ant-checkbox + span {
-          padding: 0 4px;
-        }
+        .ant-checkbox-wrapper {
+          display: inline-flex;
+          align-items: center;
+          font-size: 15px;
+          //   color: var(--modal-title-color);
+        }
+        .ant-checkbox + span {
+          display: inline-flex;
+          align-items: center;
+          padding: 0 4px;
+        }
       }
     }
   }

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

@@ -90,7 +90,7 @@ export default function VmWrapper(props) {
       changeList.push({
         key: 'chart',
         icon: ListIcon,
-        name: '图表'
+        name: translateLocaleText("t('_components.chart')")
       });
     }
     if (showList) {

package/lib/_components/vm-wrapper/style/index.less

@@ -4,7 +4,7 @@
   --wborder-color: #f1f0f0;
   --wfilter-bg: #f5f5f5;
   --wtype-bg: #fff;
-  --tab-active-color: #1677FF;
+  --tab-active-color: #1677ff;
 
   &.dark {
     --wbg-color: rgba(0, 155, 233, 10%);
@@ -12,7 +12,7 @@
     --wborder-color: #1064a7;
     --wfilter-bg: #0b588e;
     --wtype-bg: #0168b0;
-    --tab-active-color: #009DFF;
+    --tab-active-color: #009dff;
   }
 
   &-tabs-wrap {
@@ -55,6 +55,8 @@
   &-head {
     padding: 11px 16px;
     border-bottom: 1px solid var(--wborder-color);
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
   }
 
   .extra {

package/lib/_hooks/useGetChannels.js

@@ -1,13 +1,27 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { useRequest } from 'ahooks';
 import http from "../_util/http";
 export default (function (billId, ready) {
-  var _useRequest = useRequest(function () {
-      return http.get("".concat(process.env.PREFIX || '', "/cloud/vis/base/np/videoDevice/loadVideoChannelByBillId.smvc"), {
-        body: {
-          billId: billId
+  var _useRequest = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var url;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            url = "".concat(process.env.PREFIX || '', "/cloud/vis/base/np/videoDevice/loadVideoChannelByBillId.smvc");
+            return _context.abrupt("return", http.get(url, {
+              body: {
+                billId: billId
+              }
+            }));
+          case 2:
+          case "end":
+            return _context.stop();
         }
-      });
-    }, {
+      }, _callee);
+    })), {
       ready: ready,
       refreshDeps: [billId]
     }),

package/lib/_service/index.js

@@ -1,14 +1,7 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-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 { request } from '@vtx/utils';
 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', {
@@ -22,36 +15,17 @@ var CommonService = {
       }),
       baseInfoRes = _useRequest.data;
     var info = baseInfoRes === null || baseInfoRes === void 0 ? void 0 : baseInfoRes.data;
-    var _useRequest2 = useRequest(function () {
-        return request.get('/cloud/jcss-reborn/facility/type/config/getByCode', {
-          data: {
-            code: baseInfoRes.data.typeCode
-          }
-        });
-      }, {
-        ready: !!(baseInfoRes !== null && baseInfoRes !== void 0 && (_baseInfoRes$data = baseInfoRes.data) !== null && _baseInfoRes$data !== void 0 && _baseInfoRes$data.typeCode),
-        refreshDeps: [baseInfoRes === null || baseInfoRes === void 0 || (_baseInfoRes$data2 = baseInfoRes.data) === null || _baseInfoRes$data2 === void 0 ? void 0 : _baseInfoRes$data2.typeCode]
-      }),
-      tabConfig = _useRequest2.data;
     var photos = info !== null && info !== void 0 && info.photoIds ? JSON.parse(info.photoIds) : info !== null && info !== void 0 && info.typePhotoIds ? JSON.parse(info.typePhotoIds) : [];
     return {
       photos: photos,
       code: info === null || info === void 0 ? void 0 : info.code,
-      info: info,
-      tabConfig: (tabConfig === null || tabConfig === void 0 || (_tabConfig$data = tabConfig.data) === null || _tabConfig$data === void 0 || (_tabConfig$data = _tabConfig$data.popupConfigJson) === null || _tabConfig$data === void 0 ? void 0 : _tabConfig$data.filter(function (ele) {
-        return ele.display;
-      }).map(function (ele) {
-        return _objectSpread(_objectSpread({}, ele), {}, {
-          key: ele.code,
-          title: ele.name
-        });
-      })) || []
+      info: info
     };
   },
   //基础设施详情展示字段
   useGetFields: function useGetFields(code) {
     var _data$data$baseFields;
-    var _useRequest3 = useRequest(function () {
+    var _useRequest2 = useRequest(function () {
         return request.get('/cloud/jcss-reborn/facility/type/view/detail', {
           data: {
             code: code
@@ -61,14 +35,14 @@ var CommonService = {
         refreshDeps: [code],
         ready: !!code
       }),
-      data = _useRequest3.data;
+      data = _useRequest2.data;
     return data !== null && data !== void 0 && data.data ? ((_data$data$baseFields = data.data.baseFields) === null || _data$data$baseFields === void 0 ? void 0 : _data$data$baseFields.filter(function (ele) {
       return !['photoIds', 'geometryInfo', 'orderIndex', 'geoPointLocation', 'geoLineLocation', 'geoPolygonLocation'].includes(ele.key);
     }).concat(data.data.customFields)) || [] : [];
   },
   // 计量详情
   useLmDetail: function useLmDetail(id, hasConfig) {
-    var _useRequest4 = useRequest(function () {
+    var _useRequest3 = useRequest(function () {
         return request.get('/cloud/zd/base/api/cp/commonFactory/getCommonFactoryById.smvc', {
           data: {
             factoryId: id
@@ -78,14 +52,14 @@ var CommonService = {
         refreshDeps: [id],
         ready: hasConfig
       }),
-      res = _useRequest4.data;
+      res = _useRequest3.data;
     return {
       detail: (res === null || res === void 0 ? void 0 : res.data) || {}
     };
   },
   // 计量详情
   useLmDetailZdReborn: function useLmDetailZdReborn(id) {
-    var _useRequest5 = useRequest(function () {
+    var _useRequest4 = useRequest(function () {
         return request.post('/cloud/zd-reborn/api/base/commonFactory/getCommonFactoryById?factoryId=' + id, {
           data: JSON.stringify({
             factoryId: id
@@ -94,7 +68,7 @@ var CommonService = {
       }, {
         refreshDeps: [id]
       }),
-      res = _useRequest5.data;
+      res = _useRequest4.data;
     return {
       detail: (res === null || res === void 0 ? void 0 : res.data) || {}
     };

package/lib/_util/http.js

@@ -15,6 +15,7 @@ import { message } from 'antd';
 import isObject from 'lodash/isObject';
 import pickBy from 'lodash/pickBy';
 import qs from 'qs';
+import { translateLocaleText } from "../hooks/useTranslation.js";
 var SECOND = 30;
 var MILL_SECOND = 1000;
 var baseUrlPrefix = process.env.PREFIX ? "/".concat(process.env.PREFIX) : '';
@@ -77,6 +78,32 @@ var Http = /*#__PURE__*/function () {
         } : {})
       });
     }
+
+    /**
+     * 判断接口是否存在
+     * @param {*} url
+     */
+  }, {
+    key: "exists",
+    value: function exists(url) {
+      var _url = baseUrlPrefix + url;
+      var token = getVtxToken('token');
+      return axios.head(_url, {
+        validateStatus: function validateStatus() {
+          return true;
+        },
+        headers: {
+          Authorization: token ? "Bearer ".concat(token) : '',
+          tenantId: getVtxToken('tenantId'),
+          userId: getVtxToken('userId')
+        }
+      }).then(function (res) {
+        return res.status !== 404;
+      }).catch(function (error) {
+        var _error$response;
+        return (error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.status) !== 404;
+      });
+    }
     /**
      * get 请求
      * @param {*} url
@@ -233,7 +260,7 @@ var Http = /*#__PURE__*/function () {
           if (((_config = config) === null || _config === void 0 || (_config = _config.url) === null || _config === void 0 ? void 0 : _config.indexOf('zdjg/jg/data/getJgDataStatistics')) > -1 || ((_config2 = config) === null || _config2 === void 0 || (_config2 = _config2.url) === null || _config2 === void 0 ? void 0 : _config2.indexOf('/cloud/zd/base/api/cp/commonFactory')) > -1) {
             return;
           }
-          message.error(data.msg || '请求信息错误');
+          message.error(data.msg || translateLocaleText("t('common.requestInfoError')"));
           return;
         }
       }
@@ -257,18 +284,18 @@ var Http = /*#__PURE__*/function () {
         var msg;
         switch (error.response.status) {
           case 404:
-            msg = '接口请求不存在！错误码【404】。';
+            msg = translateLocaleText("t('common.apiRequestNotFound404')");
             break;
           case 500:
-            msg = '服务端应用接口异常！错误码【500】。';
+            msg = translateLocaleText("t('common.serverApiException500')");
             break;
           default:
-            msg = '请求错误，请检查或刷新重试！';
+            msg = translateLocaleText("t('common.requestErrorRetry')");
             break;
         }
         message.error(msg);
       } else {
-        message.error('服务不可用');
+        message.error(translateLocaleText("t('common.serviceUnavailable')"));
       }
     }