@vtx/modals2 5.0.60 → 5.0.61

package/lib/vtx-road-modal/components/BaseInfo/Work.js

@@ -19,6 +19,7 @@ import { useState } from 'react';
 import { VmEmpty, VmProgress, VmTable, VmTag, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService } from "../../api";
+import { buildIframeQuery } from "../../utils/url";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var Work = function Work(props) {
   var id = props.id,
@@ -124,7 +125,14 @@ var Work = function Work(props) {
           if (prefixList.length === 2) {
             prefix = "/".concat(prefixList[0]);
           }
-          var src = "".concat(prefix, "/carHistory/#/zyqsHistory?carId=").concat(record.carId, "&theme=").concat(theme === 'blue' ? 'dark' : theme, "&startTime=").concat(dayjs(date).format('YYYY-MM-DD 00:00:00'), "&endTime=").concat(dayjs(date).format('YYYY-MM-DD 23:59:59'), "&").concat(location.href.split('?')[1], "&roadId=").concat(record.roadId);
+          var query = buildIframeQuery(location.href.split('?')[1], {
+            carId: record.carId,
+            theme: theme === 'blue' ? 'dark' : theme,
+            startTime: dayjs(date).format('YYYY-MM-DD 00:00:00'),
+            endTime: dayjs(date).format('YYYY-MM-DD 23:59:59'),
+            roadId: record.roadId
+          });
+          var src = "".concat(prefix, "/carHistory/#/zyqsHistory?").concat(query);
           setIframeModalInfo({
             title: '车辆轨迹',
             visible: true,

package/lib/vtx-road-modal/components/LaneBaseInfo/Work.js

@@ -18,6 +18,7 @@ import { useMemo, useState } from 'react';
 import { VmBarCharts, VmEmpty, VmProgress, VmTable, VmTag, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { LaneService } from "../../api";
+import { buildIframeQuery } from "../../utils/url";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var getPercentInfo = function getPercentInfo(percent) {
   var colorList = ['#D9D9D9', '#D9D9D9'];
@@ -219,7 +220,13 @@ var Work = function Work(props) {
           if (prefixList.length === 2) {
             prefix = "/".concat(prefixList[0]);
           }
-          var src = "".concat(prefix, "/carHistory/#/zyqsLaneHistory?carId=").concat(record.workCarId, "&theme=").concat(theme === 'blue' ? 'dark' : theme, "&startTime=").concat(dayjs(date).format('YYYY-MM-DD 00:00:00'), "&endTime=").concat(dayjs(date).format('YYYY-MM-DD 23:59:59'), "&").concat(location.href.split('?')[1]);
+          var query = buildIframeQuery(location.href.split('?')[1], {
+            carId: record.workCarId,
+            theme: theme === 'blue' ? 'dark' : theme,
+            startTime: dayjs(date).format('YYYY-MM-DD 00:00:00'),
+            endTime: dayjs(date).format('YYYY-MM-DD 23:59:59')
+          });
+          var src = "".concat(prefix, "/carHistory/#/zyqsLaneHistory?").concat(query);
           setIframeModalInfo({
             title: '车辆轨迹',
             visible: true,

package/lib/vtx-road-modal/utils/url.js

@@ -0,0 +1,12 @@
+export var buildIframeQuery = function buildIframeQuery() {
+  var routeQuery = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var searchParams = new URLSearchParams(routeQuery || '');
+  Object.keys(params).forEach(function (key) {
+    var value = params[key];
+    if (value !== undefined && value !== null) {
+      searchParams.set(key, value);
+    }
+  });
+  return searchParams.toString();
+};

package/package.json

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