@vtx/modals2 5.0.43 → 5.0.45

package/lib/_hooks/useGetConfig.js

@@ -12,43 +12,40 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { request } from '@vtx/utils';
 import { useRequest } from 'ahooks';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 export default (function (code, tabs) {
-  var _data$data;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     tabsData = _useState2[0],
     setTabsData = _useState2[1];
-  var _useRequest = useRequest(function () {
-      return request.get('/cloud/jcss-reborn/facility/type/config/getByCode', {
-        data: {
-          code: code
-        }
-      });
-    }, {
-      ready: !!code,
-      refreshDeps: [code]
-    }),
-    data = _useRequest.data,
-    loading = _useRequest.loading;
-  var tabConfig = (data === null || data === void 0 || (_data$data = data.data) === null || _data$data === void 0 || (_data$data = _data$data.popupConfigJson) === null || _data$data === void 0 ? void 0 : _data$data.filter(function (ele) {
-    return ele.display;
-  }).map(function (ele) {
-    return _objectSpread(_objectSpread({}, ele), {}, {
-      key: ele.code,
-      title: ele.name
+  useRequest(function () {
+    return request.get('/cloud/jcss-reborn/facility/type/config/getByCode', {
+      data: {
+        code: code
+      }
     });
-  })) || [];
-  var visited = !!data;
-  useEffect(function () {
-    var tabsC = tabs || [];
-    if (visited) {
-      tabsC = (tabConfig === null || tabConfig === void 0 ? void 0 : tabConfig.length) > 0 ? tabConfig : tabs;
+  }, {
+    ready: !!code,
+    refreshDeps: [code],
+    onSuccess: function onSuccess(data) {
+      var _data$data;
+      var tabConfig = (data === null || data === void 0 || (_data$data = data.data) === null || _data$data === void 0 || (_data$data = _data$data.popupConfigJson) === null || _data$data === void 0 ? void 0 : _data$data.filter(function (ele) {
+        return ele.display;
+      }).map(function (ele) {
+        return _objectSpread(_objectSpread({}, ele), {}, {
+          key: ele.code,
+          title: ele.name
+        });
+      })) || [];
+      var visited = !!data;
+      var tabsC = tabs || [];
+      if (visited) {
+        tabsC = (tabConfig === null || tabConfig === void 0 ? void 0 : tabConfig.length) > 0 ? tabConfig : tabs;
+      }
+      setTabsData(tabsC);
     }
-    setTabsData(tabsC);
-  }, [JSON.stringify(tabConfig), visited, JSON.stringify(tabs)]);
+  });
   return {
-    tabsData: tabsData,
-    loading: loading
+    tabsData: tabsData
   };
 });

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

@@ -245,8 +245,7 @@ var VtxCarModal = function VtxCarModal(props) {
     channels: channels
   })), TABS_OIL, /*#__PURE__*/_jsx(Common.OilConsumption, {})), TABS_WATER, /*#__PURE__*/_jsx(Common.WaterConsumption, {})), TABS_MAINTENANCE, /*#__PURE__*/_jsx(Common.Maintenance, {})), TABS_DETAIL, /*#__PURE__*/_jsx(Common.DetailInfo, {})), TABS_DEVICE, /*#__PURE__*/_jsx(Common.DeviceInfo, {})), TABS_JXH_BASE, /*#__PURE__*/_jsx(JXH.BaseInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_JXH_STATIC, /*#__PURE__*/_jsx(JXH.StaticInfo, {})), TABS_JXH_WORK, /*#__PURE__*/_jsx(JXH.WorkRecord, {})), TABS_JXH_ALARM, /*#__PURE__*/_jsx(JXH.AlarmInfo, {})), TABS_LJSY_BASE, /*#__PURE__*/_jsx(Ljsy.BaseInfo, {})), TABS_LJSY_STATIC, /*#__PURE__*/_jsx(Ljsy.StaticInfo, {})), TABS_LJSY_WORK, /*#__PURE__*/_jsx(Ljsy.WorkRecord, {})), TABS_LJSY_ALARM, /*#__PURE__*/_jsx(Ljsy.AlarmInfo, {})), TABS_CC_BASE, /*#__PURE__*/_jsx(Cc.BaseInfo, {})), TABS_CC_ORDER, /*#__PURE__*/_jsx(Cc.OrderInfo, {})), TABS_CC_STATIC, /*#__PURE__*/_jsx(Cc.StaticInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_CC_WORK, /*#__PURE__*/_jsx(Cc.WorkRecord, {})), TABS_CC_ALARM, /*#__PURE__*/_jsx(Cc.AlarmInfo, {})), TABS_LJZY_BASE, /*#__PURE__*/_jsx(Ljzy.BaseInfo, {})), TABS_LJZY_STATIC, /*#__PURE__*/_jsx(Ljzy.StaticInfo, {})), TABS_LJZY_WORK, /*#__PURE__*/_jsx(Ljzy.WorkRecord, {})), TABS_JZLJ_CAR_BASE, /*#__PURE__*/_jsx(Jzlj.BaseInfo, {})), TABS_JZLJ_CAR_DISPOSE, /*#__PURE__*/_jsx(Jzlj.Dispose, {})), TABS_JZLJ_CAR_COLLECTION, /*#__PURE__*/_jsx(Jzlj.Collection, {})), TABS_JZLJ_CAR_ALARM, /*#__PURE__*/_jsx(Jzlj.Alarm, {})), TABS_JZLJ_CAR_RUNNING_CALENDAR, /*#__PURE__*/_jsx(Jzlj.RunCalendar, {})));
   var _useGetConfig = useGetConfig(code, tabs),
-    tabsData = _useGetConfig.tabsData,
-    loading = _useGetConfig.loading;
+    tabsData = _useGetConfig.tabsData;
   var tabsList = useMemo(function () {
     var tabsList = tabsData;
     if (tabsList.findIndex(function (ele) {
@@ -323,7 +322,7 @@ var VtxCarModal = function VtxCarModal(props) {
           color: info.carStatus === 'OFFLINE' ? 'red' : 'green',
           value: info.carStatusStr
         }],
-        contents: loading ? {} : contents
+        contents: contents
       }), /*#__PURE__*/_jsx(VmIframeModal, _objectSpread(_objectSpread({}, iframeModalInfo), {}, {
         theme: theme,
         onCancel: function onCancel() {

package/lib/vtx-device-modal/components/DataAnalysis/MonitorAnalysis.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { ChartIcon, ListIcon } from "../../../_util/iconSvgHtml";
 import { useSetState } from 'ahooks';
-import { Col, Row, Space, Spin } from 'antd';
+import { Col, Row, Space, Spin, message } from 'antd';
 import classnames from 'classnames';
 import dayjs from 'dayjs';
 import * as echarts from 'echarts';
@@ -434,6 +434,13 @@ var MonitorAnalysis = function MonitorAnalysis(_ref) {
       },
       filterType: 'rangePicker',
       filterChange: function filterChange(date) {
+        if (!(date !== null && date !== void 0 && date[0]) || !(date !== null && date !== void 0 && date[1])) {
+          return;
+        }
+        if (date[1].diff(date[0], 'd') > 7) {
+          message.warning('时间跨度不能超过7天');
+          return;
+        }
         setState({
           startDate: date[0],
           endDate: date[1]

package/package.json

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