@vtx/modals2 6.0.0-beta.14 → 6.0.0-beta.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/_components/vm-theme-provider/index.js +2 -1
- package/lib/_hooks/useSettings.js +4 -2
- package/lib/_util/http.js +4 -3
- package/lib/vtx-base-modal/index.js +5 -2
- package/lib/vtx-car-modal/api.js +255 -163
- package/lib/vtx-car-modal/content/Ljzy/BaseInfo/index.js +9 -7
- package/lib/vtx-car-modal/content/Ljzy/StaticInfo/index.js +11 -11
- package/lib/vtx-car-modal/content/Ljzy/WorkRecord/Detail.js +6 -3
- package/lib/vtx-car-modal/content/Ljzy/WorkRecord/Summary.js +8 -6
- package/lib/vtx-car-modal/index.js +4 -1
- package/lib/vtx-road-modal/index.js +14 -1
- package/lib/vtx-tfd-modal/api.js +2 -2
- package/package.json +1 -1
|
@@ -14,7 +14,8 @@ var useSettings = function useSettings() {
|
|
|
14
14
|
endDate = _useContext.endDate,
|
|
15
15
|
date = _useContext.date,
|
|
16
16
|
mapInfo = _useContext.mapInfo,
|
|
17
|
-
contentStyle = _useContext.contentStyle
|
|
17
|
+
contentStyle = _useContext.contentStyle,
|
|
18
|
+
zdReborn = _useContext.zdReborn;
|
|
18
19
|
return {
|
|
19
20
|
theme: theme,
|
|
20
21
|
tabPosition: 'top',
|
|
@@ -25,7 +26,8 @@ var useSettings = function useSettings() {
|
|
|
25
26
|
endDate: endDate,
|
|
26
27
|
date: date,
|
|
27
28
|
mapInfo: mapInfo,
|
|
28
|
-
contentStyle: contentStyle
|
|
29
|
+
contentStyle: contentStyle,
|
|
30
|
+
zdReborn: zdReborn
|
|
29
31
|
};
|
|
30
32
|
};
|
|
31
33
|
export default useSettings;
|
package/lib/_util/http.js
CHANGED
|
@@ -251,13 +251,14 @@ var Http = /*#__PURE__*/function () {
|
|
|
251
251
|
value: function _responseHandler(response) {
|
|
252
252
|
var status = response.status,
|
|
253
253
|
data = response.data,
|
|
254
|
-
statusText = response.statusText
|
|
254
|
+
statusText = response.statusText,
|
|
255
|
+
config = response.config;
|
|
255
256
|
if (status >= 200 && status < 300) {
|
|
256
257
|
if (data.result === 0) {
|
|
257
258
|
return data;
|
|
258
259
|
} else {
|
|
259
|
-
var _config,
|
|
260
|
-
if ((
|
|
260
|
+
var _config$url, _config$url2;
|
|
261
|
+
if ((config === null || config === void 0 || (_config$url = config.url) === null || _config$url === void 0 ? void 0 : _config$url.indexOf('zdjg/jg/data/getJgDataStatistics')) > -1 || (config === null || config === void 0 || (_config$url2 = config.url) === null || _config$url2 === void 0 ? void 0 : _config$url2.indexOf('/cloud/zd/base/api/cp/commonFactory')) > -1) {
|
|
261
262
|
return;
|
|
262
263
|
}
|
|
263
264
|
message.error(data.msg || translateLocaleText("t('common.requestInfoError')"));
|
|
@@ -16,11 +16,11 @@ import dayjs from 'dayjs';
|
|
|
16
16
|
import { useEffect, useMemo, useState } from 'react';
|
|
17
17
|
import { VmIframeModal } from "../_components";
|
|
18
18
|
import VtxThemeProvider from "../_components/vm-theme-provider";
|
|
19
|
+
import { translateLocaleText } from "./../hooks/useTranslation.js";
|
|
19
20
|
import VmHeader from "./Header";
|
|
20
21
|
import { getTenantById, getUmsConfig } from "./service";
|
|
21
22
|
import "./style";
|
|
22
23
|
import VmTabs from "./Tabs";
|
|
23
|
-
import { translateLocaleText } from "./../hooks/useTranslation.js";
|
|
24
24
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
25
25
|
var getTabContent = function getTabContent(contents, tabKey) {
|
|
26
26
|
if (!tabKey) {
|
|
@@ -47,6 +47,8 @@ var VmBaseModal = function VmBaseModal(props) {
|
|
|
47
47
|
title = _props$title === void 0 ? '' : _props$title,
|
|
48
48
|
_props$theme = props.theme,
|
|
49
49
|
theme = _props$theme === void 0 ? 'light' : _props$theme,
|
|
50
|
+
_props$zdReborn = props.zdReborn,
|
|
51
|
+
zdReborn = _props$zdReborn === void 0 ? false : _props$zdReborn,
|
|
50
52
|
_props$type = props.type,
|
|
51
53
|
type = _props$type === void 0 ? '' : _props$type,
|
|
52
54
|
id = props.id,
|
|
@@ -140,6 +142,7 @@ var VmBaseModal = function VmBaseModal(props) {
|
|
|
140
142
|
var value = useMemo(function () {
|
|
141
143
|
return {
|
|
142
144
|
theme: theme,
|
|
145
|
+
zdReborn: zdReborn,
|
|
143
146
|
startDate: startDate ? dayjs(startDate) : undefined,
|
|
144
147
|
endDate: endDate ? dayjs(endDate) : undefined,
|
|
145
148
|
date: date ? dayjs(date) : undefined,
|
|
@@ -148,7 +151,7 @@ var VmBaseModal = function VmBaseModal(props) {
|
|
|
148
151
|
chartFontColor: theme === 'light' ? '#595959' : '#FFFFFF',
|
|
149
152
|
chartLineColor: theme === 'light' ? 'rgba(0,0,26,0.15)' : 'rgba(255,255,255,0.15)'
|
|
150
153
|
};
|
|
151
|
-
}, [theme, startDate, endDate, date, mapInfo, tabPosition]);
|
|
154
|
+
}, [theme, zdReborn, startDate, endDate, date, mapInfo, tabPosition]);
|
|
152
155
|
var openHistory = useMemoizedFn(function () {
|
|
153
156
|
var src = '';
|
|
154
157
|
var prefix = '';
|