@vtx/modals2 6.0.0-beta.3 → 6.0.0-beta.30

package/lib/vtx-area-modal/api.js

@@ -6,7 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 import { MapIcon } from '@vtx/map-icon';
 import * as VtxMapIcon from '@vtx/map-icon';
-import { translateLocaleText } from "./../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../hooks/useTranslation.js";
 console.log(VtxMapIcon, 'VtxMapIcon');
 import { getUrlParam, getVtxToken, request } from '@vtx/utils';
 import { useRequest } from 'ahooks';

package/lib/vtx-area-modal/components/BaseInfo/Lcfx.js

@@ -4,7 +4,7 @@ import dayjs from 'dayjs';
 import { VmEmpty } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService } from "../../api";
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 var Lcfx = function Lcfx(props) {
   var _useSettings = useSettings(),

package/lib/vtx-area-modal/components/BaseInfo/ListZymx.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 /**
  * 作业明细-列表
  */

package/lib/vtx-area-modal/components/BaseInfo/index.js

@@ -29,7 +29,7 @@ import onlinePerson from "../../imgs/onlinePerson.png";
 import onlinePersonDark from "../../imgs/onlinePerson_dark.png";
 import schdulePerson from "../../imgs/schdulePerson.png";
 import schdulePersonDark from "../../imgs/schdulePerson_dark.png";
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var BaseInfo = function BaseInfo(props) {
   var id = props.id,

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

@@ -1,83 +1,18 @@
-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 { CloseOutlined } from '@ant-design/icons';
-import classNames from 'classnames';
-import { useEffect, useState } from 'react';
 import { transformRgb } from "../../_util";
 import { HistoryIcon } from "../../_util/iconSvgHtml";
-import { cancelFavorite, fetchFavorite, saveFavorite } from "../service";
-import dark_star from "./assets/dark_star.png";
-import light_star from "./assets/light_star.png";
 import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var Header = function Header(props) {
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    hasCollect = _useState2[0],
-    setHasCollect = _useState2[1];
   var title = props.title,
     _props$theme = props.theme,
     theme = _props$theme === void 0 ? 'light' : _props$theme,
     type = props.type,
-    id = props.id,
     _props$showCollect = props.showCollect,
     showCollect = _props$showCollect === void 0 ? false : _props$showCollect,
     tagList = props.tagList,
     onCancel = props.onCancel,
     openHistory = props.openHistory;
-  useEffect(function () {
-    if (id && type && showCollect) {
-      getFavorite();
-    }
-  }, [id, type, showCollect]);
-  // 获取是否收藏
-  var getFavorite = function getFavorite() {
-    fetchFavorite({
-      objectIds: id,
-      collectionTypes: type
-    }).then(function (res) {
-      if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
-        var _res$data;
-        if ((res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) > 0) {
-          setHasCollect(res.data.includes(id));
-        }
-      }
-    });
-  };
-  // 取消收藏
-  var delFavorite = function delFavorite() {
-    cancelFavorite({
-      objectIds: id,
-      collectionType: type
-    }).then(function (res) {
-      if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
-        setHasCollect(false);
-      }
-    });
-  };
-  // 添加收藏
-  var addFavorite = function addFavorite() {
-    saveFavorite({
-      objectIds: id,
-      collectionType: type
-    }).then(function (res) {
-      if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
-        setHasCollect(true);
-      }
-    });
-  };
-  // 收藏 取消收藏
-  var toggleCollect = function toggleCollect() {
-    if (hasCollect) {
-      delFavorite();
-    } else {
-      addFavorite();
-    }
-  };
   var tagColorMap = {
     blue: '#1677FF',
     green: '#0FB964',
@@ -117,7 +52,7 @@ var Header = function Header(props) {
         })]
       }), /*#__PURE__*/_jsxs("div", {
         className: 'vm-modal-header-wrap-right',
-        children: [(type === 'car' || type === 'staff') && /*#__PURE__*/_jsx(HistoryIcon, {
+        children: [(type === 'car' || type === 'staff' || type === 'qyry') && /*#__PURE__*/_jsx(HistoryIcon, {
           width: 16,
           height: 16,
           fill: theme === 'light' ? '#595959' : '#fff',
@@ -127,17 +62,7 @@ var Header = function Header(props) {
           style: {
             cursor: 'pointer'
           }
-        }), showCollect && /*#__PURE__*/_jsx("div", {
-          className: classNames('vm-modal-header-wrap-right-collect', hasCollect ? 'active' : ''),
-          onClick: function onClick() {
-            toggleCollect();
-          },
-          children: /*#__PURE__*/_jsx("img", {
-            src: theme === 'light' ? light_star : dark_star,
-            width: 16,
-            height: 16
-          })
-        }), showCollect || type === 'car' || type === 'staff' ? /*#__PURE__*/_jsx("div", {
+        }), showCollect || type === 'car' || type === 'staff' || type === 'qyry' ? /*#__PURE__*/_jsx("div", {
           className: 'vm-modal-header-wrap-right-line'
         }) : null, /*#__PURE__*/_jsx("div", {
           className: 'vm-modal-header-wrap-right-close',

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

@@ -1,6 +1,7 @@
 .vm-modal-header-container {
   box-sizing: border-box;
   width: 100%;
+  box-sizing: border-box;
   height: 116px;
   border-radius: 8px 8px 0 0;
   background: var(--modal-head-bg);

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

@@ -124,7 +124,8 @@ var Tabs = function Tabs(props) {
       children: tabs.map(function (tab, index) {
         var width = 26,
           height = 26;
-        var ComponentIcon = iconRender[tab.key] || SummaryIcon;
+        var suffixKey = "".concat(tab.key || '').split('-').slice(1).join('-');
+        var ComponentIcon = iconRender[tab.key] || iconRender[suffixKey] || SummaryIcon;
         return /*#__PURE__*/_jsxs("div", {
           onClick: function onClick() {
             onChange(tab.key);

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

@@ -16,11 +16,11 @@ import dayjs from 'dayjs';
 import { useEffect, useMemo, useState } from 'react';
 import { VmIframeModal } from "../_components";
 import VtxThemeProvider from "../_components/vm-theme-provider";
+import { translateLocaleText } from "./../hooks/useTranslation.js";
 import VmHeader from "./Header";
 import { getTenantById, getUmsConfig } from "./service";
 import "./style";
 import VmTabs from "./Tabs";
-import { translateLocaleText } from "./../hooks/useTranslation.ts";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var getTabContent = function getTabContent(contents, tabKey) {
   if (!tabKey) {

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

@@ -17,10 +17,11 @@
   left: 50%;
   top: 50%;
   transform: translate(-50%, -50%);
-  width: 1200px;
+  width: min(1200px, calc(100vw - 32px));
   height: calc(100vh * 0.9);
   max-height: 748px;
   min-height: 500px;
+  box-sizing: border-box;
   z-index: 1000;
   border-radius: 12px;
   background: var(--modal-bg-color);
@@ -52,6 +53,7 @@
     width: auto;
     min-width: 0;
     overflow: hidden;
+    box-sizing: border-box;
     background: var(--modal-content-bg);
     border-radius: 8px;
   }
@@ -61,6 +63,7 @@
     min-height: 0;
     overflow: auto;
     padding: 0 16px 16px;
+    box-sizing: border-box;
     .vm-base-modal-content {
       width: 100%;
       min-width: 0;