@vtx/modals2 6.0.0-beta.0 → 6.0.0-beta.2

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.js";
 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-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.js";
 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-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.js";
 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/hooks/useTranslation.js

@@ -10,7 +10,6 @@ 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 { useIntl } from 'dumi';
 import zhCN from "../locales/zh-CN.json";
 import enUS from "../locales/en.json";
 var keyFieldMap = {
@@ -57,9 +56,9 @@ export function getTranslationKey(text) {
     return undefined;
   }
   var match = text.match(/^t\('([^']+)'\)$/);
-  return match && match[1];
+  return match === null || match === void 0 ? void 0 : match[1];
 }
-function getHashLocale() {
+function getHashLanguage() {
   if (typeof window === 'undefined') {
     return undefined;
   }
@@ -70,13 +69,13 @@ function getHashLocale() {
   }
   return new URLSearchParams(hash.slice(queryIndex + 1)).get('vtxLanguage') || undefined;
 }
-export function getRuntimeLocale() {
-  var _window$localStorage, _window$localStorage2;
-  var searchLocale = typeof window !== 'undefined' ? new URLSearchParams(window.location.search).get('vtxLanguage') : undefined;
-  var hashLocale = getHashLocale();
-  var storedLocale = typeof window !== 'undefined' ? ((_window$localStorage = window.localStorage) === null || _window$localStorage === void 0 ? void 0 : _window$localStorage.getItem('vtxLanguage')) || ((_window$localStorage2 = window.localStorage) === null || _window$localStorage2 === void 0 ? void 0 : _window$localStorage2.getItem('vtxLanguage')) : undefined;
-  var locale = searchLocale || hashLocale || storedLocale;
-  return locale === 'en-US' || locale === 'en_US' || locale === 'en-us' ? 'en-US' : 'zh-CN';
+export function getRuntimeLanguage() {
+  var _window$localStorage;
+  var searchLanguage = typeof window !== 'undefined' ? new URLSearchParams(window.location.search).get('vtxLanguage') : undefined;
+  var hashLanguage = getHashLanguage();
+  var storedLanguage = typeof window !== 'undefined' ? (_window$localStorage = window.localStorage) === null || _window$localStorage === void 0 ? void 0 : _window$localStorage.getItem('vtxLanguage') : undefined;
+  var language = searchLanguage || hashLanguage || storedLanguage;
+  return language === 'en-US' || language === 'en_US' || language === 'en-us' || language === 'en' ? 'en-US' : 'zh-CN';
 }
 function formatMessage(template, values) {
   if (!values) {
@@ -98,20 +97,20 @@ export function translateLocaleText(text, values) {
   if (!key) {
     return text;
   }
-  var locale = getRuntimeLocale();
-  var localeData = locale === 'en-US' ? enUS : zhCN;
+  var language = getRuntimeLanguage();
+  var localeData = language === 'en-US' ? enUS : zhCN;
   return formatMessage(localeData[key] || zhCN[key] || key, values);
 }
 function applyKeyFields(source, t) {
   var next = _objectSpread({}, source);
-  Object.entries(keyFieldMap).forEach(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-      keyField = _ref2[0],
-      targetField = _ref2[1];
+  for (var _i = 0, _Object$entries = Object.entries(keyFieldMap); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+      keyField = _Object$entries$_i[0],
+      targetField = _Object$entries$_i[1];
     if (typeof source[keyField] === 'string' && source[keyField]) {
       next[targetField] = translationByKey(source[keyField], t);
     }
-  });
+  }
   return next;
 }
 function _translationConst(lists, t) {
@@ -193,19 +192,18 @@ function _translationConst(lists, t) {
   return loopOptions(lists);
 }
 export { _translationConst as translationConst };
-export function getT(intl) {
+export function getT() {
   var t = function t(id, values) {
-    return intl.formatMessage({
-      id: id
-    }, values);
+    var language = getRuntimeLanguage();
+    var localeData = language === 'en-US' ? enUS : zhCN;
+    return formatMessage(localeData[id] || zhCN[id] || id, values);
   };
   return {
     t: t
   };
 }
 export function useTranslation() {
-  var intl = useIntl();
-  var _getT = getT(intl),
+  var _getT = getT(),
     t = _getT.t;
   return {
     t: t,

package/package.json

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