@vtx/modals2 5.0.44 → 5.0.46

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

@@ -1,15 +1,25 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["children"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Tooltip } from 'antd';
 import useSettings from "../../_hooks/useSettings";
 import "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function VmFactor(props) {
+  var children = props.children,
+    rest = _objectWithoutProperties(props, _excluded);
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   return /*#__PURE__*/_jsx("div", {
     className: "vm-tooltip ".concat(isDark ? 'dark' : ''),
-    children: /*#__PURE__*/_jsx(Tooltip, {
-      title: item.name || '',
+    children: /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({}, rest), {}, {
       children: props.children
-    })
+    }))
   });
 }

package/lib/vtx-base-modal/Tabs/index.js

@@ -1,4 +1,11 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import classNames from 'classnames';
+import { useEffect, useRef, useState } from 'react';
 import { AccessIcon, AlarmIcon, AnalysisIcon, AnnouncementIcon, AnnualInspectionIcon, AppraisalIcon, AppraiseIcon, AssessmentIcon, AssetIcon, AttendanceIcon, CalendarIcon, CaseIcon, ChargingIcon, CollectionIcon, ContractIcon, DeviceIcon, DocumentIcon, EquipmentIcon, EvaluationIcon, FactoryIcon, HistoryIcon, IndexIcon, InspectionIcon, InsuranceIcon, InterviewIcon, LifeCycleIcon, LogIcon, MaintenanceIcon, MeasurementIcon, MeteringIcon, OilIcon, OperationIcon, PointIcon, ProcessIcon, ProductionUnitIcon, RmIcon, RouteIcon, SbzjIcon, SchedulingIcon, ScoreIcon, SparePartsIcon, SpeedCurveIcon, StatisticsIcon, SummaryIcon, SyInfoIcon, TfdIcon, TfrdIcon, ThrowIcon, TrashIcon, VideoIcon, ViolationIcon, WaterIcon, WgrgsIcon, WgxwIcon, WorkConditionIcon, WorkInfoIcon, WorkingConditionIcon, WorkOrderIcon } from "../../_util/iconSvgHtml";
 import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -9,6 +16,33 @@ var Tabs = function Tabs(props) {
     active = props.active,
     _props$theme = props.theme,
     theme = _props$theme === void 0 ? 'light' : _props$theme;
+  var wrapRef = useRef(null);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isScrollable = _useState2[0],
+    setIsScrollable = _useState2[1];
+  useEffect(function () {
+    var wrapDom = wrapRef.current;
+    if (!wrapDom) return undefined;
+    var checkScrollable = function checkScrollable() {
+      setIsScrollable(wrapDom.scrollWidth > wrapDom.clientWidth + 1);
+    };
+    checkScrollable();
+    var resizeObserver;
+    if (typeof ResizeObserver !== 'undefined') {
+      resizeObserver = new ResizeObserver(checkScrollable);
+      resizeObserver.observe(wrapDom);
+    } else {
+      window.addEventListener('resize', checkScrollable);
+    }
+    return function () {
+      if (resizeObserver) {
+        resizeObserver.disconnect();
+      } else {
+        window.removeEventListener('resize', checkScrollable);
+      }
+    };
+  }, [tabs]);
   var iconRender = {
     'default-base': SummaryIcon,
     base: SummaryIcon,
@@ -82,28 +116,34 @@ var Tabs = function Tabs(props) {
   };
   return tabs.length ? /*#__PURE__*/_jsx("div", {
     className: 'vm-modal-tabs',
-    children: tabs.map(function (tab, index) {
-      var width = 26,
-        height = 26;
-      var ComponentIcon = iconRender[tab.key] || SummaryIcon;
-      return /*#__PURE__*/_jsxs("div", {
-        onClick: function onClick() {
-          onChange(tab.key);
-        },
-        className: classNames('vm-modal-tabs-item', active === tab.key ? 'vm-modal-tabs-item-active' : 'vm-modal-tabs-item-normal', {
-          'vm-modal-tabs-item-dark': theme !== 'light'
-        }),
-        children: [ComponentIcon && /*#__PURE__*/_jsx(ComponentIcon, {
-          width: width,
-          height: height,
-          fill: theme === 'light' ? active === tab.key ? '#fff' : '#1F1F1F' : '#fff',
-          style: {
-            transform: 'scale(0.55)'
-          }
-        }), /*#__PURE__*/_jsx("span", {
-          children: tab.title
-        })]
-      }, index);
+    children: /*#__PURE__*/_jsx("div", {
+      ref: wrapRef,
+      className: classNames('vm-modal-tabs-wrap', {
+        'vm-modal-tabs-wrap-scrollable': isScrollable
+      }),
+      children: tabs.map(function (tab, index) {
+        var width = 26,
+          height = 26;
+        var ComponentIcon = iconRender[tab.key] || SummaryIcon;
+        return /*#__PURE__*/_jsxs("div", {
+          onClick: function onClick() {
+            onChange(tab.key);
+          },
+          className: classNames('vm-modal-tabs-item', active === tab.key ? 'vm-modal-tabs-item-active' : 'vm-modal-tabs-item-normal', {
+            'vm-modal-tabs-item-dark': theme !== 'light'
+          }),
+          children: [ComponentIcon && /*#__PURE__*/_jsx(ComponentIcon, {
+            width: width,
+            height: height,
+            fill: theme === 'light' ? active === tab.key ? '#fff' : '#1F1F1F' : '#fff',
+            style: {
+              transform: 'scale(0.55)'
+            }
+          }), /*#__PURE__*/_jsx("span", {
+            children: tab.title
+          })]
+        }, index);
+      })
     })
   }) : null;
 };

package/lib/vtx-base-modal/Tabs/index.less

@@ -4,11 +4,25 @@
   background: var(--vm-tabs-bg);
   border-radius: 8px 8px 0 0;
   border: none;
-  // border: 2px solid var(--vm-tab-border-color);
-  display: flex;
-  justify-content: center;
-  gap: 16px;
-  align-items: center;
+  .vm-modal-tabs-wrap {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    gap: 16px;
+    align-items: center;
+    overflow-x: auto;
+    box-sizing: border-box;
+    padding: 0 16px;
+    &.vm-modal-tabs-wrap-scrollable {
+      justify-content: flex-start;
+    }
+    &::-webkit-scrollbar {
+      height: 2px !important;
+    }
+    &::-webkit-scrollbar-thumb {
+      background-color: #d3d7db !important;
+    }
+  }
 
   &-item {
     display: flex;
@@ -20,7 +34,7 @@
     cursor: pointer;
     align-items: center;
     justify-content: center;
-
+    flex-shrink: 0;
     &-active {
       background: var(--vm-tab-item-active-bg-color);
       border-radius: 26px;

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.44",
+  "version": "5.0.46",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",