@vtx/modals2 5.0.56 → 5.0.58

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

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["style", "className", "dateCellRender"];
+var _excluded = ["style", "className", "dateCellRender", "height"];
 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; }
@@ -25,16 +25,21 @@ function VmCalendar(props) {
     style = _props$style === void 0 ? {} : _props$style,
     className = props.className,
     dateCellRender = props.dateCellRender,
+    _props$height = props.height,
+    height = _props$height === void 0 ? 86 : _props$height,
     rest = _objectWithoutProperties(props, _excluded);
   return /*#__PURE__*/_jsx("div", {
     className: classnames("".concat(prefix), className),
-    style: _objectSpread({}, style),
+    style: _objectSpread(_objectSpread({}, style), {}, {
+      '--height': height + 'px'
+    }),
     children: /*#__PURE__*/_jsx(Calendar, _objectSpread({
       locale: locale,
       headerRender: function headerRender() {
         return null;
       },
-      dateCellRender: dateCellRender
+      dateCellRender: dateCellRender,
+      cellRender: dateCellRender
     }, rest))
   });
 }
@@ -67,8 +72,13 @@ export function VmCalendarPercent(_ref) {
         percent: percent,
         strokeColor: _color,
         trailColor: transformRgb(_color, 0.1),
+        railColor: transformRgb(_color, 0.1),
         showInfo: false,
-        strokeWidth: 4
+        strokeWidth: 4,
+        size: {
+          width: 40,
+          height: 4
+        }
       })
     }), /*#__PURE__*/_jsxs("div", {
       style: {

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

@@ -3,6 +3,7 @@
 .vm-calendar {
   width: 100%;
   height: 100%;
+  --height: 86px;
   .ant-picker-date-panel,
   .ant-picker-content {
     width: 100% !important;
@@ -22,7 +23,9 @@
     .ant-picker-body {
       padding: 0 !important;
     }
-
+    .ant-picker-calendar-date-content {
+      height: var(--height) !important;
+    }
     .ant-picker-content th {
       color: var(--vm-calendar-cell-font-color);
     }

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

@@ -34,6 +34,11 @@ export var VMRangePicker = function VMRangePicker(props) {
   return /*#__PURE__*/_jsx(RangePicker, _objectSpread(_objectSpread({
     className: "vm-range-picker ".concat(isDark ? 'dark' : ''),
     dropdownClassName: "vm-range-picker-dropdown ".concat(isDark ? 'dark' : ''),
+    classNames: {
+      popup: {
+        root: "vm-range-picker-dropdown ".concat(isDark ? 'dark' : '')
+      }
+    },
     allowClear: false
   }, props), {}, {
     locale: locale
@@ -45,6 +50,11 @@ export var VMDatePicker = function VMDatePicker(props) {
   return /*#__PURE__*/_jsx(DatePicker, _objectSpread(_objectSpread({
     className: "vm-range-picker ".concat(isDark ? 'dark' : ''),
     dropdownClassName: "vm-range-picker-dropdown ".concat(isDark ? 'dark' : ''),
+    classNames: {
+      popup: {
+        root: "vm-range-picker-dropdown ".concat(isDark ? 'dark' : '')
+      }
+    },
     allowClear: false
   }, props), {}, {
     locale: locale
@@ -56,6 +66,11 @@ export var VMMonthPicker = function VMMonthPicker(props) {
   return /*#__PURE__*/_jsx(MonthPicker, _objectSpread(_objectSpread({
     className: "vm-range-picker ".concat(isDark ? 'dark' : ''),
     dropdownClassName: "vm-range-picker-dropdown ".concat(isDark ? 'dark' : ''),
+    classNames: {
+      popup: {
+        root: "vm-range-picker-dropdown ".concat(isDark ? 'dark' : '')
+      }
+    },
     allowClear: false
   }, props), {}, {
     locale: locale
@@ -67,6 +82,11 @@ export var VMYearPicker = function VMYearPicker(props) {
   return /*#__PURE__*/_jsx(YearPicker, _objectSpread(_objectSpread({
     className: "vm-range-picker ".concat(isDark ? 'dark' : ''),
     dropdownClassName: "vm-range-picker-dropdown ".concat(isDark ? 'dark' : ''),
+    classNames: {
+      popup: {
+        root: "vm-range-picker-dropdown ".concat(isDark ? 'dark' : '')
+      }
+    },
     allowClear: false
   }, props), {}, {
     locale: locale
@@ -78,6 +98,11 @@ export var VMSelect = function VMSelect(props) {
   return /*#__PURE__*/_jsx(Select, _objectSpread(_objectSpread({
     className: "vm-select ".concat(isDark ? 'dark' : '', " "),
     dropdownClassName: "vm-select-dropdown ".concat(isDark ? 'dark' : ''),
+    classNames: {
+      popup: {
+        root: "vm-select-dropdown ".concat(isDark ? 'dark' : '')
+      }
+    },
     notFoundContent: /*#__PURE__*/_jsx(VmEmpty, {})
   }, props), {}, {
     children: props.children

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

@@ -4,11 +4,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 { Spin } from 'antd';
+import { Row, Spin } from 'antd';
 import ReactEcharts from 'echarts-for-react';
-import _ from 'lodash';
+import _, { isEmpty } from 'lodash';
 import useSettings from "../../_hooks/useSettings";
 import { getPercentValue } from "../../_util";
+import VmEmpty from "../vm-empty";
 import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var PieCharts = function PieCharts(_ref) {
@@ -156,7 +157,16 @@ var PieCharts = function PieCharts(_ref) {
     style: {
       height: height
     },
-    children: loading ? /*#__PURE__*/_jsx(Spin, {}) : /*#__PURE__*/_jsxs(_Fragment, {
+    children: loading ? /*#__PURE__*/_jsx(Spin, {}) : isEmpty(dataList) ? /*#__PURE__*/_jsx(Row, {
+      style: {
+        height: height
+      },
+      align: 'middle',
+      justify: 'center',
+      children: /*#__PURE__*/_jsx(VmEmpty, {
+        type: "NO_CHART"
+      })
+    }) : /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsxs("div", {
         className: 'vtx-car-pie-charts-title-wrap',
         style: {

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

@@ -23,6 +23,9 @@ export function Line(props) {
   return /*#__PURE__*/_jsx(Progress, {
     percent: rate,
     width: width,
+    size: {
+      width: width
+    },
     strokeColor: strokeColor ? strokeColor : rate > 100 ? {
       from: '#FF5861',
       to: '#FF000E'
@@ -31,6 +34,7 @@ export function Line(props) {
       to: '#00FFF6'
     } : '#1677FF',
     trailColor: trailColor ? trailColor : isDark ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.05)',
+    railColor: trailColor ? trailColor : isDark ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.05)',
     showInfo: false
   });
 }
@@ -57,6 +61,7 @@ var Circle = function Circle(props) {
     percent: rate,
     type: type,
     width: width,
+    size: width,
     strokeWidth: strokeWidth,
     strokeLinecap: "round",
     strokeColor: strokeColor || (isDark ? {
@@ -64,6 +69,7 @@ var Circle = function Circle(props) {
       '100%': '#44FF98'
     } : '#1677FF'),
     trailColor: trailColor ? trailColor : isDark ? 'rgba(0, 157, 255, 0.68)' : '#e1ecfd',
+    railColor: trailColor ? trailColor : isDark ? 'rgba(0, 157, 255, 0.68)' : '#e1ecfd',
     format: function format(percent) {
       return /*#__PURE__*/_jsxs("div", {
         className: "vm-progress-text ".concat(isDark ? 'dark' : ''),

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

@@ -55,12 +55,12 @@ var VMTable = function VMTable(props) {
   var tableRef = useRef();
   var calculateHeight = useMemoizedFn(function () {
     if (tableRef.current) {
-      var paginationEle = tableRef.current.querySelector('.ant-pagination');
+      var paginationEle = (tableRef.current.nativeElement || tableRef.current).querySelector('.ant-pagination');
       var paginationHeight = paginationEle ? paginationEle.offsetHeight + 16 * 2 : 0;
       var parentElement = tableRef.current.parentElement;
       var rect = parentElement.getBoundingClientRect();
       var paddding = getComputedStyle(parentElement).padding.replace('px', '');
-      var _height = rect.height - paddding * 2 - tableRef.current.querySelector('thead').offsetHeight - paginationHeight;
+      var _height = rect.height - paddding * 2 - (tableRef.current.nativeElement || tableRef.current).querySelector('thead').offsetHeight - paginationHeight;
       setScrollY(_height);
     }
   });
@@ -74,7 +74,7 @@ var VMTable = function VMTable(props) {
       resizeObserver.observe(tableRef.current.parentElement, {
         box: 'border-box'
       });
-      resizeObserver.observe(tableRef.current, {
+      resizeObserver.observe(tableRef.current.nativeElement || tableRef.current, {
         box: 'border-box'
       });
     }

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

@@ -97,8 +97,8 @@
   .ant-table-body {
     // ScrollBar
     &::-webkit-scrollbar {
-      width: 0px;
-      height: 4px;
+      width: 0px !important;
+      height: 4px !important;
     }
 
     // &::-webkit-scrollbar-track {
@@ -107,8 +107,8 @@
     // }
 
     &::-webkit-scrollbar-thumb {
-      background: var(--scroll-bar-hover-bg);
-      border-radius: 5px;
+      background: var(--scroll-bar-hover-bg) !important;
+      border-radius: 5px !important;
     }
 
     // &::-webkit-scrollbar-corner {
@@ -122,12 +122,14 @@
 
   .ant-table {
     background: var(--table-bg);
+    scrollbar-color: inherit;
     .vm-table-row {
       background: #2d575a;
     }
     .ant-table-thead {
       .ant-table-cell-fix-left,
-      .ant-table-cell-fix-right {
+      .ant-table-cell-fix-right,
+      th.ant-table-cell-fix {
         background: var(--table-header-fixed-bg-color) !important;
       }
     }
@@ -163,7 +165,8 @@
 
         tbody {
           .ant-table-cell-fix-left,
-          .ant-table-cell-fix-right {
+          .ant-table-cell-fix-right,
+          .ant-table-cell-fix {
             background: var(--table-bd-fixed-bg-color) !important;
           }
           tr {
@@ -185,7 +188,8 @@
 
             &:nth-child(odd) {
               td,
-              td.ant-table-cell-fix-left {
+              td.ant-table-cell-fix-left,
+              th.ant-table-cell-fix-start {
                 // background-color: var(--table-row-bg-color) !important;
                 background-color: var(--table-bd-fixed-bg-odd-color) !important;
                 // border-top: var(--table-row-border);
@@ -203,6 +207,7 @@
           }
 
           .ant-table-placeholder {
+            background: var(--table-bg) !important;
             .ant-empty-description {
               color: var(--modal-title-color);
             }

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
       });
     });
   };
@@ -246,7 +247,12 @@ var VmVideo = function VmVideo(_ref) {
                     },
                     showTime: true,
                     disabled: datePickerDisabled,
-                    dropdownClassName: "date-dark"
+                    dropdownClassName: "date-dark",
+                    classNames: {
+                      popup: {
+                        root: "date-dark"
+                      }
+                    }
                   })
                 }), /*#__PURE__*/_jsx(Form.Item, {
                   label: "\u7ED3\u675F\u65F6\u95F4",

package/lib/style/index.less

@@ -1,4 +1,9 @@
 @import "~antd/dist/antd.css";
+
+html {
+ line-height: 1.5715;
+}
+
 .vm-modal-dark {
   --modal-mask-bg-color: rgba(0, 0, 0, 0.4);
   --modal-title-color: #fff;

package/lib/vtx-area-modal/api.js

@@ -5,6 +5,8 @@ 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 { MapIcon } from '@vtx/map-icon';
+import * as VtxMapIcon from '@vtx/map-icon';
+console.log(VtxMapIcon, 'VtxMapIcon');
 import { getUrlParam, getVtxToken, request } from '@vtx/utils';
 import { useRequest } from 'ahooks';
 import dayjs from 'dayjs';

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

@@ -129,6 +129,11 @@ var VmBaseModal = function VmBaseModal(props) {
     var _theme = theme === 'light' ? 'light' : 'dark';
     if (type === 'car') {
       var path = 'index';
+      if (tabs.find(function (item) {
+        return item.code === 'jxh-base-hw2';
+      })) {
+        path = 'zyqsLaneHistory';
+      }
       src = iframeUrl || "".concat(prefix, "/carHistory/#/").concat(path, "?carId=").concat(id, "&theme=").concat(_theme, "&startTime=").concat(startDate ? dayjs(startDate).format('YYYY-MM-DD 00:00:00') : '', "&endTime=").concat(endDate ? dayjs(endDate).format('YYYY-MM-DD 23:59:59') : '');
     }
     if (type === 'staff') {