wlwy-package 3.1.59 → 3.1.60

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,7 +6,7 @@ import { message, App, theme, Tooltip, Switch, ConfigProvider, Spin, Modal, Spac
6
6
  import zhCn from "ant-design-vue/es/locale/zh_CN.js";
7
7
  import enUs from "ant-design-vue/es/locale/en_US.js";
8
8
  import { defineStore, createPinia, storeToRefs } from "pinia";
9
- import XEUtils, { cookie, omit, pick, clone, debounce, toTreeArray, findTree, objectEach, isEmpty, get, merge as merge$1 } from "xe-utils";
9
+ import XEUtils, { cookie, merge as merge$1, omit, pick, clone, debounce, toTreeArray, findTree, objectEach, isEmpty, get } from "xe-utils";
10
10
  import { RouterLink, useRouter } from "vue-router";
11
11
  import * as Icons from "@ant-design/icons-vue";
12
12
  import * as VxeUITable from "vxe-table";
@@ -8497,10 +8497,8 @@ const loadLocaleMessages = (fn) => {
8497
8497
  script.src = src;
8498
8498
  document.head.appendChild(script);
8499
8499
  script.onload = () => {
8500
- const message2 = {
8501
- ...extraMessages,
8502
- ...window.language
8503
- };
8500
+ const message2 = merge$1(extraMessages, window.language);
8501
+ console.log("message", message2);
8504
8502
  i18n.global.setLocaleMessage(unref(locale), message2);
8505
8503
  resolve(i18n);
8506
8504
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "wlwy-package",
3
- "version": "3.1.59",
3
+ "version": "3.1.60",
4
4
  "private": false,
5
5
  "type": "module",
6
6
  "main": "dist/wlwy-package.es.js",