@epxing/core 5.3.0-beta.2 → 5.3.0-beta.4

package/dist/src/router/config.js

@@ -1,4 +1,5 @@
 import '../../style.css';
+import { restoreChatWikiRoute } from "@epxing/utils/src/wiki-path";
 import { runtimeRouteComponent, getRuntimeService, runtimeStore } from "../runtime-services.js";
 import { isEmpty } from "lodash-es";
 import util from "../runtime-utils/util.js";
@@ -10,7 +11,6 @@ import { setElementPlusLocale } from "../plugins/element-plus.js";
 import { MENU_ROUTE_ALIAS, roleStorage, effectiveRouteName } from "../menu-route.js";
 const Page = runtimeRouteComponent("Page");
 const Login = runtimeRouteComponent("Login");
-const QyWechat = runtimeRouteComponent("QyWechat");
 const App = runtimeRouteComponent("App");
 const WikiSitePage = runtimeRouteComponent("WikiSitePage");
 const Module = runtimeRouteComponent("Module");
@@ -239,9 +239,11 @@ const routes = [
     props: (route) => ({ query: route.query })
   },
   {
-    path: "/system/:client/:system/:role?",
+    // 32 位菜单 ID 与旧角色编号消歧；旧的 /system/.../SYSTEM 地址仍可使用。
+    path: "/system/:client/:system/:menuKey([0-9A-Fa-f]{32})?/:role?",
     name: "system",
     component: App,
+    meta: { refresh: false },
     props: (route) => ({ query: route.query })
   },
   {
@@ -317,11 +319,6 @@ const routes = [
     component: App,
     props: (route) => ({ query: route.query })
   },
-  {
-    path: "/qywechat",
-    name: "qywechat",
-    component: QyWechat
-  },
   {
     // 旧形态 /m/:menuKey 链接兼容:重定向到无 /m/ 的新形态
     path: "/app/:client/:system/:app/m/:menuKey",
@@ -344,6 +341,8 @@ const routes = [
   }
 ];
 const beforeEach = async (to, from, next) => {
+  const restoredWikiRoute = restoreChatWikiRoute(to);
+  if (restoredWikiRoute) return next(restoredWikiRoute);
   try {
     subscribeToLogout();
     return await runBeforeEach(to, from, next);
@@ -366,7 +365,7 @@ const runBeforeEach = async (to, from, rawNext) => {
     }
     return rawNext(location);
   };
-  const isMenuRoute = !!MENU_ROUTE_ALIAS[to.name];
+  const isMenuRoute = !!MENU_ROUTE_ALIAS[to.name] || to.name === "system" && !!to.params.menuKey;
   if (isMenuRoute) {
     const storedRole = roleStorage.get(to.params.client, to.params.system);
     to = { ...to, name: effectiveRouteName(to.name), params: { ...to.params, role: to.params.role || storedRole || void 0 } };

package/dist/src/runtime-services.js

@@ -34,7 +34,7 @@ function registerRouteComponents(components) {
 function runtimeRouteComponent(name) {
   return async () => {
     const component = routeComponents.get(name);
-    if (!component) throw new Error(`[epx/core] 路由组件 ${name} 尚未注册，请安装 component/business 或传入 routeComponents`);
+    if (!component) throw new Error(`[epx/core] 路由组件 ${name} 尚未注册，请安装提供该页面的 components/business 包或传入 routeComponents`);
     return component;
   };
 }

package/dist/src/runtime-utils/meta.js

@@ -1,5 +1,6 @@
 import '../../style.css';
 import util from "./util.js";
+const appliedLanguage = /* @__PURE__ */ new WeakMap();
 class Meta {
   constructor(props = {}) {
     var me = this;
@@ -56,6 +57,8 @@ class Meta {
   }
   getAttributes() {
     const currentLanguage = util.getCurrentLanguage();
+    if (appliedLanguage.get(this) === currentLanguage) return this.attributes;
+    appliedLanguage.set(this, currentLanguage);
     for (const key in this.attributes) {
       const item = this.attributes[key];
       for (const key2 in item.languageMap) {

package/dist/src/runtime-utils/pdf.viewer.js

@@ -1,6 +1,11 @@
 import '../../style.css';
 import util from "./util.js";
 const DEFAULT_CACHE_SIZE = 10;
+const MAX_CANVAS_PIXELS = 16777216;
+function releaseCanvas(canvas) {
+  canvas.width = 0;
+  canvas.height = 0;
+}
 function binarySearchFirstItem(items, condition) {
   var minIndex = 0;
   var maxIndex = items.length - 1;
@@ -167,18 +172,18 @@ class PdfViewer {
     }
     this.scrollState = null;
     for (const item of this.pages) {
-      if (item.div && item.div.parentNode) item.div.parentNode.removeChild(item.div);
+      if (!item.div) continue;
+      for (const canvas of item.div.querySelectorAll("canvas")) releaseCanvas(canvas);
+      if (item.div.parentNode) item.div.parentNode.removeChild(item.div);
     }
     this.pages = [];
     this.loadViews = [];
     this.searchTextArr = [];
-    if (this.pdfDocument) {
-      try {
-        this.pdfDocument.destroy();
-      } catch (e) {
-      }
-      this.pdfDocument = null;
+    if (this.loadingTask) {
+      this.loadingTask.destroy();
+      this.loadingTask = null;
     }
+    this.pdfDocument = null;
   }
   async searchTextInPDF(searchText) {
     const numPages = this.pdfDocument.numPages;
@@ -296,12 +301,16 @@ class PdfViewer {
       pageRotate: 0
     };
     await this.loadPdf();
-    return this.pdfJs.getDocument({
+    if (this.destroyed) return;
+    this.loadingTask = this.pdfJs.getDocument({
       url: this.pdfConfig.url,
       cMapUrl: this.pdfConfig.cMapUrl,
       cMapPacked: this.pdfConfig.cMapPacked
-    }).promise.then((pdfDocument) => {
+    });
+    return this.loadingTask.promise.then((pdfDocument) => {
       this.load(pdfDocument);
+    }).catch((err) => {
+      if (!this.destroyed) throw err;
     });
   }
   load(pdfDocument) {
@@ -424,6 +433,7 @@ class PdfViewer {
       if (node.className.includes("pdf-viewer-loading")) {
         node.style.display = "block";
       } else {
+        if (node.tagName === "CANVAS") releaseCanvas(node);
         div.removeChild(node);
       }
     }
@@ -435,18 +445,18 @@ class PdfViewer {
       if (div.getAttribute("data-loaded")) continue;
       div.setAttribute("data-loaded", true);
       this.pdfDocument.getPage(item.view.id).then((page) => {
+        if (this.destroyed) return;
         const canvas = document.createElement("canvas");
         const ctx = canvas.getContext("2d", {
           alpha: false
         });
         const initViewport = page.getViewport({ scale: 1 });
-        let scale = 1;
-        if (this.pdfConfig.zoom === "page-width") {
-          scale = Math.ceil(document.body.offsetWidth / initViewport.width);
-        } else {
-          scale = this.pdfConfig.zoom;
-        }
         const rotation = (this.pdfConfig.pageRotate + initViewport.rotation) % 360;
+        const baseViewport = page.getViewport({ scale: 1, rotation });
+        const cssWidth = div.clientWidth || this.pdfConfig.viewerContainer.offsetWidth || baseViewport.width;
+        let scale = cssWidth / baseViewport.width * (window.devicePixelRatio || 1);
+        const pixels = baseViewport.width * baseViewport.height * scale * scale;
+        if (pixels > MAX_CANVAS_PIXELS) scale *= Math.sqrt(MAX_CANVAS_PIXELS / pixels);
         const viewport = page.getViewport({ scale, rotation });
         canvas.width = viewport.width;
         canvas.height = viewport.height;
@@ -459,11 +469,17 @@ class PdfViewer {
         };
         var renderTask = page.render(renderContext);
         renderTask.promise.then(() => {
+          if (this.destroyed) {
+            releaseCanvas(canvas);
+            return;
+          }
           const loading = item.view.div.querySelector(".pdf-viewer-loading");
           loading.style.display = "none";
           item.view.div.appendChild(canvas);
           this.loadViews.push(item.view);
           cb && cb();
+        }, () => {
+          releaseCanvas(canvas);
         });
       });
     }

package/dist/src/runtime-utils/util.js

@@ -7,6 +7,7 @@ import * as formula from "@epxing/utils/src/formula";
 import { evalWith } from "@epxing/utils/src/eval-with";
 import { useVuePlugin, getApp } from "../app.js";
 import { resolveRouteRole } from "../menu-route.js";
+import { loadChartRuntimeAssets } from "../chart-runtime-assets.js";
 const installingLibraries = /* @__PURE__ */ new Map();
 class Util {
   constructor() {
@@ -585,7 +586,8 @@ class Util {
     }
     script.onerror = function() {
       console.error("[util.loadJS] 加载失败：" + url);
-      callback();
+      if (options.onerror) options.onerror(new Error("脚本加载失败：" + url));
+      else callback();
     };
     script.src = url;
     document.getElementsByTagName("head")[0].appendChild(script);
@@ -788,7 +790,7 @@ class Util {
     const publicPath = this.getPublicPath();
     const jsDir = this.getStaticJsDir();
     if (plugin === "luckysheet") {
-      const loadPromise = loadFile([publicPath + "luckysheet/pluginsCss.css", publicPath + "luckysheet/plugins.css", publicPath + "luckysheet/luckysheet.css", publicPath + "/luckysheet/iconfont.css", publicPath + "luckysheet/plugin.js", publicPath + "luckysheet/luckysheet.umd.js"]).then(() => globalThis.luckysheet);
+      const loadPromise = loadFile([publicPath + "luckysheet/pluginsCss.css", publicPath + "luckysheet/plugins.css", publicPath + "luckysheet/luckysheet.css", publicPath + "luckysheet/iconfont.css", publicPath + "luckysheet/plugin.js", publicPath + "luckysheet/luckysheet.umd.js"]).then(() => globalThis.luckysheet);
       this.loadPlugins[plugin] = loadPromise;
       return loadPromise;
     } else if (plugin === "BMap") {
@@ -828,7 +830,26 @@ class Util {
       this.loadPlugins[plugin] = loadPromise;
       return loadPromise;
     } else if (plugin === "echarts") {
-      const loadPromise = loadFile([publicPath + jsDir + "echarts.min.js?v=6.0.0-full", publicPath + jsDir + "ecStat.min.js"]).then(() => globalThis.echarts);
+      const loading = window.STATIC_JS_DIR ? Promise.all([publicPath + jsDir + "echarts.min.js?v=6.0.0-full", publicPath + jsDir + "ecStat.min.js"].map((url) => new Promise((resolve, reject) => {
+        this.loadJS({ url, callback: resolve, onerror: reject });
+      }))) : loadChartRuntimeAssets(this.loadJS.bind(this));
+      const loadPromise = loading.then(() => {
+        if (!globalThis.echarts || !globalThis.ecStat) throw new Error("图表资源加载失败，请检查 ECharts 和 ecStat 脚本");
+        return globalThis.echarts;
+      }).catch((error) => {
+        delete this.loadPlugins[plugin];
+        throw error;
+      });
+      this.loadPlugins[plugin] = loadPromise;
+      return loadPromise;
+    } else if (plugin === "echarts-wordcloud") {
+      const loading = window.STATIC_JS_DIR ? new Promise((resolve, reject) => {
+        this.loadJS({ url: publicPath + jsDir + "echarts-wordcloud.min.js", callback: resolve, onerror: reject });
+      }) : loadChartRuntimeAssets(this.loadJS.bind(this), ["wordcloud"]);
+      const loadPromise = loading.catch((error) => {
+        delete this.loadPlugins[plugin];
+        throw error;
+      });
       this.loadPlugins[plugin] = loadPromise;
       return loadPromise;
     } else if (plugin === "pdf") {
@@ -1054,7 +1075,8 @@ class Util {
   }
   encrypt(content, key, { type } = {}) {
     if (type === "aes") {
-      return __epxPackagePreload(() => import("crypto-js"), true ? [] : void 0, import.meta.url).then((CryptoJS) => {
+      return __epxPackagePreload(() => import("crypto-js"), true ? [] : void 0, import.meta.url).then((cryptoModule) => {
+        const CryptoJS = "default" in cryptoModule ? cryptoModule.default : cryptoModule;
         const base64Key = atob(key);
         const aesKey = CryptoJS.enc.Utf8.parse(base64Key.toString(CryptoJS.enc.Utf8));
         const encrypted = CryptoJS.AES.encrypt(content, aesKey, {
@@ -1074,7 +1096,8 @@ class Util {
   }
   decrypt(content, { type, key }) {
     if (type === "aes") {
-      return __epxPackagePreload(() => import("crypto-js"), true ? [] : void 0, import.meta.url).then((CryptoJS) => {
+      return __epxPackagePreload(() => import("crypto-js"), true ? [] : void 0, import.meta.url).then((cryptoModule) => {
+        const CryptoJS = "default" in cryptoModule ? cryptoModule.default : cryptoModule;
         const base64Key = atob(key);
         const aesKey = CryptoJS.enc.Utf8.parse(base64Key.toString(CryptoJS.enc.Utf8));
         const decrypted = CryptoJS.AES.decrypt(content, aesKey, {

package/dist/src/shared-packages.js

@@ -4,9 +4,7 @@ function publishSharedPackage(name, api) {
   const registry = globalThis.__EPX_PACKAGES__ || (globalThis.__EPX_PACKAGES__ = /* @__PURE__ */ Object.create(null));
   const namespace = registry[name] || (registry[name] = {});
   Object.assign(namespace, api);
-  if (name === "@epxing/component" || name === "@epxing/components") {
-    registry["@epxing/component"] = namespace;
-    registry["@epxing/components"] = namespace;
+  if (name === "@epxing/components") {
     if (!namespace.install) namespace.install = (app) => installComponents(app, Object.fromEntries(
       Object.entries(namespace).filter(([key]) => key !== "install" && key !== "default")
     ));

package/dist/src/store/modules/list.js

@@ -1,8 +1,19 @@
 import '../../../style.css';
-import { markRaw } from "vue";
+import { reactive, markRaw } from "vue";
 import client from "../../api/index.js";
 import { ADD_TAG, ADD_LIST, ADD_OBJECT_COUNT, ADD_OBJECT } from "../actions.js";
 import { touchKeys, prune, touch } from "../lru.js";
+const hasOwn = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
+const lists = reactive({});
+const listSignals = /* @__PURE__ */ new Map();
+const signalOf = (key) => {
+  let signal = listSignals.get(key);
+  if (!signal) {
+    signal = reactive({ version: 0 });
+    listSignals.set(key, signal);
+  }
+  return signal;
+};
 const formatData = (array, values = [], list2) => {
   return array.map((item) => {
     item.defaultIndex = 0;
@@ -35,7 +46,7 @@ const markPayloadRaw = (data) => {
 };
 const list = {
   state: {
-    lists: {},
+    lists,
     treeList: {},
     objects: {},
     object_counts: {},
@@ -44,6 +55,7 @@ const list = {
   },
   getters: {
     getCodeById: (state) => (id) => {
+      signalOf(id).version;
       const list2 = state.lists[id];
       if (list2) {
         touch("lists", id);
@@ -69,12 +81,22 @@ const list = {
     getTagListByMetaId: (state) => (id) => state.tags[id]
   },
   mutations: {
+    // 逐 key 写入并只通知该 key 的信号，不整体替换 lists
     [ADD_LIST](state, data) {
       touchKeys("lists", Object.keys(data));
-      state.lists = prune("lists", { ...state.lists, ...markPayloadRaw(data) }, LIMITS.lists);
+      const rawData = markPayloadRaw(data);
+      for (const key in rawData) {
+        state.lists[key] = rawData[key];
+        signalOf(key).version++;
+      }
+      const keep = prune("lists", { ...state.lists }, LIMITS.lists);
+      for (const key in state.lists) {
+        if (!hasOwn(keep, key)) delete state.lists[key];
+      }
     },
     "DELETE_LIST"(state, payload) {
       delete state.lists[payload.key];
+      signalOf(payload.key).version++;
     },
     "ADD_TREE_LIST"(state, data) {
       touchKeys("treeList", Object.keys(data));

package/dist/src/store/modules/meta.js

@@ -1,10 +1,31 @@
 import '../../../style.css';
-import { markRaw } from "vue";
+import { reactive, markRaw, toRaw } from "vue";
 import client from "../../api/index.js";
 import Meta from "../../runtime-utils/meta.js";
 import { ADD_META } from "../actions.js";
 import { touch, touchKeys, prune } from "../lru.js";
 const ADD_SIMPLE_META = "ADD_SIMPLE_META";
+const hasOwn = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
+const metas = reactive({});
+const metaAliases = /* @__PURE__ */ new WeakMap();
+const aliasesOf = (state) => {
+  const cache = toRaw(state.metas);
+  if (!metaAliases.has(cache)) metaAliases.set(cache, {});
+  return metaAliases.get(cache);
+};
+const metaSignals = /* @__PURE__ */ new Map();
+const signalOf = (key) => {
+  let signal = metaSignals.get(key);
+  if (!signal) {
+    signal = reactive({ version: 0 });
+    metaSignals.set(key, signal);
+  }
+  return signal;
+};
+const notifyMeta = (key) => {
+  const signal = metaSignals.get(key);
+  if (signal) signal.version++;
+};
 const ADD_META_RELATION_FIELDS = "ADD_META_RELATION_FIELDS";
 const ADD_META_VIEW_FIELDS = "ADD_META_VIEW_FIELDS";
 const LIMITS = {
@@ -12,9 +33,9 @@ const LIMITS = {
   metaRelationFields: { soft: 50, hard: 120 },
   metaViewFields: { soft: 50, hard: 200 }
 };
-const findMeta = (metas, matcher) => {
-  for (const key in metas) {
-    const item = metas[key];
+const findMeta = (metas2, matcher) => {
+  for (const key in metas2) {
+    const item = metas2[key];
     if (item && matcher(item)) {
       touch("metas", key);
       return item;
@@ -46,7 +67,7 @@ const formatFields = (arr, flag = "") => {
 };
 const meta = {
   state: {
-    metas: {},
+    metas,
     simpleMetas: {},
     metaStatus: {},
     simpleMetaStatus: {},
@@ -56,9 +77,24 @@ const meta = {
     metaViewFieldStatus: {}
   },
   mutations: {
+    // 逐 key 写入并只通知该 key（及其别名）的信号，不整体替换 metas
     [ADD_META](state, data) {
       touchKeys("metas", Object.keys(data));
-      state.metas = prune("metas", { ...state.metas, ...data }, LIMITS.metas);
+      const metaAlias = aliasesOf(state);
+      for (const key in data) {
+        const meta2 = data[key];
+        state.metas[key] = meta2;
+        const aliases = [meta2.id, meta2.code, `${meta2.code}@${meta2.systemCode}@${meta2.clientCode}`];
+        aliases.forEach((alias) => {
+          if (alias && alias !== key) metaAlias[alias] = key;
+        });
+        notifyMeta(key);
+        aliases.forEach(notifyMeta);
+      }
+      const keep = prune("metas", { ...state.metas }, LIMITS.metas);
+      for (const key in state.metas) {
+        if (!hasOwn(keep, key)) delete state.metas[key];
+      }
     },
     [ADD_SIMPLE_META](state, data) {
       state.simpleMetas = { ...state.simpleMetas, ...data };
@@ -74,12 +110,18 @@ const meta = {
   },
   getters: {
     getMetaById: (state) => (id) => {
+      signalOf(id).version;
       const meta2 = state.metas[id];
       if (meta2) touch("metas", id);
       return meta2;
     },
     getMeta: (state) => (id) => {
-      return findMeta(state.metas, (item) => item.id === id || item.code === id || item.code + "@" + item.systemCode + "@" + item.clientCode === id);
+      if (!id) return void 0;
+      signalOf(id).version;
+      const key = hasOwn(state.metas, id) ? id : aliasesOf(state)[id];
+      const meta2 = key ? state.metas[key] : void 0;
+      if (meta2) touch("metas", key);
+      return meta2;
     },
     getSimpleMeta: (state) => (id) => {
       return state.simpleMetas[id] || findMeta(state.metas, (item) => item.id === id || item.code === id);

package/dist/src/style-presets.js

@@ -45,16 +45,16 @@ const STYLE_AXES = [
     ]
   }
 ];
-function applyStylePreset(presetKey) {
+function applyStylePreset(presetKey, settings = uiSettings) {
   const preset = STYLE_PRESETS.find((p) => p.key === presetKey);
   if (!preset) return;
   Object.keys(AXIS_ATTRS).forEach((k) => {
-    uiSettings[k] = preset[k];
+    settings[k] = preset[k];
   });
 }
-function matchStylePreset() {
+function matchStylePreset(settings = uiSettings) {
   const cur = {};
-  for (const k of Object.keys(AXIS_ATTRS)) cur[k] = uiSettings[k];
+  for (const k of Object.keys(AXIS_ATTRS)) cur[k] = settings[k];
   const hit = STYLE_PRESETS.find((p) => Object.keys(AXIS_ATTRS).every((k) => cur[k] === p[k]));
   return hit ? hit.key : "";
 }

package/dist/src/ui-settings.js

@@ -16,6 +16,8 @@ const DEFAULTS = {
   // 主题模式 light|dark|auto（auto 跟随系统 prefers-color-scheme）
   themeColor: "",
   // 主题色预设名（classicblue/purple/...；'' = 默认蓝，走既有 data-theme 兜底）
+  customTheme: null,
+  // 用户选择的自定义主题色快照 { code, color }，刷新后也能在引导期恢复
   grayMode: false,
   // 灰色模式（全站置灰，哀悼日用）
   weakMode: false,
@@ -61,7 +63,7 @@ const DEFAULTS = {
   // 页签风格 smart|card|chrome(谷歌)
   tabsKeepAlive: true,
   // 页签缓存(会话级 keep-alive)：开=切走保活/点回保持原样；关=切走即销毁/每次点开重新加载。不落盘不整组恢复
-  settingsGroups: ["theme", "layout", "tabs", "page", "security"]
+  settingsGroups: ["theme", "style", "layout", "tabs", "page", "security"]
   // 设置抽屉折叠分组的展开态(记住用户的折叠选择，跨会话)
 };
 const NAV_MODES = [
@@ -142,16 +144,15 @@ if (!("isDark" in uiSettings)) {
 let _watching = false;
 let _suppressPersist = false;
 const _appDefaultVals = {};
-function persistDiff() {
+function persistDiff(current, previous) {
   try {
-    const out = {};
+    const out = JSON.parse(window.localStorage.getItem(KEY) || "{}") || {};
+    const next = JSON.parse(current);
+    const before = JSON.parse(previous);
     for (const k of Object.keys(DEFAULTS)) {
-      if (k in _appDefaultVals && uiSettings[k] === _appDefaultVals[k]) continue;
-      const cur = uiSettings[k];
-      const def = DEFAULTS[k];
-      const changed = Array.isArray(def) ? JSON.stringify(cur) !== JSON.stringify(def) : cur !== def;
-      if (changed) out[k] = cur;
+      if (k !== "tabsKeepAlive" && JSON.stringify(next[k]) !== JSON.stringify(before[k])) out[k] = next[k];
     }
+    delete out.tabsKeepAlive;
     window.localStorage.setItem(KEY, JSON.stringify(out));
   } catch (e) {
   }
@@ -159,18 +160,46 @@ function persistDiff() {
 function persistUiSettings() {
   if (_watching) return;
   _watching = true;
-  watch(uiSettings, () => {
+  watch(() => JSON.stringify(Object.fromEntries(Object.keys(DEFAULTS).map((k) => [k, uiSettings[k]]))), (current, previous) => {
     if (_suppressPersist) return;
-    persistDiff();
-  }, { deep: true, flush: "sync" });
+    persistDiff(current, previous);
+  }, { flush: "sync" });
 }
 persistUiSettings();
 let _mql = null;
 let _baseTheme = "";
+function normalizeThemeColor(color) {
+  if (typeof color !== "string") return "";
+  const value = color.trim();
+  const hex = value.match(/^#([\da-f]{3}|[\da-f]{6})$/i);
+  if (hex) {
+    const full = hex[1].length === 3 ? [...hex[1]].map((c) => c + c).join("") : hex[1];
+    return [0, 2, 4].map((i) => parseInt(full.slice(i, i + 2), 16)).join(",");
+  }
+  const rgb = value.match(/^rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$/i);
+  return rgb && rgb.slice(1).every((c) => Number(c) <= 255) ? rgb.slice(1).map(Number).join(",") : "";
+}
 function applyTheme() {
+  var _a;
   const html = document.documentElement;
+  const preset = THEME_COLORS.find((c) => c.name === uiSettings.themeColor);
+  const custom = ((_a = uiSettings.customTheme) == null ? void 0 : _a.code) === uiSettings.themeColor ? uiSettings.customTheme : null;
+  const channels = normalizeThemeColor((preset == null ? void 0 : preset.color) || (custom == null ? void 0 : custom.color));
+  let colorStyle = document.getElementById("epx-ui-theme-color");
+  if (channels) {
+    html.style.removeProperty("--color-primary");
+    if (!colorStyle) {
+      colorStyle = document.createElement("style");
+      colorStyle.id = "epx-ui-theme-color";
+      document.head.appendChild(colorStyle);
+    }
+    const selector = `html[data-theme="${preset ? preset.name : "custom"}"]`;
+    colorStyle.textContent = `${selector}, ${selector} body { --color-primary: ${channels}; }`;
+  } else if (colorStyle) {
+    colorStyle.remove();
+  }
   if (uiSettings.themeColor) {
-    html.setAttribute("data-theme", uiSettings.themeColor);
+    html.setAttribute("data-theme", custom && channels ? "custom" : uiSettings.themeColor);
   } else if (_baseTheme) {
     html.setAttribute("data-theme", _baseTheme);
   } else {
@@ -198,6 +227,7 @@ function initTheme() {
   watch(() => [
     uiSettings.themeMode,
     uiSettings.themeColor,
+    uiSettings.customTheme,
     uiSettings.grayMode,
     uiSettings.weakMode,
     uiSettings.styleRadius,
@@ -214,7 +244,8 @@ function initTheme() {
     else if (_mql.addListener) _mql.addListener(onChange);
   }
 }
-function applyAppDefaults(defaults = {}) {
+function applyAppDefaults(defaults = {}, { replace = false } = {}) {
+  var _a;
   let userSet = {};
   try {
     userSet = JSON.parse(window.localStorage.getItem(KEY) || "{}") || {};
@@ -222,15 +253,25 @@ function applyAppDefaults(defaults = {}) {
   }
   _suppressPersist = true;
   try {
+    if (replace) {
+      Object.keys(_appDefaultVals).forEach((k) => {
+        delete _appDefaultVals[k];
+      });
+      _baseTheme = "";
+      (_a = document.getElementById("custom-theme")) == null ? void 0 : _a.remove();
+      document.documentElement.style.removeProperty("--color-primary");
+    }
     for (const k of Object.keys(DEFAULTS)) {
-      if (defaults[k] !== void 0 && (userSet[k] === void 0 || userSet[k] === DEFAULTS[k])) {
-        uiSettings[k] = defaults[k];
-        _appDefaultVals[k] = defaults[k];
+      if (defaults[k] !== void 0) _appDefaultVals[k] = defaults[k];
+      if (replace || defaults[k] !== void 0) {
+        const value = userSet[k] !== void 0 ? userSet[k] : _appDefaultVals[k] ?? DEFAULTS[k];
+        uiSettings[k] = Array.isArray(value) ? [...value] : value;
       }
     }
   } finally {
     _suppressPersist = false;
   }
+  if (replace) applyTheme();
 }
 function migrateLegacyTheme(src) {
   if (!src) return "";
@@ -247,15 +288,44 @@ function migrateLegacyTheme(src) {
   return src;
 }
 function resetUiSettings() {
-  Object.assign(uiSettings, DEFAULTS);
+  _suppressPersist = true;
+  Object.assign(uiSettings, DEFAULTS, { settingsGroups: [...DEFAULTS.settingsGroups] });
+  _suppressPersist = false;
+  Object.keys(_appDefaultVals).forEach((k) => {
+    delete _appDefaultVals[k];
+  });
+  try {
+    window.localStorage.removeItem(KEY);
+  } catch (e) {
+  }
   _baseTheme = "";
   try {
     const legacyKeys = ["epx_frame_theme", LEGACY_STYLE, LEGACY_PERSIST];
-    legacyKeys.forEach((k) => window.localStorage.removeItem(k));
+    legacyKeys.forEach((k) => {
+      window.localStorage.removeItem(k);
+      window.sessionStorage.removeItem(k);
+    });
   } catch (e) {
   }
   const custom = document.getElementById("custom-theme");
   if (custom && custom.parentNode) custom.parentNode.removeChild(custom);
+  document.documentElement.style.removeProperty("--color-primary");
+  applyTheme();
+}
+function restoreAppUiDefaults() {
+  var _a;
+  const defaults = { ..._appDefaultVals };
+  const baseTheme = _baseTheme;
+  const legacyColor = (_a = document.getElementById("custom-theme")) == null ? void 0 : _a.textContent;
+  resetUiSettings();
+  applyAppDefaults(defaults, { replace: true });
+  _baseTheme = baseTheme;
+  if (legacyColor) {
+    const style = document.createElement("style");
+    style.id = "custom-theme";
+    style.textContent = legacyColor;
+    document.head.appendChild(style);
+  }
   applyTheme();
 }
 if (typeof window !== "undefined") window.__epxUiSettings = uiSettings;
@@ -273,7 +343,9 @@ export {
   initTheme,
   migrateLegacyTheme,
   navModeFlags,
+  normalizeThemeColor,
   persistUiSettings,
   resetUiSettings,
+  restoreAppUiDefaults,
   uiSettings
 };