From 9bce51f651aad297ef9eb6df832bfdaf1de05d84 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 22 四月 2026 14:27:54 +0800
Subject: [PATCH] 青岛推送
---
node_modules/dayjs/esm/plugin/updateLocale/index.js | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/node_modules/dayjs/esm/plugin/updateLocale/index.js b/node_modules/dayjs/esm/plugin/updateLocale/index.js
index 1b9965c..c9b2126 100644
--- a/node_modules/dayjs/esm/plugin/updateLocale/index.js
+++ b/node_modules/dayjs/esm/plugin/updateLocale/index.js
@@ -1,3 +1,5 @@
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
export default (function (option, Dayjs, dayjs) {
dayjs.updateLocale = function (locale, customConfig) {
var localeList = dayjs.Ls;
@@ -5,7 +7,11 @@
if (!localeConfig) return;
var customConfigKeys = customConfig ? Object.keys(customConfig) : [];
customConfigKeys.forEach(function (c) {
- localeConfig[c] = customConfig[c];
+ if (localeConfig[c] && customConfig[c] && typeof localeConfig[c] === 'object' && typeof customConfig[c] === 'object' && !Array.isArray(localeConfig[c])) {
+ localeConfig[c] = _extends({}, localeConfig[c], customConfig[c]);
+ } else {
+ localeConfig[c] = customConfig[c];
+ }
});
return localeConfig; // eslint-disable-line consistent-return
};
--
Gitblit v1.9.3