@vtx/modals2 5.0.52 → 5.0.55

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

@@ -1,19 +1,21 @@
 import { getVtxToken } from '@vtx/utils';
 import useSettings from "../../_hooks/useSettings";
 import "./style/index.less";
+import dayjs from 'dayjs';
 import { jsx as _jsx } from "react/jsx-runtime";
 var VmCustom = function VmCustom(_ref) {
   var id = _ref.id,
     url = _ref.url;
   var _useSettings = useSettings(),
-    theme = _useSettings.theme;
+    theme = _useSettings.theme,
+    date = _useSettings.date;
   var _getVtxToken = getVtxToken(),
     token = _getVtxToken.token,
     userId = _getVtxToken.userId,
     tenantId = _getVtxToken.tenantId;
   var param = (url === null || url === void 0 ? void 0 : url.indexOf('http')) > -1 ? "&userId=".concat(userId, "&tenantId=").concat(tenantId, "&token=").concat(token) : '';
   return /*#__PURE__*/_jsx("iframe", {
-    src: "".concat(url).concat(id, "&theme=").concat(theme).concat(param),
+    src: "".concat(url).concat(id, "&theme=").concat(theme).concat(param, "&date=").concat(date ? dayjs(date).format('YYYY-MM-DD') : ''),
     style: {
       width: '100%',
       height: 600,

package/lib/vtx-cc-cp-modal/api.js

@@ -124,11 +124,11 @@ export var BasicService = {
       rows: []
     };
   },
-  useGetSyPointDaySummary: function useGetSyPointDaySummary(syPointId) {
+  useGetSyPointDaySummary: function useGetSyPointDaySummary(syPointId, date) {
     var _useRequest6 = useRequest(function () {
         return query("".concat(urlPrefix, "gisOnePage/getSyPointDaySummary"), {
           syPointId: syPointId,
-          today: dayjs().format('YYYY-MM-DD')
+          today: dayjs(date).format('YYYY-MM-DD')
         });
       }, {
         refreshDeps: [syPointId],
@@ -152,16 +152,16 @@ export var BasicService = {
       data = _useRequest7.data;
     return data;
   },
-  useGetSyPointCollectLine: function useGetSyPointCollectLine(syPointId, startDay, endDay) {
+  useGetSyPointCollectLine: function useGetSyPointCollectLine(syPointId, startDay, endDay, garbageType) {
     var _useRequest8 = useRequest(function () {
         return query("".concat(urlPrefix, "gisOnePage/getSyPointCollectLine"), {
           syPointId: syPointId,
           startDay: startDay,
           endDay: endDay,
-          garbageType: 'ccfqw'
+          garbageType: garbageType || 'ccfqw'
         });
       }, {
-        refreshDeps: [syPointId, startDay, endDay],
+        refreshDeps: [syPointId, startDay, endDay, garbageType],
         ready: !!syPointId
       }),
       _useRequest8$data = _useRequest8.data,

package/lib/vtx-cc-cp-modal/components/BaseInfo/AllWork.js

@@ -15,8 +15,9 @@ var AllWork = function AllWork() {
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var _useContext = useContext(CcCpContext),
-    id = _useContext.id;
-  var data = BasicService.useGetSyPointDaySummary(id);
+    id = _useContext.id,
+    date = _useContext.date;
+  var data = BasicService.useGetSyPointDaySummary(id, date);
   var blockItem = function blockItem(title, value, unit) {
     return /*#__PURE__*/_jsxs("div", {
       className: "vtx-cc-cp-task-item-block-item",

package/lib/vtx-cc-cp-modal/components/BaseInfo/index.js

@@ -12,7 +12,8 @@ import SyRecord from "./SyRecord";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var BaseInfo = function BaseInfo() {
   var _useContext = useContext(CcCpContext),
-    id = _useContext.id;
+    id = _useContext.id,
+    date = _useContext.date;
   var data = BasicService.useInfo({
     id: id
   });
@@ -50,8 +51,8 @@ var BaseInfo = function BaseInfo() {
           children: /*#__PURE__*/_jsx(VmWrapper, {
             title: '收运明细',
             children: /*#__PURE__*/_jsx(SyRecord, {
-              startTime: dayjs().format('YYYY-MM-DD'),
-              endTime: dayjs().format('YYYY-MM-DD'),
+              startTime: dayjs(date).format('YYYY-MM-DD'),
+              endTime: dayjs(date).format('YYYY-MM-DD'),
               pagination: false
             })
           })

package/lib/vtx-cc-cp-modal/components/Calendar/index.js

@@ -99,8 +99,9 @@ var CollectCalendar = function CollectCalendar() {
   var _useSettings2 = useSettings(),
     isDark = _useSettings2.isDark;
   var _useContext = useContext(CcCpContext),
-    id = _useContext.id;
-  var _useState3 = useState(dayjs()),
+    id = _useContext.id,
+    defaultDate = _useContext.date;
+  var _useState3 = useState(defaultDate ? dayjs(defaultDate) : dayjs()),
     _useState4 = _slicedToArray(_useState3, 2),
     date = _useState4[0],
     setDate = _useState4[1];

package/lib/vtx-cc-cp-modal/components/SyInfo/index.js

@@ -7,15 +7,19 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useSetState } from 'ahooks';
 import { Col, Row } from 'antd';
 import dayjs from 'dayjs';
+import { useContext } from 'react';
 import { VmWrapper } from "../../../_components";
+import { CcCpContext } from "../../index";
 import SyRecord from "../BaseInfo/SyRecord";
 import Ljcsl from "./Ljcsl";
 import SummaryInfo from "./SummaryInfo";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var SyInfo = function SyInfo() {
+  var _useContext = useContext(CcCpContext),
+    defaultDate = _useContext.date;
   var _useSetState = useSetState({
-      startDate: dayjs().subtract(1, 'week'),
-      endDate: dayjs()
+      startDate: defaultDate ? dayjs(defaultDate) : dayjs().subtract(1, 'week'),
+      endDate: defaultDate ? dayjs(defaultDate) : dayjs()
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     date = _useSetState2[0],

package/lib/vtx-cc-cp-modal/index.js

@@ -18,6 +18,8 @@ import VtxCarModal from "../vtx-car-modal";
 import VtxRestaurantModal from "../vtx-restaurant-modal";
 import { AlarmInfo, BaseInfo, Calendar, ExceptionInfo, Restaurant, SyInfo } from "./components";
 import "./style";
+import { VmCustom } from "../_components";
+import dayjs from 'dayjs';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var TABS_SY = 'sy';
@@ -37,10 +39,10 @@ var VtxCcCpModal = function VtxCcCpModal(props) {
     _props$theme = props.theme,
     theme = _props$theme === void 0 ? 'light' : _props$theme,
     title = props.title,
-    _props$showOrder = props.showOrder,
-    showOrder = _props$showOrder === void 0 ? false : _props$showOrder,
     _props$tabChose = props.tabChose,
-    tabChose = _props$tabChose === void 0 ? '' : _props$tabChose;
+    tabChose = _props$tabChose === void 0 ? '' : _props$tabChose,
+    _props$date = props.date,
+    date = _props$date === void 0 ? dayjs().format('YYYY-MM-DD') : _props$date;
   var _useState = useState({
       visible: false,
       id: '',
@@ -91,9 +93,21 @@ var VtxCcCpModal = function VtxCcCpModal(props) {
     return {
       id: id,
       openCar: openCar,
-      openRestaurant: openRestaurant
+      openRestaurant: openRestaurant,
+      date: date
     };
-  }, [id]);
+  }, [id, date]);
+  // 自定义页签可配置多个，包含custom即可
+  if (tabsData !== null && tabsData !== void 0 && tabsData.length) {
+    tabsData.forEach(function (ele) {
+      if (ele.url) {
+        tabContents[ele.key] = /*#__PURE__*/_jsx(VmCustom, {
+          id: id,
+          url: ele === null || ele === void 0 ? void 0 : ele.url
+        }, ele.key);
+      }
+    });
+  }
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Provider, {
       value: value,
@@ -104,6 +118,7 @@ var VtxCcCpModal = function VtxCcCpModal(props) {
         onCancel: onCancel,
         tabs: tabsData,
         tabChose: tabChose,
+        date: date,
         contents: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {})), TABS_RESTAURANT, /*#__PURE__*/_jsx(Restaurant, {})), TABS_SY, /*#__PURE__*/_jsx(SyInfo, {})), TABS_WARNNING, /*#__PURE__*/_jsx(AlarmInfo, {})), TABS_EXECEPTION, /*#__PURE__*/_jsx(ExceptionInfo, {})), TABS_CALENDAR, /*#__PURE__*/_jsx(Calendar, {}))
       })
     }), carModal.visible && /*#__PURE__*/_jsx(VtxCarModal, _objectSpread(_objectSpread({}, carModal), {}, {

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

@@ -14,6 +14,7 @@ import { request } from '@vtx/utils';
 import { useEffect, useState } from 'react';
 import VmCustom from "../_components/vm-custom";
 import VtxBaseModal from "../vtx-base-modal";
+import VtxDefaultModal from "../vtx-default-modal";
 import { Appraise, Base, Build, File, Score } from "./components";
 import "./style";
 
@@ -88,7 +89,7 @@ export default (function (props) {
     });
   }
   return /*#__PURE__*/_jsx(_Fragment, {
-    children: visible && /*#__PURE__*/_jsx(VtxBaseModal, {
+    children: visible && config !== null && config !== void 0 && config.length ? /*#__PURE__*/_jsx(VtxBaseModal, {
       type: "wr",
       visible: visible,
       theme: theme,
@@ -114,6 +115,12 @@ export default (function (props) {
       }].filter(function (item) {
         return !!item;
       })
+    }) : /*#__PURE__*/_jsx(VtxDefaultModal, {
+      visible: visible,
+      theme: theme,
+      title: title,
+      id: id,
+      onCancel: onCancel
     })
   });
 });

package/package.json

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