@utogether/udp-core 2.0.0-beta.25 → 2.0.0-beta.26

package/dist/{useDataThemeChange-BCy8JBG7.js → useDataThemeChange-DJ4K3VGp.js}

@@ -1,4 +1,4 @@
-import { C as e, M as t, P as n, a as r, b as i, c as a, i as o, l as s, w as c, x as l } from "./router-CeluSGiD.js";
+import { A as e, C as t, D as n, E as r, O as i, i as a, m as o, p as s, r as c, w as l } from "./system-Cm3lyBas.js";
 import { c as u, o as d, r as f } from "./api-BFNxcxSN.js";
 import { c as p, r as m, t as h } from "./contant-Q77dU_V3.js";
 import { computed as g, ref as _ } from "vue";
@@ -12,9 +12,9 @@ v(k, {
 	i18n: l
 }), P();
 var j = {
-	i18n: (e, t) => i().global.t(e, t),
+	i18n: (e, n) => t().global.t(e, n),
 	translate(e) {
-		return e && ["message.", "el."].findIndex((t) => e.includes(t)) !== -1 ? i().global.t.call(i().global.locale, e) : e;
+		return e && ["message.", "el."].findIndex((t) => e.includes(t)) !== -1 ? t().global.t.call(t().global.locale, e) : e;
 	}
 };
 function M(e = {}) {
@@ -53,25 +53,25 @@ function P() {
 //#endregion
 //#region src/layout/hooks/useLayout.ts
 function F() {
-	let { $storage: e, $config: n } = C();
+	let { $storage: e, $config: t } = C();
 	return {
 		layout: g(() => e?.layout.layout),
 		layoutTheme: g(() => e?.layout),
 		initStorage: () => {
-			a().multiTagsCache && (!e.tags || e.tags.length === 0) && (e.tags = t), e?.locale || (O().locale.value = n?.Locale ?? "zh"), e && !e?.layout && (e.layout = {
-				layout: n?.Layout ?? "vertical",
-				theme: n?.Theme ?? "default",
-				darkMode: n?.DarkMode ?? !1,
-				sidebarStatus: n?.SidebarStatus ?? !0,
-				epThemeColor: n?.EpThemeColor ?? "#409EFF",
-				overallStyle: n?.OverallStyle ?? "light"
+			r().multiTagsCache && (!e.tags || e.tags.length === 0) && (e.tags = i), e?.locale || (O().locale.value = t?.Locale ?? "zh"), e && !e?.layout && (e.layout = {
+				layout: t?.Layout ?? "vertical",
+				theme: t?.Theme ?? "default",
+				darkMode: t?.DarkMode ?? !1,
+				sidebarStatus: t?.SidebarStatus ?? !0,
+				epThemeColor: t?.EpThemeColor ?? "#409EFF",
+				overallStyle: t?.OverallStyle ?? "light"
 			}), e && !e?.configure && (e.configure = {
-				grey: n?.Grey ?? !1,
-				weak: n?.Weak ?? !1,
-				hideTabs: n?.HideTabs ?? !1,
-				showLogo: n?.ShowLogo ?? !0,
-				showModel: n?.ShowModel ?? "smart",
-				multiTagsCache: n?.MultiTagsCache ?? !1
+				grey: t?.Grey ?? !1,
+				weak: t?.Weak ?? !1,
+				hideTabs: t?.HideTabs ?? !1,
+				showLogo: t?.ShowLogo ?? !0,
+				showModel: t?.ShowModel ?? "smart",
+				multiTagsCache: t?.MultiTagsCache ?? !1
 			});
 		}
 	};
@@ -113,7 +113,7 @@ var I = D("udp-app", {
 	}
 });
 function L() {
-	return I(n);
+	return I(e);
 }
 //#endregion
 //#region src/store/modules/epTheme.ts
@@ -136,12 +136,12 @@ var R = D("udp-epTheme", {
 	} }
 });
 function z() {
-	return R(n);
+	return R(e);
 }
 //#endregion
 //#region src/layout/hooks/useDataThemeChange.ts
 function B() {
-	let { layoutTheme: n, layout: i } = F(), a = _([
+	let { layoutTheme: e, layout: t } = F(), r = _([
 		{
 			color: "#1b2a47",
 			themeColor: "default"
@@ -183,18 +183,18 @@ function B() {
 		let r = n || document.body, { className: i } = r;
 		i = i.replace(t, "").trim(), r.className = e ? `${i} ${t}` : i;
 	}
-	function b(e = d().Theme ?? "default") {
-		n.value.theme = e, document.documentElement.setAttribute("data-theme", e), document.documentElement.className = "", document.documentElement.classList.add(`layout-theme-${e}`), l.layout = {
-			layout: i.value,
-			theme: e,
+	function b(n = d().Theme ?? "default") {
+		e.value.theme = n, document.documentElement.setAttribute("data-theme", n), document.documentElement.className = "", document.documentElement.classList.add(`layout-theme-${n}`), l.layout = {
+			layout: t.value,
+			theme: n,
 			darkMode: u.value,
 			sidebarStatus: l.layout?.sidebarStatus,
 			epThemeColor: l.layout?.epThemeColor,
 			overallStyle: f.value
-		}, T(e === "default" || e === "light" ? d().EpThemeColor || "#409EFF" : a.value.find((t) => t.themeColor === e).color);
+		}, T(n === "default" || n === "light" ? d().EpThemeColor || "#409EFF" : r.value.find((e) => e.themeColor === n).color);
 	}
-	function w(t, n, r) {
-		document.documentElement.style.setProperty(`--el-color-primary-${t}-${n}`, u.value ? e(r, n / 10) : c(r, n / 10));
+	function w(e, t, n) {
+		document.documentElement.style.setProperty(`--el-color-primary-${e}-${t}`, u.value ? c(n, t / 10) : a(n, t / 10));
 	}
 	let T = (e) => {
 		z().setEpThemeColor(e), document.documentElement.style.setProperty("--el-color-primary", e);
@@ -206,15 +206,15 @@ function B() {
 	}
 	function D() {
 		y.remove(h), y.remove(p), y.remove(m), x.clear(), S.clear();
-		let { Grey: e, Weak: n, MultiTagsCache: i, EpThemeColor: a, Layout: c } = d();
-		L().setLayout(c), T(a), s().multiTagsCacheChange(i), v(e, "html-grey", document.querySelector("html")), v(n, "html-weakness", document.querySelector("html")), r.push("/login"), s().handleTags("equal", [...t]), o();
+		let { Grey: e, Weak: t, MultiTagsCache: r, EpThemeColor: a, Layout: c } = d();
+		L().setLayout(c), T(a), n().multiTagsCacheChange(r), v(e, "html-grey", document.querySelector("html")), v(t, "html-weakness", document.querySelector("html")), o.push("/login"), n().handleTags("equal", [...i]), s();
 	}
 	return {
 		body: g,
 		overallStyle: f,
 		dataTheme: u,
-		layoutTheme: n,
-		themeColors: a,
+		layoutTheme: e,
+		themeColors: r,
 		onReset: D,
 		toggleClass: v,
 		dataThemeChange: E,

package/dist/{useNav-DY8FkltH.js → useNav-BhOJIdrJ.js}

@@ -1,7 +1,7 @@
-import { E as e, M as t, O as n, a as r, i, l as a, n as o, u as s, y as c } from "./router-CeluSGiD.js";
+import { D as e, O as t, c as n, d as r, m as i, n as a, o, p as s, t as c } from "./system-Cm3lyBas.js";
 import { s as l } from "./api-BFNxcxSN.js";
 import { c as u, r as d, t as f } from "./contant-Q77dU_V3.js";
-import { n as p, r as m } from "./useDataThemeChange-BCy8JBG7.js";
+import { n as p, r as m } from "./useDataThemeChange-DJ4K3VGp.js";
 import { t as h } from "./mitt-CQgI7DYU.js";
 import { computed as g } from "vue";
 import { cookies as _, storageLocal as v, useGlobal as y } from "@utogether/utils";
@@ -10,7 +10,7 @@ import { useRouter as x } from "vue-router";
 //#region src/layout/hooks/useNav.ts
 var S = "当前路由配置不正确，请检查配置";
 function C() {
-	let C = m(), w = x().options.routes, { wholeMenus: T } = b(s()), E = g(() => ({
+	let C = m(), w = x().options.routes, { wholeMenus: T } = b(a()), E = g(() => ({
 		width: "100%",
 		display: "flex",
 		alignItems: "center",
@@ -24,13 +24,13 @@ function C() {
 		document.title = l().MODE === "staging" ? `${F.value}•测试` : F.value;
 	}
 	function L() {
-		n(), a().handleTags("equal", [...t]), _.remove(f), _.remove(u), _.remove(d), s().setWholeMenus([]), a().handleTags("splice", "", {
+		n(), e().handleTags("equal", [...t]), _.remove(f), _.remove(u), _.remove(d), a().setWholeMenus([]), e().handleTags("splice", "", {
 			startIndex: 1,
-			length: a()?.multiTags?.length
-		}), s().clearAllCachePage(), i(), e(), r.push("/login");
+			length: e()?.multiTags?.length
+		}), a().clearAllCachePage(), s(), o(), i.push("/login");
 	}
 	function R() {
-		r.push("/welcome");
+		i.push("/welcome");
 	}
 	function z() {
 		h.emit("openPanel");
@@ -50,7 +50,7 @@ function C() {
 		T.value.length === 0 || W(e) || h.emit("changLayoutRoute", e);
 	}
 	function W(e) {
-		return o.includes(e);
+		return r.includes(e);
 	}
 	function G() {
 		let e = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@utogether/udp-core",
   "private": false,
-  "version": "2.0.0-beta.25",
+  "version": "2.0.0-beta.26",
   "description": "",
   "type": "module",
   "main1": "index.ts",

package/src/App.vue

@@ -21,6 +21,8 @@ import { storageLocal } from '@utogether/utils';
 import { getEnv } from './config';
 import { kSYSCONFIG } from './contant';
 import { getServiceApi, getBaseURL } from './api';
+import { initDict } from './api/user';
+import { useSystemStoreHook } from './store/modules/system';
 
 export default defineComponent({
   name: 'app',
@@ -49,6 +51,9 @@ export default defineComponent({
         this.pollingVersion(config['title']);
       });
   },
+  mounted() {
+    initDict().then(res => useSystemStoreHook().setDict(res));
+  },
   methods: {
     // / 版本实时更新检测，只作用于线上环境
     pollingVersion(title) {

package/src/components/udp/grid/index.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:33:37
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2026-03-30 11:35:03
+ * @LastEditTime: 2026-04-16 10:09:53
  * @Description: file content
 -->
 <template>
@@ -78,7 +78,6 @@ const cacheColumns = {};
 // console.log(attrs);
 const instance = getCurrentInstance()!;
 const hasAuthority = instance.appContext.config.globalProperties.$hasAuthority;
-const debugModel = instance.appContext.config.globalProperties.$debugModel;
 
 const viewCode = instance.parent.type.name;
 const $mode = instance.appContext.config.globalProperties.$mode;
@@ -102,7 +101,7 @@ const { t } = useI18n();
 const xgrid = ref(null);
 const showModal = ref(false);
 
-const serviceApi = gerServiceURL();
+const serviceApi = instance.appContext.config.globalProperties.$serviceApi;
 
 const favorite = {
   icon: 'vxe-icon-setting',
@@ -486,14 +485,13 @@ nextTick(() => {
     columnDrop();
   }, 500);
 });
-function gerServiceURL() {
-  debugger;
-  const whiteList = ['/uums/', '/upfm/', '/urpt/', '/usch/'];
-  if (debugModel && props?.url && !whiteList.some(str => props.url.includes(str))) {
-    return instance.appContext.config.globalProperties.$debuggerApi;
-  }
-  return instance.appContext.config.globalProperties.$serviceApi;
-}
+// function gerServiceURL() {
+//   const whiteList = ['/uums/', '/upfm/', '/urpt/', '/usch/'];
+//   if (debugModel && props?.url && !whiteList.some(str => props.url.includes(str))) {
+//     return instance.appContext.config.globalProperties.$debuggerApi;
+//   }
+//   return instance.appContext.config.globalProperties.$serviceApi;
+// }
 /**
  * @description Vue实例卸载
  */