@vtx/modals2 5.0.53 → 5.0.56

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

@@ -11,14 +11,15 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { useMemoizedFn } from 'ahooks';
+import dayjs from 'dayjs';
 import React, { useMemo, useState } from 'react';
+import { VmCustom } from "../_components";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
 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 { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var TABS_SY = 'sy';
@@ -96,6 +97,7 @@ var VtxCcCpModal = function VtxCcCpModal(props) {
       date: date
     };
   }, [id, date]);
+  var tabContents = _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, {}));
   // 自定义页签可配置多个，包含custom即可
   if (tabsData !== null && tabsData !== void 0 && tabsData.length) {
     tabsData.forEach(function (ele) {
@@ -118,7 +120,7 @@ var VtxCcCpModal = function VtxCcCpModal(props) {
         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, {}))
+        contents: tabContents
       })
     }), carModal.visible && /*#__PURE__*/_jsx(VtxCarModal, _objectSpread(_objectSpread({}, carModal), {}, {
       theme: theme,

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