@vtx/modals2 6.0.0-beta.14 → 6.0.0-beta.16

package/lib/vtx-car-modal/content/Ljzy/BaseInfo/index.js

@@ -27,18 +27,20 @@ var BaseInfo = function BaseInfo() {
     startDate = _useContext.startDate,
     info = _useContext.info;
   var _useSettings = useSettings(),
-    isDark = _useSettings.isDark;
+    isDark = _useSettings.isDark,
+    zdReborn = _useSettings.zdReborn;
   var _useState = useState(dayjs(startDate)),
     _useState2 = _slicedToArray(_useState, 2),
     date = _useState2[0],
     setDate = _useState2[1];
-  var _LjzyService$useGetCa = LjzyService.useGetCarSumByDate({
+  var _LjzyService = LjzyService[zdReborn ? 'useGetCarSumByDateZdReborn' : 'useGetCarSumByDate']({
       carCode: info === null || info === void 0 ? void 0 : info.carCode,
       startDate: dayjs(date).subtract(6, 'day').format('YYYY-MM-DD'),
       endDate: dayjs(date).format('YYYY-MM-DD')
     }),
-    taskDaySummary = _LjzyService$useGetCa.taskDaySummary,
-    loading = _LjzyService$useGetCa.loading;
+    taskDaySummary = _LjzyService.taskDaySummary,
+    loading = _LjzyService.loading;
+  var fieldKey = zdReborn ? 'carNum' : 'carNums';
   var xAxis = _.map(taskDaySummary, 'date');
   var todayInfo = _.last(taskDaySummary) || {};
   var blueColor = '#1677FF';
@@ -82,7 +84,7 @@ var BaseInfo = function BaseInfo() {
                   name: translateLocaleText("t('vtxdfmodal.times')"),
                   unit: translateLocaleText("t('common.timesUnit')"),
                   img: isDark ? darkCarNumIcon : carNumIcon,
-                  value: (todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo.carNums) || 0
+                  value: (todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo[fieldKey]) || 0
                 }), /*#__PURE__*/_jsx("div", {
                   style: {
                     height: 45,
@@ -92,7 +94,7 @@ var BaseInfo = function BaseInfo() {
                     showLegend: false,
                     dataList: [{
                       name: translateLocaleText("t('vtxdfmodal.times')"),
-                      data: _.map(taskDaySummary, 'carNums'),
+                      data: _.map(taskDaySummary, fieldKey),
                       color: transformRgb(blueColor, colorOpacity),
                       smooth: true,
                       symbol: 'none',
@@ -203,7 +205,7 @@ var BaseInfo = function BaseInfo() {
               lineList: [{
                 name: translateLocaleText("t('vtxdfmodal.times')"),
                 data: _.map(taskDaySummary, function (item) {
-                  return "\u2000".concat(item.carNums);
+                  return "\u2000".concat(item[fieldKey]);
                 }),
                 color: isDark ? '#13F97A' : '#0FB964',
                 yAxisIndex: 1

package/lib/vtx-car-modal/content/Ljzy/StaticInfo/index.js

@@ -25,25 +25,25 @@ import { translateLocaleText } from "./../../../../hooks/useTranslation.js";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var StaticInfo = function StaticInfo() {
   var _useSettings = useSettings(),
-    isDark = _useSettings.isDark;
+    isDark = _useSettings.isDark,
+    zdReborn = _useSettings.zdReborn;
   var _useState = useState('calendar'),
     _useState2 = _slicedToArray(_useState, 2),
     type = _useState2[0],
     setType = _useState2[1];
   var _useContext = useContext(CarContext),
-    id = _useContext.id,
     info = _useContext.info;
   var _useState3 = useState(dayjs()),
     _useState4 = _slicedToArray(_useState3, 2),
     month = _useState4[0],
     setMonth = _useState4[1];
-  var _LjzyService$useGetCa = LjzyService.useGetCarSumByDateAndDisposeUnit({
+  var _LjzyService = LjzyService[zdReborn ? 'useGetCarSumByDateAndDisposeUnitZdReborn' : 'useGetCarSumByDateAndDisposeUnit']({
       carCode: info === null || info === void 0 ? void 0 : info.carCode,
       startDate: month.startOf('M').format('YYYY-MM-DD'),
       endDate: dayjs().isSame(month, 'month') ? dayjs().format('YYYY-MM-DD') : month.endOf('M').format('YYYY-MM-DD')
     }),
-    taskDaySummary = _LjzyService$useGetCa.taskDaySummary,
-    loading = _LjzyService$useGetCa.loading;
+    taskDaySummary = _LjzyService.taskDaySummary,
+    loading = _LjzyService.loading;
   var keyByDate = keyBy(taskDaySummary || [], 'date');
   var carNumIcon = lightCarNumIcon;
   var jclIcon = lightJclIcon;
@@ -51,6 +51,7 @@ var StaticInfo = function StaticInfo() {
     carNumIcon = darkCarNumIcon;
     jclIcon = darkJclIcon;
   }
+  var fieldKey = zdReborn ? 'carNum' : 'carNums';
   var columns = [{
     title: translateLocaleText("t('vtxareamodal.date')"),
     dataIndex: 'date',
@@ -69,8 +70,8 @@ var StaticInfo = function StaticInfo() {
     }
   }, {
     title: translateLocaleText("t('vtxcarmodal.timesTimes')"),
-    dataIndex: 'carNums',
-    key: 'carNums',
+    dataIndex: fieldKey,
+    key: fieldKey,
     align: 'right',
     render: function render(text) {
       return /*#__PURE__*/_jsx("span", {
@@ -98,13 +99,12 @@ var StaticInfo = function StaticInfo() {
     if (!item) {
       return null;
     }
-    var netWeight = item.netWeight,
-      carNums = item.carNums;
+    var netWeight = item.netWeight;
     return /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(VmCalendarInner, {
         type: "blue",
         img: jclIcon,
-        value: carNums,
+        value: item === null || item === void 0 ? void 0 : item[fieldKey],
         style: {
           width: '139px',
           justifyContent: 'space-between',
@@ -182,7 +182,7 @@ var StaticInfo = function StaticInfo() {
       lineList: [{
         name: translateLocaleText("t('vtxdfmodal.times')"),
         data: _.map(taskDaySummary, function (item) {
-          return "\u2000".concat(item.carNums);
+          return "\u2000".concat(item === null || item === void 0 ? void 0 : item[fieldKey]);
         }),
         color: isDark ? '#13F97A' : '#0FB964',
         yAxisIndex: 1

package/lib/vtx-car-modal/content/Ljzy/WorkRecord/Detail.js

@@ -13,6 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useSetState } from 'ahooks';
 import { useContext } from 'react';
 import { VmTable, VmWrapper } from "../../../../_components";
+import useSettings from "../../../../_hooks/useSettings";
 import { LjzyService } from "../../../api";
 import { CarContext } from "../../../index";
 import { translateLocaleText } from "./../../../../hooks/useTranslation.js";
@@ -22,6 +23,8 @@ var Detail = function Detail(_ref) {
     endDate = _ref.endDate;
   var _useContext = useContext(CarContext),
     info = _useContext.info;
+  var _useSettings = useSettings(),
+    zdReborn = _useSettings.zdReborn;
   var _useSetState = useSetState({
       pagination: {
         current: 1,
@@ -37,7 +40,7 @@ var Detail = function Detail(_ref) {
   var pagination = state.pagination,
     sort = state.sort,
     order = state.order;
-  var _LjzyService$useGetWo = LjzyService.useGetWorkDetail({
+  var _LjzyService = LjzyService[zdReborn ? 'useGetWorkDetailZdReborn' : 'useGetWorkDetail']({
       startTime: "".concat(startDate, " 00:00:00"),
       endTime: "".concat(endDate, " 23:59:59"),
       carNo: info === null || info === void 0 ? void 0 : info.carCode,
@@ -45,8 +48,8 @@ var Detail = function Detail(_ref) {
       sort: sort,
       order: order
     }),
-    workDetailData = _LjzyService$useGetWo.workDetailData,
-    loading = _LjzyService$useGetWo.loading;
+    workDetailData = _LjzyService.workDetailData,
+    loading = _LjzyService.loading;
   var records = {
     total: (workDetailData === null || workDetailData === void 0 ? void 0 : workDetailData.total) || 0,
     rows: (workDetailData === null || workDetailData === void 0 ? void 0 : workDetailData.rows) || []

package/lib/vtx-car-modal/content/Ljzy/WorkRecord/Summary.js

@@ -16,18 +16,20 @@ var Summary = function Summary(_ref) {
   var startDate = _ref.startDate,
     endDate = _ref.endDate;
   var _useSettings = useSettings(),
-    isDark = _useSettings.isDark;
+    isDark = _useSettings.isDark,
+    zdReborn = _useSettings.zdReborn;
   var _useContext = useContext(CarContext),
     id = _useContext.id,
     info = _useContext.info;
-  var _LjzyService$useGetCa = LjzyService.useGetCarSumByDate({
+  var _LjzyService = LjzyService[zdReborn ? 'useGetCarSumByDateZdReborn' : 'useGetCarSumByDate']({
       carCode: info === null || info === void 0 ? void 0 : info.carCode,
       startDate: startDate,
       endDate: endDate
     }),
-    taskDaySummary = _LjzyService$useGetCa.taskDaySummary,
-    loading = _LjzyService$useGetCa.loading;
-  var totalCarNums = _.sumBy(taskDaySummary, 'carNums');
+    taskDaySummary = _LjzyService.taskDaySummary,
+    loading = _LjzyService.loading;
+  var fieldKey = zdReborn ? 'carNum' : 'carNums';
+  var totalCarNums = _.sumBy(taskDaySummary, fieldKey);
   var dailyCompletePercent = _.sumBy(taskDaySummary, 'netWeight').toFixed(2);
   var xAxis = _.map(taskDaySummary, 'date');
   return /*#__PURE__*/_jsx(VmWrapper, {
@@ -47,7 +49,7 @@ var Summary = function Summary(_ref) {
           }), /*#__PURE__*/_jsx(VmBarCharts, {
             dataList: [{
               name: translateLocaleText("t('vtxdfmodal.times')"),
-              data: _.map(taskDaySummary, 'carNums')
+              data: _.map(taskDaySummary, fieldKey)
             }],
             unit: translateLocaleText("t('common.timesUnit')"),
             xAxis: xAxis,

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

@@ -131,7 +131,9 @@ var VtxCarModal = function VtxCarModal(props) {
     _props$iframeUrl = props.iframeUrl,
     iframeUrl = _props$iframeUrl === void 0 ? '' : _props$iframeUrl,
     _props$width = props.width,
-    width = _props$width === void 0 ? null : _props$width;
+    width = _props$width === void 0 ? null : _props$width,
+    _props$zdReborn = props.zdReborn,
+    zdReborn = _props$zdReborn === void 0 ? false : _props$zdReborn;
   var _BaseService$useBaseI = BaseService.useBaseInfo(id),
     detail = _BaseService$useBaseI.detail,
     info = _BaseService$useBaseI.info;
@@ -345,6 +347,7 @@ var VtxCarModal = function VtxCarModal(props) {
         endDate: endDate,
         showCollect: showCollect,
         frameParams: frameParams,
+        zdReborn: zdReborn,
         iframeUrl: iframeUrl,
         tagList: [{
           color: 'blue',

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

@@ -13,6 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useSetState } from 'ahooks';
 import { VmIframeModal } from "../_components";
 import Appraisal from "../_components/vm-appraisal-info";
+import VmCustom from "../_components/vm-custom";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
 import { translateLocaleText } from "./../hooks/useTranslation.js";
@@ -51,8 +52,10 @@ var VtxRoadModal = function VtxRoadModal(props) {
       title: translateLocaleText("t('vtxroadmodal.statisticalInformation')")
     });
   }
+  // 配置尚未返回或未配置页签时，沿用道路弹窗原有的默认页签。
   var _useGetConfig = useGetConfig('tr', tabs),
     tabsData = _useGetConfig.tabsData;
+  var tabsList = tabsData || [];
   var _useSetState = useSetState({
       src: '',
       visible: false,
@@ -88,6 +91,16 @@ var VtxRoadModal = function VtxRoadModal(props) {
   var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, baseContent), TABS_STATIC, statisticalContent), TABS_CALENDAR, calendarContent), TABS_LANE_BASE, laneBaseContent), TABS_LANE_STATIC, laneStatisticalContent), TABS_LANE_CALENDAR, laneCalendarContent), TABS_APPRAISAL, /*#__PURE__*/_jsx(Appraisal, {
     id: id
   }));
+
+  // 自定义页签可配置多个。
+  tabsList.forEach(function (tab) {
+    if (tab.url) {
+      contents[tab.key] = /*#__PURE__*/_jsx(VmCustom, {
+        id: id,
+        url: tab.url
+      });
+    }
+  });
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [visible && /*#__PURE__*/_jsx(VtxBaseModal, {
       title: title,
@@ -96,7 +109,7 @@ var VtxRoadModal = function VtxRoadModal(props) {
       theme: theme,
       visible: visible,
       onCancel: onCancel,
-      tabs: tabsData,
+      tabs: tabsList,
       tabChose: tabChose,
       startDate: startDate,
       endDate: endDate,

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

@@ -42,9 +42,9 @@ var BaseService = {
     }, {
       label: translateLocaleText("t('vtxtfdmodal.hours')"),
       key: 'householdNum',
-      value: info === null || info === void 0 || (_info$timePeriods = info.timePeriods) === null || _info$timePeriods === void 0 || (_info$timePeriods = _info$timePeriods.map(function (ele) {
+      value: info !== null && info !== void 0 && info.timePeriods && _typeof(info.timePeriods) === 'object' ? (_info$timePeriods = info.timePeriods) === null || _info$timePeriods === void 0 || (_info$timePeriods = _info$timePeriods.map(function (ele) {
         return "".concat(ele.startTime, "~").concat(ele.endTime);
-      })) === null || _info$timePeriods === void 0 ? void 0 : _info$timePeriods.join('、')
+      })) === null || _info$timePeriods === void 0 ? void 0 : _info$timePeriods.join('、') : info === null || info === void 0 ? void 0 : info.timePeriods
     }, {
       label: translateLocaleText("t('vtxtfdmodal.supervisor')"),
       key: 'supervisorName',

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

@@ -17,6 +17,7 @@ import VmCustom from "../_components/vm-custom";
 import VmRepairMaintain from "../_components/vm-repair-maintain";
 import VmVideo, { insertVideoTab } from "../_components/vm-video";
 import useGetChannels from "../_hooks/useGetChannels";
+import useGetConfig from "../_hooks/useGetConfig";
 import { CommonService } from "../_service";
 import VtxBaseModal from "../vtx-base-modal";
 import VtxDefaultModal from "../vtx-default-modal";
@@ -40,8 +41,12 @@ var smallPop = function smallPop(params) {
     data: params
   });
 };
+var tabs = [{
+  key: 'base',
+  title: translateLocaleText("t('vtxdefaultmodal.basicInformation')")
+}];
 export default (function (props) {
-  var _tabsData, _config$;
+  var _config$;
   var visible = props.visible,
     theme = props.theme,
     title = props.title,
@@ -59,7 +64,9 @@ export default (function (props) {
     setConfig = _useState4[1];
   var _CommonService$useBas = CommonService.useBaseInfo(id),
     info = _CommonService$useBas.info;
-  var _useGetChannels = useGetChannels("".concat((info === null || info === void 0 ? void 0 : info.typeCode) || 'wr', "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.code) && ((_tabsData = tabsData) === null || _tabsData === void 0 ? void 0 : _tabsData.findIndex(function (ele) {
+  var _useGetConfig = useGetConfig(info === null || info === void 0 ? void 0 : info.typeCode, tabs),
+    tabsData = _useGetConfig.tabsData;
+  var _useGetChannels = useGetChannels("".concat((info === null || info === void 0 ? void 0 : info.typeCode) || 'wr', "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.code) && (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
       return ele.key === 'video';
     })) > -1),
     channels = _useGetChannels.channels;

package/package.json

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