@vtx/modals2 5.0.4 → 5.0.6

package/lib/_components/vm-bar-charts/index.js

@@ -31,7 +31,11 @@ var BarCharts = function BarCharts(_ref) {
     _ref$showLegend = _ref.showLegend,
     showLegend = _ref$showLegend === void 0 ? true : _ref$showLegend,
     _ref$gridOptions = _ref.gridOptions,
-    gridOptions = _ref$gridOptions === void 0 ? {} : _ref$gridOptions;
+    gridOptions = _ref$gridOptions === void 0 ? {} : _ref$gridOptions,
+    _ref$otherProps = _ref.otherProps,
+    otherProps = _ref$otherProps === void 0 ? {} : _ref$otherProps,
+    _ref$tooltipProps = _ref.tooltipProps,
+    tooltipProps = _ref$tooltipProps === void 0 ? {} : _ref$tooltipProps;
   var lineColors = ['#1FB64D'];
   var _useSettings = useSettings(),
     chartFontColor = _useSettings.chartFontColor,
@@ -50,8 +54,8 @@ var BarCharts = function BarCharts(_ref) {
     green: green,
     blue: blue
   };
-  var option = {
-    tooltip: {
+  var option = _objectSpread({
+    tooltip: _objectSpread({
       trigger: 'axis',
       valueFormatter: function valueFormatter(value) {
         var _findUnit;
@@ -68,7 +72,7 @@ var BarCharts = function BarCharts(_ref) {
         var leftSize = point[0] - size.contentSize[0];
         return [point[0] + size.contentSize[0] > size.viewSize[0] ? leftSize < 0 ? '35%' : leftSize : point[0], '0%'];
       }
-    },
+    }, tooltipProps),
     legend: {
       right: 'center',
       itemGap: 8,
@@ -160,7 +164,7 @@ var BarCharts = function BarCharts(_ref) {
         smooth: true
       }, item);
     })))
-  };
+  }, otherProps);
   return loading ? /*#__PURE__*/_jsx(Row, {
     style: {
       height: height

package/lib/_components/vm-extra-tab/style/index.less

@@ -12,15 +12,19 @@
     --shadow-color: rgba(0, 126, 255, 0.2);
   }
 
-  height: 28px;
-  line-height: 28px;
+  height: 32px;
+  line-height: 31px;
   display: flex;
   justify-content: space-between;
   align-items: center;
   font-size: 14px;
   background: var(--bg);
   border-radius: 6px;
+  padding: 2px;
   &-item {
+    height: 28px;
+    width: 28px;
+    text-align: center;
     &:first-child {
       border-top-left-radius: 6px;
       border-bottom-left-radius: 6px;
@@ -32,7 +36,6 @@
     padding: 0 5px;
     cursor: pointer;
     color: var(--color);
-    box-shadow: 0px 0px 2px 0px var(--shadow-color);
     &.active {
       border-radius: 6px;
       color: var(--active-color);

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

@@ -137,7 +137,7 @@ export default function VmOlMap(_ref) {
   var points = formatData(mapPoints);
   var polygons = formatData(mapPolygons, geometryType);
   function fitView() {
-    if (mapRef.current && ((mapPoints === null || mapPoints === void 0 ? void 0 : mapPoints.length) > 0 || (mapPolygons === null || mapPolygons === void 0 ? void 0 : mapPolygons.length) > 0)) {
+    if (mapRef.current.hasOwnProperty('tk') && ((mapPoints === null || mapPoints === void 0 ? void 0 : mapPoints.length) > 0 || (mapPolygons === null || mapPolygons === void 0 ? void 0 : mapPolygons.length) > 0)) {
       var _mapRef$current, _polygons$data, _points$data;
       (_mapRef$current = mapRef.current) === null || _mapRef$current === void 0 || _mapRef$current.fitView({
         geometryInfo: ((polygons === null || polygons === void 0 || (_polygons$data = polygons.data) === null || _polygons$data === void 0 ? void 0 : _polygons$data[0]) || (points === null || points === void 0 || (_points$data = points.data) === null || _points$data === void 0 ? void 0 : _points$data[0])).geometryInfo

package/lib/_components/vm-pie-charts/index.js

@@ -24,6 +24,8 @@ var PieCharts = function PieCharts(_ref) {
     height = _ref$height === void 0 ? '100%' : _ref$height,
     _ref$legendConfig = _ref.legendConfig,
     legendConfig = _ref$legendConfig === void 0 ? {} : _ref$legendConfig,
+    _ref$spaceLength = _ref.spaceLength,
+    spaceLength = _ref$spaceLength === void 0 ? 20 : _ref$spaceLength,
     _ref$nameLength = _ref.nameLength,
     nameLength = _ref$nameLength === void 0 ? 6 : _ref$nameLength,
     _ref$innerRadius = _ref.innerRadius,
@@ -67,7 +69,7 @@ var PieCharts = function PieCharts(_ref) {
             fontSize: 14
           },
           space: {
-            width: 20
+            width: spaceLength
           },
           number: {
             width: 50,

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

@@ -5,6 +5,7 @@
   padding: 0 8px;
   font-family: Alibaba PuHuiTi 3, Alibaba PuHuiTi 30;
   font-size: 12px;
+  white-space: nowrap;
   display: flex;
   align-items: center;
   justify-content: center;

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

@@ -0,0 +1,52 @@
+import { HistoryPlayer } from '@vtx/player';
+import { forwardRef, useRef } 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 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);
+  return /*#__PURE__*/_jsx("div", {
+    className: "vm-video-content-container",
+    ref: gridItemRef,
+    children: channel !== null && channel !== void 0 && channel.totalTimeUrl ? /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsxs("div", {
+        className: "vm-video-content-container-header",
+        children: [/*#__PURE__*/_jsx("span", {
+          className: "title",
+          title: name,
+          children: name
+        }), /*#__PURE__*/_jsx("div", {
+          className: "close",
+          onClick: onClose,
+          children: "x"
+        })]
+      }), /*#__PURE__*/_jsx("div", {
+        className: "content",
+        children: /*#__PURE__*/_jsx(HistoryPlayer, {
+          ref: ref,
+          beenHasVideo: channel.beenHasVideo // 对讲
+          ,
+          url: channel.totalTimeUrl,
+          type: channel === null || channel === void 0 ? void 0 : channel.player,
+          deviceIp: channel.deviceIp,
+          devicePort: channel.devicePort,
+          captureName: name,
+          deviceId: channel.deviceId,
+          channelId: channel.channelId,
+          channelNum: channel.channelNum,
+          enableAgent: channel.enableAgent,
+          deviceCode: channel.deviceCode,
+          streamType: channel.streamType,
+          info: channel.info,
+          onClose: onClose
+        })
+      })]
+    }) : /*#__PURE__*/_jsx(VmEmpty, {
+      type: "NO_VIDEO"
+    })
+  });
+});
+export default GridItem;

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

@@ -2,7 +2,7 @@ import { LivePlayer } from '@vtx/player';
 import { forwardRef, useRef } from 'react';
 import VmEmpty from "../vm-empty";
 import "./index.less";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+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;
@@ -12,13 +12,17 @@ var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
     className: "vm-video-content-container",
     ref: gridItemRef,
     children: channel !== null && channel !== void 0 && channel.url ? /*#__PURE__*/_jsxs(_Fragment, {
-      children: [/*#__PURE__*/_jsx("div", {
+      children: [/*#__PURE__*/_jsxs("div", {
         className: "vm-video-content-container-header",
-        children: /*#__PURE__*/_jsx("span", {
+        children: [/*#__PURE__*/_jsx("span", {
           className: "title",
           title: name,
           children: name
-        })
+        }), /*#__PURE__*/_jsx("div", {
+          className: "close",
+          onClick: onClose,
+          children: "x"
+        })]
       }), /*#__PURE__*/_jsx("div", {
         className: "content",
         children: /*#__PURE__*/_jsx(LivePlayer, {