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

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

@@ -9,15 +9,14 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 { Calendar, Progress } from 'antd';
 import classnames from 'classnames';
-import dayjs from "../../_util/setupDayjs";
 import useSettings from "../../_hooks/useSettings";
 import "./style";
-import zhCN from 'antd/es/calendar/locale/zh_CN.js';
 import enUS from 'antd/es/calendar/locale/en_US.js';
-import { getRuntimeLocale } from "./../../hooks/useTranslation.js";
+import zhCN from 'antd/es/calendar/locale/zh_CN.js';
 import BlockA from "../../_imgs/block_alarm.png";
 import BlockN from "../../_imgs/block_normal.png";
 import { transformRgb } from "../../_util";
+import { getRuntimeLanguage } from "./../../hooks/useTranslation.ts";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var prefix = 'vm-calendar';
 function VmCalendar(props) {
@@ -40,7 +39,7 @@ function VmCalendar(props) {
       '--height': height + 'px'
     }),
     children: /*#__PURE__*/_jsx(Calendar, _objectSpread({
-      locale: getRuntimeLocale() === 'zh-CN' ? zhCN : enUS,
+      locale: getRuntimeLanguage() === 'zh-CN' ? zhCN : enUS,
       headerRender: function headerRender() {
         return null;
       },

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

@@ -5,7 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import classnames from 'classnames';
-import { translateLocaleText } from "./../../hooks/useTranslation.js";
+import { translateLocaleText } from "./../../hooks/useTranslation.ts";
 import useSettings from "../../_hooks/useSettings";
 import no_chart from "./assets/no_chart.png";
 import no_data from "./assets/no_data.png";

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

@@ -5,6 +5,7 @@ import _ from 'lodash';
 import { Fragment } from 'react';
 import useSettings from "../../_hooks/useSettings";
 import { DownIcon, UpIcon } from "../../_util/iconSvgHtml";
+import { translateLocaleText } from "../../hooks/useTranslation.ts";
 import "./style";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export default function VmFactor(_ref) {
@@ -20,7 +21,7 @@ export default function VmFactor(_ref) {
     compare = _ref.compare,
     compareValue = _ref.compareValue,
     _ref$compareName = _ref.compareName,
-    compareName = _ref$compareName === void 0 ? '与昨日比' : _ref$compareName,
+    compareName = _ref$compareName === void 0 ? translateLocaleText("t('_components.comparedWithYesterday')") : _ref$compareName,
     _ref$compareUnit = _ref.compareUnit,
     compareUnit = _ref$compareUnit === void 0 ? '' : _ref$compareUnit,
     _ref$isError = _ref.isError,

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

@@ -13,14 +13,14 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { SearchOutlined } from '@ant-design/icons';
 import { useDebounce } from 'ahooks';
 import { DatePicker, Input, Select } from 'antd';
-import zhCN from 'antd/es/date-picker/locale/zh_CN';
 import enUS from 'antd/es/date-picker/locale/en_US';
-import { getRuntimeLocale, translateLocaleText } from "./../../hooks/useTranslation.js";
-import "../../_util/setupDayjs";
+import zhCN from 'antd/es/date-picker/locale/zh_CN';
+import { getRuntimeLanguage, translateLocaleText } from "./../../hooks/useTranslation.ts";
 import { useEffect, useState } from 'react';
 import useSettings from "../../_hooks/useSettings";
-import "./style";
+import "../../_util/setupDayjs";
 import VmEmpty from "../vm-empty";
+import "./style";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var RangePicker = DatePicker.RangePicker,
   MonthPicker = DatePicker.MonthPicker,
@@ -42,7 +42,7 @@ export var VMRangePicker = function VMRangePicker(props) {
     },
     allowClear: false
   }, props), {}, {
-    locale: getRuntimeLocale() === 'zh-CN' ? zhCN : enUS
+    locale: getRuntimeLanguage() === 'zh-CN' ? zhCN : enUS
   }));
 };
 export var VMDatePicker = function VMDatePicker(props) {
@@ -57,7 +57,7 @@ export var VMDatePicker = function VMDatePicker(props) {
     },
     allowClear: false
   }, props), {}, {
-    locale: getRuntimeLocale() === 'zh-CN' ? zhCN : enUS
+    locale: getRuntimeLanguage() === 'zh-CN' ? zhCN : enUS
   }));
 };
 export var VMMonthPicker = function VMMonthPicker(props) {
@@ -72,7 +72,7 @@ export var VMMonthPicker = function VMMonthPicker(props) {
     },
     allowClear: false
   }, props), {}, {
-    locale: getRuntimeLocale() === 'zh-CN' ? zhCN : enUS
+    locale: getRuntimeLanguage() === 'zh-CN' ? zhCN : enUS
   }));
 };
 export var VMYearPicker = function VMYearPicker(props) {
@@ -87,7 +87,7 @@ export var VMYearPicker = function VMYearPicker(props) {
     },
     allowClear: false
   }, props), {}, {
-    locale: getRuntimeLocale() === 'zh-CN' ? zhCN : enUS
+    locale: getRuntimeLanguage() === 'zh-CN' ? zhCN : enUS
   }));
 };
 export var VMSelect = function VMSelect(props) {

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

@@ -12,6 +12,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 { VtxImage, VtxUpload } from '@vtx/components';
 import { isNumber } from 'lodash';
+import { translateLocaleText } from "../../hooks/useTranslation.ts";
 import "./style";
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function InfoCollection(props) {
@@ -57,7 +58,7 @@ function InfoCollection(props) {
             className: "ellipsis info-label-b-text",
             children: [item.label, " \uFF1A"]
           })
-        }), item.label === '地址' || item.isAddress ? /*#__PURE__*/_jsx("div", {
+        }), item.label === translateLocaleText("t('vtxrestaurantmodal.address')") || item.isAddress ? /*#__PURE__*/_jsx("div", {
           className: "value",
           style: style,
           title: item.value || '',
@@ -123,7 +124,7 @@ var ValueDom = function ValueDom(componentType, value, isTitle) {
       node = lngLats;
       break;
     case 'SWITCH':
-      node = value || (value ? '是' : '否');
+      node = value || (value ? translateLocaleText("t('common.yes')") : translateLocaleText("t('common.no')"));
       break;
     case 'GARBAGE_CAN':
       var arr = [];

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

@@ -19,7 +19,7 @@ import proj4 from 'proj4';
 import { useEffect, useRef, useState } from 'react';
 import useSettings from "../../_hooks/useSettings";
 import "./index.less";
-import { translateLocaleText } from "./../../hooks/useTranslation.js";
+import { translateLocaleText } from "./../../hooks/useTranslation.ts";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function VmOlMap(_ref) {
   var _mapInfo$olProps, _points$data2, _polygons$data2, _newPoints$data3;

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

@@ -9,6 +9,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 { Progress } from 'antd';
 import useSettings from "../../_hooks/useSettings";
+import { translateLocaleText } from "../../hooks/useTranslation.ts";
 import "./style";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export function Line(props) {
@@ -52,7 +53,7 @@ var Circle = function Circle(props) {
     _props$width2 = props.width,
     width = _props$width2 === void 0 ? 120 : _props$width2,
     _props$name = props.name,
-    name = _props$name === void 0 ? '有效作业率' : _props$name,
+    name = _props$name === void 0 ? translateLocaleText("t('_components.effectiveOperationRate')") : _props$name,
     _props$unit = props.unit,
     unit = _props$unit === void 0 ? '%' : _props$unit,
     info = props.info,

package/lib/_components/vm-repair-maintain/RmInfoSummary.js

@@ -7,7 +7,7 @@ import count from "./imgs/count.png";
 import VmFactor from "../vm-factor";
 import amountLight from "./imgs/amount_light.png";
 import countLight from "./imgs/count_light.png";
-import { translateLocaleText } from "./../../hooks/useTranslation.js";
+import { translateLocaleText } from "./../../hooks/useTranslation.ts";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var RmInfoSummary = function RmInfoSummary(props) {
   var data = props.data;

package/lib/_components/vm-repair-maintain/RmMonthTrend.js

@@ -4,7 +4,7 @@ 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); }
-import { translateLocaleText } from "./../../hooks/useTranslation.js";
+import { translateLocaleText } from "./../../hooks/useTranslation.ts";
 /**
  * 月度趋势分析
  */

package/lib/_components/vm-repair-maintain/RmRecord.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.js";
+import { translateLocaleText } from "./../../hooks/useTranslation.ts";
 /**
  * 维保记录
  */

package/lib/_components/vm-repair-maintain/RmType.js

@@ -1,4 +1,4 @@
-import { translateLocaleText } from "./../../hooks/useTranslation.js";
+import { translateLocaleText } from "./../../hooks/useTranslation.ts";
 /**
  * 维保类型分析
  */

package/lib/_components/vm-repair-maintain/index.js

@@ -1,4 +1,4 @@
-import { translateLocaleText } from "./../../hooks/useTranslation.js";
+import { translateLocaleText } from "./../../hooks/useTranslation.ts";
 /**
  * 通用-维保信息
  */

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

@@ -21,12 +21,12 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { DownOutlined, ExportOutlined } from '@ant-design/icons';
 import { useMemoizedFn, useSetState } from 'ahooks';
 import { Button, ConfigProvider, Dropdown, Table } from 'antd';
-import zhCN from 'antd/es/locale/zh_CN';
 import enUS from 'antd/es/locale/en_US';
+import zhCN from 'antd/es/locale/zh_CN';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import useSettings from "../../_hooks/useSettings";
 import "./style";
-import { getRuntimeLocale, translateLocaleText } from "./../../hooks/useTranslation.js";
+import { getRuntimeLanguage, translateLocaleText } from "./../../hooks/useTranslation.ts";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var VMTable = function VMTable(props) {
   var _props$rowKey = props.rowKey,
@@ -136,7 +136,7 @@ var VMTable = function VMTable(props) {
     }
   }, [JSON.stringify(dataSource), JSON.stringify(currentLayer)]);
   return /*#__PURE__*/_jsx(ConfigProvider, {
-    locale: getRuntimeLocale() === 'zh-CN' ? zhCN : enUS,
+    locale: getRuntimeLanguage() === 'zh-CN' ? zhCN : enUS,
     children: /*#__PURE__*/_jsx(Table, _objectSpread({
       className: "vm-table ".concat(isDark ? 'dark' : ''),
       ref: tableRef,

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

@@ -5,13 +5,14 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import useSettings from "../../_hooks/useSettings";
+import { translateLocaleText } from "../../hooks/useTranslation.ts";
 import "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function VmWrapper(props) {
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var _props$title = props.title,
-    title = _props$title === void 0 ? '基本信息' : _props$title,
+    title = _props$title === void 0 ? translateLocaleText("t('_components.basicInformation')") : _props$title,
     _props$type = props.type,
     type = _props$type === void 0 ? 'blue' : _props$type,
     _props$style = props.style,

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

@@ -1,13 +1,14 @@
 import classnames from 'classnames';
 import useSettings from "../../_hooks/useSettings";
 import { ClockIcon } from "../../_util/iconSvgHtml";
+import { translateLocaleText } from "../../hooks/useTranslation.ts";
 import "./style";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function VmWrapper(props) {
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var _props$title = props.title,
-    title = _props$title === void 0 ? '基本信息' : _props$title,
+    title = _props$title === void 0 ? translateLocaleText("t('_components.basicInformation')") : _props$title,
     _props$time = props.time,
     time = _props$time === void 0 ? '' : _props$time,
     _props$border = props.border,

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

@@ -24,7 +24,7 @@ import { VmTabs } from "../vm-tabs";
 import HistoryGrid from "./HistoryGrid";
 import "./index.less";
 import RealtimeGrid from "./RealtimeGrid";
-import { translateLocaleText } from "./../../hooks/useTranslation.js";
+import { translateLocaleText } from "./../../hooks/useTranslation.ts";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var VmVideo = function VmVideo(_ref) {
   var _ref$channels = _ref.channels,

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

@@ -18,7 +18,7 @@ import useSettings from "../../_hooks/useSettings";
 import { ChartIcon, DateIcon, ListIcon } from "../../_util/iconSvgHtml";
 import VmFilter from "../vm-filter";
 import "./style";
-import { translateLocaleText } from "./../../hooks/useTranslation.js";
+import { translateLocaleText } from "./../../hooks/useTranslation.ts";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var VMDatePicker = VmFilter.VMDatePicker,
   VMMonthPicker = VmFilter.VMMonthPicker,
@@ -90,7 +90,7 @@ export default function VmWrapper(props) {
       changeList.push({
         key: 'chart',
         icon: ListIcon,
-        name: '图表'
+        name: translateLocaleText("t('_components.chart')")
       });
     }
     if (showList) {

package/lib/_components/vm-wrapper/style/index.less

@@ -4,7 +4,7 @@
   --wborder-color: #f1f0f0;
   --wfilter-bg: #f5f5f5;
   --wtype-bg: #fff;
-  --tab-active-color: #1677FF;
+  --tab-active-color: #1677ff;
 
   &.dark {
     --wbg-color: rgba(0, 155, 233, 10%);
@@ -12,7 +12,7 @@
     --wborder-color: #1064a7;
     --wfilter-bg: #0b588e;
     --wtype-bg: #0168b0;
-    --tab-active-color: #009DFF;
+    --tab-active-color: #009dff;
   }
 
   &-tabs-wrap {
@@ -55,6 +55,8 @@
   &-head {
     padding: 11px 16px;
     border-bottom: 1px solid var(--wborder-color);
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
   }
 
   .extra {

package/lib/_util/http.js

@@ -15,6 +15,7 @@ import { message } from 'antd';
 import isObject from 'lodash/isObject';
 import pickBy from 'lodash/pickBy';
 import qs from 'qs';
+import { translateLocaleText } from "../hooks/useTranslation.ts";
 var SECOND = 30;
 var MILL_SECOND = 1000;
 var baseUrlPrefix = process.env.PREFIX ? "/".concat(process.env.PREFIX) : '';
@@ -233,7 +234,7 @@ var Http = /*#__PURE__*/function () {
           if (((_config = config) === null || _config === void 0 || (_config = _config.url) === null || _config === void 0 ? void 0 : _config.indexOf('zdjg/jg/data/getJgDataStatistics')) > -1 || ((_config2 = config) === null || _config2 === void 0 || (_config2 = _config2.url) === null || _config2 === void 0 ? void 0 : _config2.indexOf('/cloud/zd/base/api/cp/commonFactory')) > -1) {
             return;
           }
-          message.error(data.msg || '请求信息错误');
+          message.error(data.msg || translateLocaleText("t('common.requestInfoError')"));
           return;
         }
       }
@@ -257,18 +258,18 @@ var Http = /*#__PURE__*/function () {
         var msg;
         switch (error.response.status) {
           case 404:
-            msg = '接口请求不存在！错误码【404】。';
+            msg = translateLocaleText("t('common.apiRequestNotFound404')");
             break;
           case 500:
-            msg = '服务端应用接口异常！错误码【500】。';
+            msg = translateLocaleText("t('common.serverApiException500')");
             break;
           default:
-            msg = '请求错误，请检查或刷新重试！';
+            msg = translateLocaleText("t('common.requestErrorRetry')");
             break;
         }
         message.error(msg);
       } else {
-        message.error('服务不可用');
+        message.error(translateLocaleText("t('common.serviceUnavailable')"));
       }
     }
 

package/lib/_util/index.js

@@ -1,10 +1,11 @@
+import { translateLocaleText } from "../hooks/useTranslation.ts";
 // 秒转化为时间的格式化字符串
 export function secondToFormatTime(times) {
   if (times <= 0) return '--';
   var timeStr = '';
   var remain = times;
   var days = Math.floor(remain / (24 * 60 * 60));
-  if (days) timeStr += "".concat(days, "\u5929");
+  if (days) timeStr += "".concat(days).concat(translateLocaleText("t('common.unit.day')"));
   remain = remain % (24 * 60 * 60);
   var hours = Math.floor(remain / (60 * 60));
   if (hours) timeStr += "".concat(hours, "h");
@@ -42,7 +43,7 @@ export function secondToFormatTimeArray(times) {
   var days = Math.floor(remain / (24 * 60 * 60));
   if (days) timeList.push({
     value: days,
-    unit: '天'
+    unit: translateLocaleText("t('common.unit.day')")
   });
   remain = remain % (24 * 60 * 60);
   var hours = Math.floor(remain / (60 * 60));
@@ -69,7 +70,7 @@ export var getFieldRender = function getFieldRender(fields, info) {
   fields.forEach(function (item) {
     if ((info !== null && info !== void 0 && info[item.showKey] || item.showKey === 'tenderName') && !['address', 'divisionName', 'accUnitName', 'manageUnitName', 'description', 'panoramaLinkAddress'].includes(item.showKey)) {
       list.push({
-        label: item.name,
+        label: item.showName || item.name,
         key: item.showKey,
         value: info === null || info === void 0 ? void 0 : info[item.showKey],
         componentType: item.component.type
@@ -80,7 +81,7 @@ export var getFieldRender = function getFieldRender(fields, info) {
     var _info$dataJson;
     if (['address', 'divisionName', 'accUnitName', 'manageUnitName', 'description', 'panoramaLinkAddress'].includes(item.showKey)) {
       list.push({
-        label: item.name,
+        label: item.showName || item.name,
         key: item.showKey,
         value: info === null || info === void 0 ? void 0 : info[item.showKey],
         componentType: item.component.type
@@ -88,7 +89,7 @@ export var getFieldRender = function getFieldRender(fields, info) {
     } else if (info !== null && info !== void 0 && (_info$dataJson = info.dataJson) !== null && _info$dataJson !== void 0 && _info$dataJson[item.showKey]) {
       var _info$dataJson2;
       list.push({
-        label: item.name,
+        label: item.showName || item.name,
         key: item.showKey,
         value: info === null || info === void 0 || (_info$dataJson2 = info.dataJson) === null || _info$dataJson2 === void 0 ? void 0 : _info$dataJson2[item.showKey],
         componentType: item.component.type