@hlw-uni/mp-vue 2.1.59 → 2.1.69

package/dist/composables/index.d.ts

@@ -9,11 +9,3 @@ export { useShare, type ShareConfig, } from './share';
 export { useHlwAd, type AdRes } from './ad';
 export { useUtils, withQuery, toQuery, signText, toNumber, toBoolean, copy, paste, auth, saveImage, saveVideoFile, download, saveImageUrl, saveVideoUrl, type DownloadOpt, type DownloadRes, } from './utils';
 export { useNavigate, type NavigateType, type NavigateOptions } from './navigator';
-export type { FontScale, FontPreset } from './theme';
-export { FONT_SCALE_KEY, FONT_PRESETS, getCurrentFontScale, getCurrentFontVars, THEME_CHANGE_EVENT, buildThemeStyle, useThemePageStyle, } from './theme';
-export type { ThemeColor } from './theme';
-export { THEME_COLOR_KEY, THEME_SEMANTIC_COLORS, DEFAULT_THEMES, getCurrentThemeColor, getCurrentThemeVars, } from './theme';
-export type { Appearance, AppearanceMode, AppearancePreset } from './theme';
-export { APPEARANCE_KEY, APPEARANCE_PRESETS, APPEARANCE_VAR_MAP, getCurrentAppearance, getCurrentAppearanceMode, getCurrentAppearanceVars, resolveAppearance, } from './theme';
-export type { TypographyRole } from './theme';
-export { TYPOGRAPHY_ROLES, getCurrentTypographyVars } from './theme';

package/dist/composables/request/service.d.ts

@@ -94,10 +94,6 @@ export declare function ServicePrefix(value: string | ServicePrefixOptions): (ta
 }) => void;
 /**
  * 插件服务类装饰器。
- * 自动使用 `import.meta.env.VITE_PLUGIN_NAME` 作为服务前缀。
+ * 自动使用 `import.meta.env.VITE_PLUGIN_NAME` 作为服务前缀（通过 globalThis 动态读取）。
  */
-export declare function PluginService(target: {
-    prototype: {
-        servicePrefix?: string;
-    };
-}): void;
+export declare function PluginService(target: any): void;

package/dist/core/index.d.ts

@@ -0,0 +1 @@
+export * from './theme';

package/dist/core/theme.d.ts

@@ -0,0 +1,21 @@
+import { ComputedRef } from 'vue';
+import { Store } from 'pinia';
+
+export { themePresets, type ThemePreset, fontSizePresets, type FontSizePreset, fontFamilyPresets, type FontFamilyPreset } from '../stores/theme';
+export declare function useTheme(): {
+    theme: ComputedRef<string>;
+    fontSize: ComputedRef<string>;
+    fontSizeClass: ComputedRef<string>;
+    setFontSize: (size: string) => void;
+    fontFamily: ComputedRef<string>;
+    fontFamilyClass: ComputedRef<string>;
+    setFontFamily: (font: string) => void;
+    store: Store<"theme", {
+        theme: string;
+        fontSize: string;
+        fontFamily: string;
+    }, {}, {
+        setFontSize(size: string): void;
+        setFontFamily(font: string): void;
+    }>;
+};

package/dist/index.d.ts

@@ -3,14 +3,14 @@
  *
  * 2.0 起合并了原 @hlw-uni/mp-core 全部内容。
  * 业务方一处 import，无需再分包：
- *   import { useMsg, useThemePageStyle, ... } from "@hlw-uni/mp-vue";
+ *   import { useMsg, useTheme, ... } from "@hlw-uni/mp-vue";
  *
  * UI 组件（hlw-page / hlw-button / hlw-ad 等）走 easycom 自动注册，不在这里 export。
  */
 export * from './composables';
+export { useTheme, themePresets, type ThemePreset, fontFamilyPresets, type FontFamilyPreset, fontSizePresets, type FontSizePreset } from './core/theme';
 export type { HlwMenuItem } from './components/hlw-menu/types';
 export type { HlwPagingRef, HlwPagingInstance } from './components/hlw-paging/types';
-export { useThemeStore } from './stores/theme';
 export { useApp } from './app';
 export { hlw, type HlwInstance } from './hlw';
 export { vCopy } from './directives';

package/dist/index.js

@@ -281,7 +281,6 @@ var __publicField = (obj, key, value) => {
     }
     return { uploading, upload };
   }
-  var define_import_meta_env_default = {};
   class BaseService {
     /**
      * 发送服务请求。会自动拼接前缀与命名空间。
@@ -338,7 +337,13 @@ var __publicField = (obj, key, value) => {
     };
   }
   function PluginService(target) {
-    target.prototype.servicePrefix = define_import_meta_env_default.VITE_PLUGIN_NAME || "";
+    Object.defineProperty(target.prototype, "servicePrefix", {
+      get() {
+        return globalThis.VITE_PLUGIN_NAME || "";
+      },
+      enumerable: true,
+      configurable: true
+    });
   }
   function useMsg() {
     function toast(opts) {
@@ -964,363 +969,122 @@ var __publicField = (obj, key, value) => {
       miniProgram: (appId, options) => navigate("miniprogram", appId, options)
     };
   }
-  const useThemeStore = pinia.defineStore(
-    "theme",
-    () => {
-      const scale = vue.ref("normal");
-      function setScale(s) {
-        scale.value = s;
-        uni.setStorageSync(FONT_SCALE_KEY, s);
-        uni.$emit(THEME_CHANGE_EVENT);
-      }
-      const fontOptions = Object.keys(FONT_PRESETS).map((key) => ({
-        value: key,
-        label: FONT_PRESETS[key].label
-      }));
-      const primaryColor = vue.ref(DEFAULT_THEMES[0].value);
-      const themes = DEFAULT_THEMES;
-      const activeTheme = vue.computed(
-        () => themes.find((t) => t.value === primaryColor.value) ?? { label: "自定义", value: primaryColor.value }
-      );
-      function setTheme(color) {
-        primaryColor.value = color;
-        uni.setStorageSync(THEME_COLOR_KEY, color);
-        uni.$emit(THEME_CHANGE_EVENT);
-      }
-      const appearance = vue.ref("auto");
-      const appearanceOptions = APPEARANCE_PRESETS;
-      const appearanceMode = vue.computed(() => resolveAppearance(appearance.value));
-      const isDark = vue.computed(() => appearanceMode.value === "dark");
-      function setAppearance(a) {
-        appearance.value = a;
-        uni.setStorageSync(APPEARANCE_KEY, a);
-        uni.$emit(THEME_CHANGE_EVENT);
-      }
-      return {
-        // 字体
-        scale,
-        fontOptions,
-        setScale,
-        // 主题色
-        primaryColor,
-        themes,
-        activeTheme,
-        setTheme,
-        // 外观模式
-        appearance,
-        appearanceOptions,
-        appearanceMode,
-        isDark,
-        setAppearance
-      };
+  const themePresets = [
+    {
+      id: "white-theme",
+      name: "白色主题",
+      color: "#ffffff"
     },
-    { unistorage: true }
-  );
-  const FONT_SCALE_KEY = "hlw_font_scale";
-  const FONT_PRESETS = {
-    small: {
-      label: "较小",
-      vars: {
-        "--font-xs": "16rpx",
-        "--font-sm": "20rpx",
-        "--font-base": "24rpx",
-        "--font-md": "28rpx",
-        "--font-lg": "32rpx",
-        "--font-xl": "36rpx"
-      }
+    {
+      id: "light-theme",
+      name: "简洁主题",
+      color: "var(--bg-page, #f8f8f8)"
     },
-    compact: {
-      label: "略小",
-      vars: {
-        "--font-xs": "18rpx",
-        "--font-sm": "22rpx",
-        "--font-base": "26rpx",
-        "--font-md": "30rpx",
-        "--font-lg": "34rpx",
-        "--font-xl": "38rpx"
-      }
+    {
+      id: "mono-theme",
+      name: "单色主题",
+      color: "var(--primary-color, #3b82f6)"
     },
-    normal: {
-      label: "标准",
-      vars: {
-        "--font-xs": "20rpx",
-        "--font-sm": "24rpx",
-        "--font-base": "28rpx",
-        "--font-md": "32rpx",
-        "--font-lg": "36rpx",
-        "--font-xl": "40rpx"
-      }
-    },
-    medium: {
-      label: "适中",
-      vars: {
-        "--font-xs": "22rpx",
-        "--font-sm": "28rpx",
-        "--font-base": "32rpx",
-        "--font-md": "36rpx",
-        "--font-lg": "42rpx",
-        "--font-xl": "46rpx"
-      }
+    {
+      id: "color-theme",
+      name: "颜色主题",
+      color: "var(--primary-color, #3b82f6)"
+    }
+  ];
+  const fontSizePresets = [
+    {
+      id: "small",
+      name: "较小",
+      class: "font-size-small"
     },
-    large: {
-      label: "较大",
-      vars: {
-        "--font-xs": "24rpx",
-        "--font-sm": "30rpx",
-        "--font-base": "34rpx",
-        "--font-md": "40rpx",
-        "--font-lg": "46rpx",
-        "--font-xl": "52rpx"
-      }
+    {
+      id: "standard",
+      name: "标准",
+      class: "font-size-standard"
     },
-    xlarge: {
-      label: "超大",
-      vars: {
-        "--font-xs": "28rpx",
-        "--font-sm": "36rpx",
-        "--font-base": "42rpx",
-        "--font-md": "48rpx",
-        "--font-lg": "56rpx",
-        "--font-xl": "64rpx"
-      }
+    {
+      id: "large",
+      name: "较大",
+      class: "font-size-large"
     },
-    xxlarge: {
-      label: "特大",
-      vars: {
-        "--font-xs": "32rpx",
-        "--font-sm": "42rpx",
-        "--font-base": "48rpx",
-        "--font-md": "56rpx",
-        "--font-lg": "64rpx",
-        "--font-xl": "72rpx"
-      }
+    {
+      id: "extra-large",
+      name: "超大",
+      class: "font-size-extra-large"
     }
-  };
-  function getCurrentFontScale() {
-    try {
-      const v = uni.getStorageSync(FONT_SCALE_KEY);
-      if (v === "small" || v === "compact" || v === "medium" || v === "large" || v === "xlarge" || v === "xxlarge")
-        return v;
-    } catch {
-    }
-    return "normal";
-  }
-  function getCurrentFontVars() {
-    return FONT_PRESETS[getCurrentFontScale()].vars;
-  }
-  const THEME_COLOR_KEY = "hlw_theme_color";
-  const THEME_SEMANTIC_COLORS = {
-    success: "#10b981",
-    warning: "#f59e0b",
-    error: "#ef4444",
-    info: "#64748b"
-  };
-  const DEFAULT_THEMES = [
-    { label: "翡翠绿", value: "#10b981" },
-    { label: "活力橙", value: "#f97316" },
-    { label: "默认蓝", value: "#3b82f6" },
-    { label: "玫瑰粉", value: "#f43f5e" },
-    { label: "紫罗兰", value: "#8b5cf6" },
-    { label: "青石灰", value: "#64748b" }
   ];
-  function getCurrentThemeColor() {
-    try {
-      const v = uni.getStorageSync(THEME_COLOR_KEY);
-      if (v && typeof v === "string")
-        return v;
-    } catch {
-    }
-    return DEFAULT_THEMES[0].value;
-  }
-  function getCurrentThemeVars() {
-    const color = getCurrentThemeColor();
-    return {
-      "--primary-color": color,
-      "--primary-light": hexToRgba(color, 0.12),
-      "--primary-dark": darkenHex(color),
-      "--primary-success": THEME_SEMANTIC_COLORS.success,
-      "--primary-success-light": hexToRgba(THEME_SEMANTIC_COLORS.success, 0.12),
-      "--primary-success-dark": darkenHex(THEME_SEMANTIC_COLORS.success),
-      "--primary-warning": THEME_SEMANTIC_COLORS.warning,
-      "--primary-warning-light": hexToRgba(THEME_SEMANTIC_COLORS.warning, 0.12),
-      "--primary-warning-dark": darkenHex(THEME_SEMANTIC_COLORS.warning),
-      "--primary-error": THEME_SEMANTIC_COLORS.error,
-      "--primary-error-light": hexToRgba(THEME_SEMANTIC_COLORS.error, 0.12),
-      "--primary-error-dark": darkenHex(THEME_SEMANTIC_COLORS.error),
-      "--primary-info": THEME_SEMANTIC_COLORS.info,
-      "--primary-info-light": hexToRgba(THEME_SEMANTIC_COLORS.info, 0.12),
-      "--primary-info-dark": darkenHex(THEME_SEMANTIC_COLORS.info),
-      "--success-color": THEME_SEMANTIC_COLORS.success,
-      "--success-light": hexToRgba(THEME_SEMANTIC_COLORS.success, 0.12),
-      "--success-dark": darkenHex(THEME_SEMANTIC_COLORS.success),
-      "--warning-color": THEME_SEMANTIC_COLORS.warning,
-      "--warning-light": hexToRgba(THEME_SEMANTIC_COLORS.warning, 0.12),
-      "--warning-dark": darkenHex(THEME_SEMANTIC_COLORS.warning),
-      "--error-color": THEME_SEMANTIC_COLORS.error,
-      "--error-light": hexToRgba(THEME_SEMANTIC_COLORS.error, 0.12),
-      "--error-dark": darkenHex(THEME_SEMANTIC_COLORS.error),
-      "--info-color": THEME_SEMANTIC_COLORS.info,
-      "--info-light": hexToRgba(THEME_SEMANTIC_COLORS.info, 0.12),
-      "--info-dark": darkenHex(THEME_SEMANTIC_COLORS.info)
-    };
-  }
-  const HEX_RE = /^#[0-9a-fA-F]{6}$/;
-  function parseHex(hex) {
-    if (!HEX_RE.test(hex))
-      throw new Error(`Invalid hex color: ${hex}`);
-    return [
-      parseInt(hex.slice(1, 3), 16),
-      parseInt(hex.slice(3, 5), 16),
-      parseInt(hex.slice(5, 7), 16)
-    ];
-  }
-  function hexToRgba(hex, alpha) {
-    const [r, g, b] = parseHex(hex);
-    return `rgba(${r},${g},${b},${alpha})`;
-  }
-  function darkenHex(hex, amount = 0.15) {
-    const [r, g, b] = parseHex(hex);
-    const darken = (value) => Math.max(0, Math.round(value * (1 - amount)));
-    return `#${darken(r).toString(16).padStart(2, "0")}${darken(g).toString(16).padStart(2, "0")}${darken(b).toString(16).padStart(2, "0")}`;
-  }
-  const APPEARANCE_KEY = "hlw_appearance";
-  const APPEARANCE_PRESETS = [
-    { value: "light", label: "浅色模式" },
-    { value: "dark", label: "深色模式" },
-    { value: "auto", label: "跟随系统" }
-  ];
-  const LIGHT_VARS = {
-    "--bg-page": "#f6f6f6",
-    "--bg-elevated": "#ffffff",
-    "--surface-card": "#ffffff",
-    "--surface-card-muted": "#f8fafc",
-    "--surface-secondary": "#f1f5f9",
-    "--surface-tertiary": "#e2e8f0",
-    "--text-primary": "#0f172a",
-    "--text-secondary": "#334155",
-    "--text-muted": "#64748b",
-    "--text-subtle": "#94a3b8",
-    "--text-disabled": "#cbd5e1",
-    "--border-color": "#e2e8f0",
-    "--border-color-light": "#f1f5f9",
-    "--border-color-focus": "#bfdbfe",
-    "--shadow-soft": "0 2rpx 8rpx rgba(15, 23, 42, 0.04)",
-    "--shadow-card": "0 4rpx 16rpx rgba(15, 23, 42, 0.06)"
-  };
-  const DARK_VARS = {
-    "--bg-page": "#0b1020",
-    "--bg-elevated": "#111827",
-    "--surface-card": "#1e293b",
-    "--surface-card-muted": "#273549",
-    "--surface-secondary": "#273549",
-    "--surface-tertiary": "#334155",
-    "--text-primary": "#f8fafc",
-    "--text-secondary": "#cbd5e1",
-    "--text-muted": "#94a3b8",
-    "--text-subtle": "#64748b",
-    "--text-disabled": "#475569",
-    "--border-color": "#334155",
-    "--border-color-light": "#1e293b",
-    "--border-color-focus": "#3b82f6",
-    "--shadow-soft": "0 2rpx 8rpx rgba(0, 0, 0, 0.3)",
-    "--shadow-card": "0 4rpx 16rpx rgba(0, 0, 0, 0.35)"
-  };
-  const APPEARANCE_VAR_MAP = {
-    light: LIGHT_VARS,
-    dark: DARK_VARS
-  };
-  function getCurrentAppearance() {
-    try {
-      const v = uni.getStorageSync(APPEARANCE_KEY);
-      if (v === "light" || v === "dark" || v === "auto")
-        return v;
-    } catch {
-    }
-    return "auto";
-  }
-  function resolveAppearance(appearance) {
-    if (appearance === "light" || appearance === "dark")
-      return appearance;
-    try {
-      const info = uni.getSystemInfoSync();
-      if (info.theme === "dark")
-        return "dark";
-    } catch {
-    }
-    return "light";
-  }
-  function getCurrentAppearanceMode() {
-    return resolveAppearance(getCurrentAppearance());
-  }
-  function getCurrentAppearanceVars() {
-    return APPEARANCE_VAR_MAP[getCurrentAppearanceMode()];
-  }
-  const TYPOGRAPHY_ROLES = {
-    "title-lg": {
-      size: "var(--font-xl)",
-      weight: "600",
-      lineHeight: "1.2",
-      color: "var(--text-primary)"
-    },
-    "title": {
-      size: "var(--font-md)",
-      weight: "500",
-      lineHeight: "1.3",
-      color: "var(--text-primary)"
-    },
-    "subtitle": {
-      size: "var(--font-base)",
-      weight: "500",
-      lineHeight: "1.3",
-      color: "var(--text-secondary)"
+  const fontFamilyPresets = [
+    {
+      id: "system",
+      name: "系统默认",
+      class: "font-family-system"
     },
-    "body": {
-      size: "var(--font-base)",
-      weight: "400",
-      lineHeight: "1.5",
-      color: "var(--text-secondary)"
+    {
+      id: "sans",
+      name: "现代黑体",
+      class: "font-family-sans"
     },
-    "desc": {
-      size: "var(--font-sm)",
-      weight: "400",
-      lineHeight: "1.4",
-      color: "var(--text-subtle)"
+    {
+      id: "serif",
+      name: "经典宋体",
+      class: "font-family-serif"
     },
-    "caption": {
-      size: "var(--font-xs)",
-      weight: "500",
-      lineHeight: "1.3",
-      color: "var(--text-muted)"
+    {
+      id: "kaiti",
+      name: "优雅楷体",
+      class: "font-family-kaiti"
     }
-  };
-  function getCurrentTypographyVars() {
-    const vars = {};
-    for (const [role, cfg] of Object.entries(TYPOGRAPHY_ROLES)) {
-      vars[`--text-${role}-size`] = cfg.size;
-      vars[`--text-${role}-weight`] = cfg.weight;
-      vars[`--text-${role}-line-height`] = cfg.lineHeight;
-      vars[`--text-${role}-color`] = cfg.color;
-    }
-    return vars;
-  }
-  const THEME_CHANGE_EVENT = "hlw:theme-change";
-  function buildThemeStyle() {
-    return varsToStyle({
-      ...getCurrentFontVars(),
-      ...getCurrentThemeVars()
-    });
-  }
-  function varsToStyle(vars) {
-    return Object.entries(vars).map(([key, value]) => `${key}:${value}`).join(";") + ";";
-  }
-  function useThemePageStyle() {
+  ];
+  const useThemeStore = pinia.defineStore("theme", {
+    state: () => ({
+      theme: "white-theme",
+      fontSize: "standard",
+      fontFamily: "system"
+    }),
+    getters: {},
+    actions: {
+      setFontSize(size) {
+        if (["small", "standard", "large", "extra-large"].includes(size)) {
+          this.fontSize = size;
+        }
+      },
+      setFontFamily(font) {
+        if (["system", "sans", "serif", "kaiti"].includes(font)) {
+          this.fontFamily = font;
+        }
+      }
+    },
+    unistorage: true
+  });
+  function useTheme() {
     const store = useThemeStore();
-    const themePageStyle = vue.computed(() => {
-      void store.scale;
-      void store.primaryColor;
-      return buildThemeStyle();
+    const theme = vue.computed(() => store.theme);
+    const fontSize = vue.computed(() => store.fontSize);
+    const fontSizeClass = vue.computed(() => {
+      const found = fontSizePresets.find((p) => p.id === store.fontSize);
+      return found ? found.class : "font-size-standard";
+    });
+    const fontFamily = vue.computed(() => store.fontFamily);
+    const fontFamilyClass = vue.computed(() => {
+      const found = fontFamilyPresets.find((p) => p.id === store.fontFamily);
+      return found ? found.class : "font-family-system";
     });
-    return { themePageStyle };
+    function setFontSize(size) {
+      store.setFontSize(size);
+    }
+    function setFontFamily(font) {
+      store.setFontFamily(font);
+    }
+    return {
+      theme,
+      fontSize,
+      fontSizeClass,
+      setFontSize,
+      fontFamily,
+      fontFamilyClass,
+      setFontFamily,
+      store
+    };
   }
   let _msg = null;
   let _utils = null;
@@ -1396,47 +1160,30 @@ var __publicField = (obj, key, value) => {
       injectTap(vnode, binding);
     }
   };
-  exports2.APPEARANCE_KEY = APPEARANCE_KEY;
-  exports2.APPEARANCE_PRESETS = APPEARANCE_PRESETS;
-  exports2.APPEARANCE_VAR_MAP = APPEARANCE_VAR_MAP;
   exports2.BaseService = BaseService;
-  exports2.DEFAULT_THEMES = DEFAULT_THEMES;
-  exports2.FONT_PRESETS = FONT_PRESETS;
-  exports2.FONT_SCALE_KEY = FONT_SCALE_KEY;
   exports2.PluginService = PluginService;
   exports2.ServiceNamespace = ServiceNamespace;
   exports2.ServicePrefix = ServicePrefix;
-  exports2.THEME_CHANGE_EVENT = THEME_CHANGE_EVENT;
-  exports2.THEME_COLOR_KEY = THEME_COLOR_KEY;
-  exports2.THEME_SEMANTIC_COLORS = THEME_SEMANTIC_COLORS;
-  exports2.TYPOGRAPHY_ROLES = TYPOGRAPHY_ROLES;
   exports2.adapters = adapters;
   exports2.alistAdapter = alistAdapter;
   exports2.auth = auth;
-  exports2.buildThemeStyle = buildThemeStyle;
   exports2.clearDeviceCache = clearDeviceCache;
   exports2.copy = copy;
   exports2.cosAdapter = cosAdapter;
   exports2.download = download;
+  exports2.fontFamilyPresets = fontFamilyPresets;
+  exports2.fontSizePresets = fontSizePresets;
   exports2.getAdapter = getAdapter;
-  exports2.getCurrentAppearance = getCurrentAppearance;
-  exports2.getCurrentAppearanceMode = getCurrentAppearanceMode;
-  exports2.getCurrentAppearanceVars = getCurrentAppearanceVars;
-  exports2.getCurrentFontScale = getCurrentFontScale;
-  exports2.getCurrentFontVars = getCurrentFontVars;
-  exports2.getCurrentThemeColor = getCurrentThemeColor;
-  exports2.getCurrentThemeVars = getCurrentThemeVars;
-  exports2.getCurrentTypographyVars = getCurrentTypographyVars;
   exports2.hlw = hlw;
   exports2.ossAdapter = ossAdapter;
   exports2.paste = paste;
   exports2.qiniuAdapter = qiniuAdapter;
-  exports2.resolveAppearance = resolveAppearance;
   exports2.saveImage = saveImage;
   exports2.saveImageUrl = saveImageUrl;
   exports2.saveVideoFile = saveVideoFile;
   exports2.saveVideoUrl = saveVideoUrl;
   exports2.signText = signText;
+  exports2.themePresets = themePresets;
   exports2.toBoolean = toBoolean;
   exports2.toNumber = toNumber;
   exports2.toQuery = toQuery;
@@ -1448,8 +1195,7 @@ var __publicField = (obj, key, value) => {
   exports2.useRefs = useRefs;
   exports2.useRequest = useRequest;
   exports2.useShare = useShare;
-  exports2.useThemePageStyle = useThemePageStyle;
-  exports2.useThemeStore = useThemeStore;
+  exports2.useTheme = useTheme;
   exports2.useUpload = useUpload;
   exports2.useUtils = useUtils;
   exports2.vCopy = vCopy;