@vtx/modals2 6.0.0-beta.10 → 6.0.0-beta.12

package/lib/_components/vm-appraisal-info/index.js

@@ -4,21 +4,21 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 _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 _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; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 { VtxImage } from '@vtx/components';
 import { useSetState } from 'ahooks';
 import dayjs from 'dayjs';
-import { translateLocaleText } from "../../hooks/useTranslation.js";
 import useSettings from "../../_hooks/useSettings";
+import { translateLocaleText } from "../../hooks/useTranslation.js";
 import VmFactor from "../vm-factor";
 import VmFilter from "../vm-filter";
 import VmTable from "../vm-table";
@@ -27,31 +27,6 @@ import { BaseService, ReocrdService } from "./api";
 import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var APPRAISAL_TAB_KEY = 'appraisal';
-export var getAppraisalTab = function getAppraisalTab() {
-  return {
-    key: APPRAISAL_TAB_KEY,
-    title: translateLocaleText("t('vtxwrmodal.assessmentInformation')")
-  };
-};
-export var isAppraisalTab = function isAppraisalTab(tab) {
-  return (tab === null || tab === void 0 ? void 0 : tab.key) === APPRAISAL_TAB_KEY || "".concat((tab === null || tab === void 0 ? void 0 : tab.key) || '').endsWith('-appraisal');
-};
-export var insertAppraisalTab = function insertAppraisalTab() {
-  var tabs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  if (!Array.isArray(tabs) || tabs.length === 0) {
-    return tabs;
-  }
-  if (tabs.some(isAppraisalTab)) {
-    return tabs;
-  }
-  var customIndex = tabs.findIndex(function (tab) {
-    return !!(tab !== null && tab !== void 0 && tab.url);
-  });
-  if (customIndex === -1) {
-    return [].concat(_toConsumableArray(tabs), [getAppraisalTab()]);
-  }
-  return [].concat(_toConsumableArray(tabs.slice(0, customIndex)), [getAppraisalTab()], _toConsumableArray(tabs.slice(customIndex)));
-};
 var AppraisalInfo = function AppraisalInfo(props) {
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;

package/lib/_components/vm-bar-charts/index.js

@@ -137,7 +137,7 @@ var BarCharts = function BarCharts(_ref) {
         type: 'bar',
         data: item.data,
         yAxisIndex: item.yAxisIndex || 0,
-        barWidth: 18,
+        barMaxWidth: 18,
         itemStyle: {
           color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
             offset: 1,

package/lib/vtx-road-modal/components/LaneBaseInfo/Work.js

@@ -224,8 +224,8 @@ var Work = function Work(props) {
           var query = buildIframeQuery(location.href.split('?')[1], {
             carId: record.workCarId,
             theme: theme === 'blue' ? 'dark' : theme,
-            startTime: dayjs(date).format('YYYY-MM-DD 00:00:00'),
-            endTime: dayjs(date).format('YYYY-MM-DD 23:59:59')
+            startTime: dayjs(day).format('YYYY-MM-DD 00:00:00'),
+            endTime: dayjs(day).format('YYYY-MM-DD 23:59:59')
           });
           var src = "".concat(prefix, "/carHistory/#/zyqsLaneHistory?").concat(query);
           setIframeModalInfo({

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

@@ -58,6 +58,9 @@ var Calendar = function Calendar(_ref) {
   }
   var dateCellRender = function dateCellRender(value) {
     var date = dayjs(value).format('YYYY-MM-DD');
+    if (dayjs().isBefore(dayjs(value))) {
+      return null;
+    }
     var info = calendarInfo[date];
     var _ref2 = info || {},
       planMileage = _ref2.planMileage,

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

@@ -12,13 +12,13 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useSetState } from 'ahooks';
 import { VmIframeModal } from "../_components";
-import Appraisal, { insertAppraisalTab } from "../_components/vm-appraisal-info";
+import Appraisal from "../_components/vm-appraisal-info";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
+import { translateLocaleText } from "./../hooks/useTranslation.js";
 import { BaseService } from "./api";
-import { BaseInfo, Calendar, Statistical, LaneBaseInfo, LaneStatistical, LaneCalendar } from "./components";
+import { BaseInfo, Calendar, LaneBaseInfo, LaneCalendar, LaneStatistical, Statistical } from "./components";
 import "./style/index";
-import { translateLocaleText } from "./../hooks/useTranslation.js";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var TABS_STATIC = 'statistical';
@@ -96,7 +96,7 @@ var VtxRoadModal = function VtxRoadModal(props) {
       theme: theme,
       visible: visible,
       onCancel: onCancel,
-      tabs: insertAppraisalTab(tabsData),
+      tabs: tabsData,
       tabChose: tabChose,
       startDate: startDate,
       endDate: endDate,

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

@@ -25,7 +25,7 @@ var TABS_VIDEO = 'video';
 var TABS_APPRAISAL = 'appraisal';
 var TABS_RM = 'rm';
 var TABS_Calendar = 'calendar';
-var VtxDfModal = function VtxDfModal(props) {
+var VtxZzzModal = function VtxZzzModal(props) {
   var id = props.id,
     title = props.title,
     subTitle = props.subTitle,
@@ -139,4 +139,4 @@ var VtxDfModal = function VtxDfModal(props) {
     })
   });
 };
-export default VtxDfModal;
+export default VtxZzzModal;

package/package.json

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