@epxing/core 5.3.0-beta.1 → 5.3.0-beta.3

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

@@ -1,3 +1,4 @@
+import '../../../style.css';
 import { GET_USER_INFO, GET_USER, DELETE_USER } from "../actions.js";
 import client from "../../api/index.js";
 const user = {

package/dist/src/style-presets.js

@@ -1,3 +1,4 @@
+import '../style.css';
 import uiSettings, { AXIS_ATTRS } from "./ui-settings.js";
 const STYLE_PRESETS = [
   { key: "default", name: "默认", styleRadius: "", styleFont: "", styleDensity: "", styleElevation: "" },
@@ -44,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

@@ -1,3 +1,4 @@
+import '../style.css';
 import { reactive, watch } from "vue";
 const AXIS_ATTRS = {
   styleRadius: "data-radius",
@@ -15,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,
@@ -60,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 = [
@@ -141,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) {
   }
@@ -158,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 {
@@ -197,6 +227,7 @@ function initTheme() {
   watch(() => [
     uiSettings.themeMode,
     uiSettings.themeColor,
+    uiSettings.customTheme,
     uiSettings.grayMode,
     uiSettings.weakMode,
     uiSettings.styleRadius,
@@ -213,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) || "{}") || {};
@@ -221,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 "";
@@ -246,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;
@@ -272,7 +343,9 @@ export {
   initTheme,
   migrateLegacyTheme,
   navModeFlags,
+  normalizeThemeColor,
   persistUiSettings,
   resetUiSettings,
+  restoreAppUiDefaults,
   uiSettings
 };

package/dist/src/viewport.js

@@ -1,3 +1,4 @@
+import '../style.css';
 function applyViewportAttr(isMobile) {
   const el = typeof document !== "undefined" && document.documentElement;
   if (!el) return;

package/dist/src/views/App.js

@@ -0,0 +1,48 @@
+import '../../style.css';
+import { openBlock, createBlock, resolveDynamicComponent, createCommentVNode } from "vue";
+import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
+const _sfc_main = {
+  name: "epx-app",
+  computed: {
+    appConfig() {
+      return this.$store.state.config.appConfig;
+    }
+  },
+  data() {
+    return {
+      load: false,
+      component: "epx-app-index",
+      firstPage: {}
+    };
+  },
+  methods: {
+    getPage() {
+      const { FIRST_PAGE, MOBILE_FIRST_PAGE } = this.appConfig;
+      this.$store.dispatch({
+        // 加回调
+        type: "ADD_PAGE",
+        pageId: this.$isMobile ? MOBILE_FIRST_PAGE : FIRST_PAGE
+      }).then((page = {}) => {
+        const { pagePath } = page;
+        this.firstPage = page;
+        this.component = this.$loadComponent(pagePath, this.component);
+        this.load = true;
+      }).catch(() => {
+        this.load = true;
+      });
+    }
+  },
+  created() {
+    this.getPage();
+  }
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return $data.load ? (openBlock(), createBlock(resolveDynamicComponent($data.component), {
+    key: 0,
+    page: $data.firstPage
+  }, null, 8, ["page"])) : createCommentVNode("", true);
+}
+const App = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export {
+  App as default
+};

package/dist/src/views/AppRoleSelect.js

@@ -0,0 +1,233 @@
+import '../../style.css';
+import { mapState } from "vuex";
+import { roleStorage } from "../menu-route.js";
+import { migrateLegacyTheme, initTheme } from "../ui-settings.js";
+import storage from "@epxing/utils/src/storage";
+import { resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, toDisplayString, createBlock, withCtx, Fragment, renderList, withModifiers, createVNode, createTextVNode, createCommentVNode } from "vue";
+/* empty css                  */
+import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
+const _sfc_main = {
+  name: "epx-app-role-select",
+  data() {
+    return {
+      roleList: null,
+      radio: "",
+      mainRole: null
+    };
+  },
+  computed: {
+    ...mapState({
+      clientConfig: (state) => state.config.clientConfig || {},
+      appConfig: (state) => state.config.appConfig || {},
+      // 应用配置
+      $isMobile: (state) => state.config.isMobile
+      // 是否为移动端
+    })
+  },
+  methods: {
+    setTheme() {
+      const { "CLIENT|THEME": clientTheme, "SYSTEM|THEME": systemTheme } = this.appConfig;
+      const skinCode = migrateLegacyTheme(storage.get("epx_frame_theme") || systemTheme || clientTheme);
+      if (skinCode) {
+        this.$http.find({
+          entityId: "SKIN_COLOR",
+          "scope.CODE": skinCode
+        }).then((data) => {
+          const flag = /rgb\(([\d,\s]+)\)/.test(data.data.COLOR);
+          if (flag) {
+            const style = `body {--color-primary: ${RegExp.$1}}`;
+            var css = document.createElement("style");
+            css.type = "text/css";
+            css.id = "custom-theme";
+            if (css.styleSheet) {
+              css.styleSheet.cssText = style;
+            } else {
+              css.appendChild(document.createTextNode(style));
+            }
+            document.head.appendChild(css);
+          }
+        });
+      }
+      initTheme();
+    },
+    getServiceRoles() {
+      return this.$http.get({
+        action: "getServiceRoles",
+        entityId: "FM_ROLE",
+        serviceId: this.appConfig.ID,
+        order_fields: "ORDER_NUM,LOG_C_TIME",
+        order_mode: "asc,asc"
+      }).then((role) => {
+        if (role.entitys.length === 1) {
+          this.openApp(role.entitys[0]);
+        } else {
+          const mainRole = role.entitys.find((role2) => role2.MAIN_ROLE === "true");
+          if (mainRole) {
+            this.mainRole = mainRole.ID;
+            this.openApp(mainRole);
+          } else {
+            this.roleList = [...role.entitys];
+          }
+        }
+      });
+    },
+    setMainRole() {
+      this.$http.save({
+        action: "setMainRole",
+        entityId: "FM_USER_SERVICE_MAIN_ROLE",
+        serviceId: this.appConfig.ID,
+        roleId: this.mainRole
+      }).then(() => {
+        this.$message.success("设置成功");
+      });
+    },
+    openApp(role) {
+      const roleCode = role.CODE + (role.TYPE === "client" ? "-client" : "");
+      const { CODE, "SYSTEM|CODE": systemCode, "CLIENT|CODE": clientCode } = this.appConfig;
+      const { client = clientCode, system = systemCode, name: lastRouteName, ...otherParams } = this.$route.params;
+      roleStorage.set(client, system, roleCode);
+      let name = "app1";
+      if (systemCode === "epxing-frame") {
+        switch (CODE) {
+          case "FM_SERVICE_SYSTEM":
+            name = "system";
+            break;
+          case "FM_SERVICE_CLIENT":
+            name = "client";
+            break;
+          case "FM_SERVICE_HALL":
+            name = "hall";
+            break;
+        }
+      }
+      const { backMenu, ...restQuery } = this.$route.query;
+      if (backMenu) {
+        return this.$router.replace({
+          name: name === "hall" ? "hallMenu" : "appMenu",
+          params: { client, system, app: CODE, menuKey: backMenu },
+          query: restQuery
+        });
+      }
+      this.$router.replace({
+        name: lastRouteName || name,
+        params: {
+          client,
+          system,
+          app: CODE,
+          role: roleCode,
+          ...otherParams
+        },
+        query: { ...this.$route.query }
+      });
+    },
+    logout() {
+      this.$http.logout().then(() => {
+        this.$util.toLogin(true);
+      });
+    }
+  },
+  created() {
+    this.getServiceRoles();
+    this.setTheme();
+  }
+};
+const _hoisted_1 = { class: "select__modal" };
+const _hoisted_2 = { class: "app__title" };
+const _hoisted_3 = { class: "app__name" };
+const _hoisted_4 = ["onClick"];
+const _hoisted_5 = { class: "role__name" };
+const _hoisted_6 = {
+  key: 1,
+  class: "no-role"
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_el_radio = resolveComponent("el-radio");
+  const _component_el_radio_group = resolveComponent("el-radio-group");
+  const _component_el_button = resolveComponent("el-button");
+  return $data.roleList ? (openBlock(), createElementBlock("div", {
+    key: 0,
+    class: normalizeClass({ "role-select": true, "m-role-select": _ctx.$isMobile })
+  }, [
+    createElementVNode("div", {
+      class: "role-select__bg",
+      style: normalizeStyle(_ctx.clientConfig.BACKGROUND_CHOICEROLE ? { backgroundImage: `url(${_ctx.$util.getFileUrl(_ctx.clientConfig.BACKGROUND_CHOICEROLE)})` } : {})
+    }, null, 4),
+    createElementVNode("div", _hoisted_1, [
+      createElementVNode("div", _hoisted_2, [
+        createElementVNode("span", {
+          class: "app__prefix",
+          style: normalizeStyle({ background: _ctx.appConfig.COLOR })
+        }, [
+          createElementVNode("i", {
+            class: normalizeClass(["app__icon fa", _ctx.appConfig.ICON || "el-icon-menu"])
+          }, null, 2)
+        ], 4),
+        createElementVNode("i", _hoisted_3, toDisplayString(_ctx.appConfig.NAME), 1)
+      ]),
+      _cache[5] || (_cache[5] = createElementVNode("div", { class: "role__title" }, "请选择您的角色", -1)),
+      $data.roleList.length > 0 ? (openBlock(), createBlock(_component_el_radio_group, {
+        key: 0,
+        class: "radio-group",
+        modelValue: $data.mainRole,
+        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => $data.mainRole = $event),
+        onChange: $options.setMainRole
+      }, {
+        default: withCtx(() => [
+          createElementVNode("ul", {
+            class: normalizeClass({ "role__list": true, "m_role_list": _ctx.$isMobile })
+          }, [
+            (openBlock(true), createElementBlock(Fragment, null, renderList($data.roleList, (role) => {
+              return openBlock(), createElementBlock("li", {
+                class: "role__item",
+                key: role.ID,
+                onClick: ($event) => $options.openApp(role)
+              }, [
+                createElementVNode("span", {
+                  class: "role__prefix",
+                  style: normalizeStyle({ background: _ctx.appConfig.ROLE_COLOR })
+                }, [
+                  createElementVNode("i", {
+                    class: normalizeClass(["fa", role.ICON || "el-icon-user-solid"])
+                  }, null, 2)
+                ], 4),
+                createElementVNode("span", _hoisted_5, toDisplayString(role.NAME), 1),
+                createElementVNode("span", {
+                  class: "role__opera",
+                  onClick: _cache[0] || (_cache[0] = withModifiers(() => {
+                  }, ["stop"]))
+                }, [
+                  createVNode(_component_el_radio, {
+                    class: "radio",
+                    label: role.ID,
+                    value: role.ID
+                  }, {
+                    default: withCtx(() => [..._cache[2] || (_cache[2] = [
+                      createTextVNode("设为默认", -1)
+                    ])]),
+                    _: 1
+                  }, 8, ["label", "value"])
+                ])
+              ], 8, _hoisted_4);
+            }), 128))
+          ], 2)
+        ]),
+        _: 1
+      }, 8, ["modelValue", "onChange"])) : (openBlock(), createElementBlock("div", _hoisted_6, [
+        _cache[4] || (_cache[4] = createElementVNode("p", null, "对不起，您还未得到该应用的访问授权！", -1)),
+        createVNode(_component_el_button, {
+          type: "primary",
+          onClick: $options.logout
+        }, {
+          default: withCtx(() => [..._cache[3] || (_cache[3] = [
+            createTextVNode("退出登录", -1)
+          ])]),
+          _: 1
+        }, 8, ["onClick"])
+      ]))
+    ])
+  ], 2)) : createCommentVNode("", true);
+}
+const AppRoleSelect = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-da37146c"]]);
+export {
+  AppRoleSelect as default
+};