@vtx/modals2 6.0.0-beta.1 → 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/package.json

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