@hlw-uni/mp-vue 2.1.59 → 2.1.69

package/dist/index.mjs

@@ -280,7 +280,6 @@ function useUpload() {
   }
   return { uploading, upload };
 }
-var define_import_meta_env_default = {};
 class BaseService {
   /**
    * 发送服务请求。会自动拼接前缀与命名空间。
@@ -337,7 +336,13 @@ function ServicePrefix(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) {
@@ -963,363 +968,122 @@ function useNavigate() {
     miniProgram: (appId, options) => navigate("miniprogram", appId, options)
   };
 }
-const useThemeStore = defineStore(
-  "theme",
-  () => {
-    const scale = 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 = ref(DEFAULT_THEMES[0].value);
-    const themes = DEFAULT_THEMES;
-    const activeTheme = 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 = ref("auto");
-    const appearanceOptions = APPEARANCE_PRESETS;
-    const appearanceMode = computed(() => resolveAppearance(appearance.value));
-    const isDark = 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 = 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 = computed(() => {
-    void store.scale;
-    void store.primaryColor;
-    return buildThemeStyle();
+  const theme = computed(() => store.theme);
+  const fontSize = computed(() => store.fontSize);
+  const fontSizeClass = computed(() => {
+    const found = fontSizePresets.find((p) => p.id === store.fontSize);
+    return found ? found.class : "font-size-standard";
+  });
+  const fontFamily = computed(() => store.fontFamily);
+  const fontFamilyClass = 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 @@ const vCopy = {
   }
 };
 export {
-  APPEARANCE_KEY,
-  APPEARANCE_PRESETS,
-  APPEARANCE_VAR_MAP,
   BaseService,
-  DEFAULT_THEMES,
-  FONT_PRESETS,
-  FONT_SCALE_KEY,
   PluginService,
   ServiceNamespace,
   ServicePrefix,
-  THEME_CHANGE_EVENT,
-  THEME_COLOR_KEY,
-  THEME_SEMANTIC_COLORS,
-  TYPOGRAPHY_ROLES,
   adapters,
   alistAdapter,
   auth,
-  buildThemeStyle,
   clearDeviceCache,
   copy,
   cosAdapter,
   download,
+  fontFamilyPresets,
+  fontSizePresets,
   getAdapter,
-  getCurrentAppearance,
-  getCurrentAppearanceMode,
-  getCurrentAppearanceVars,
-  getCurrentFontScale,
-  getCurrentFontVars,
-  getCurrentThemeColor,
-  getCurrentThemeVars,
-  getCurrentTypographyVars,
   hlw,
   ossAdapter,
   paste,
   qiniuAdapter,
-  resolveAppearance,
   saveImage,
   saveImageUrl,
   saveVideoFile,
   saveVideoUrl,
   signText,
+  themePresets,
   toBoolean,
   toNumber,
   toQuery,
@@ -1448,8 +1195,7 @@ export {
   useRefs,
   useRequest,
   useShare,
-  useThemePageStyle,
-  useThemeStore,
+  useTheme,
   useUpload,
   useUtils,
   vCopy,

package/dist/stores/index.d.ts

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

package/dist/stores/theme.d.ts

@@ -1,56 +1,27 @@
-import { FontScale, ThemeColor, Appearance, AppearanceMode, AppearancePreset } from '../composables/theme';
 import { StoreDefinition } from 'pinia';
-import { Ref, ComputedRef } from 'vue';
-
-/**
- * 统一管理全局主题、字体缩放和外观模式的 Pinia Store。
- */
-export declare const useThemeStore: StoreDefinition<"theme", Pick<{
-    scale: Ref<FontScale, FontScale>;
-    fontOptions: {
-        value: FontScale;
-        label: string;
-    }[];
-    setScale: (s: FontScale) => void;
-    primaryColor: Ref<string, string>;
-    themes: ThemeColor[];
-    activeTheme: ComputedRef<ThemeColor>;
-    setTheme: (color: string) => void;
-    appearance: Ref<Appearance, Appearance>;
-    appearanceOptions: AppearancePreset[];
-    appearanceMode: ComputedRef<AppearanceMode>;
-    isDark: ComputedRef<boolean>;
-    setAppearance: (a: Appearance) => void;
-}, "scale" | "fontOptions" | "primaryColor" | "themes" | "appearance" | "appearanceOptions">, Pick<{
-    scale: Ref<FontScale, FontScale>;
-    fontOptions: {
-        value: FontScale;
-        label: string;
-    }[];
-    setScale: (s: FontScale) => void;
-    primaryColor: Ref<string, string>;
-    themes: ThemeColor[];
-    activeTheme: ComputedRef<ThemeColor>;
-    setTheme: (color: string) => void;
-    appearance: Ref<Appearance, Appearance>;
-    appearanceOptions: AppearancePreset[];
-    appearanceMode: ComputedRef<AppearanceMode>;
-    isDark: ComputedRef<boolean>;
-    setAppearance: (a: Appearance) => void;
-}, "activeTheme" | "appearanceMode" | "isDark">, Pick<{
-    scale: Ref<FontScale, FontScale>;
-    fontOptions: {
-        value: FontScale;
-        label: string;
-    }[];
-    setScale: (s: FontScale) => void;
-    primaryColor: Ref<string, string>;
-    themes: ThemeColor[];
-    activeTheme: ComputedRef<ThemeColor>;
-    setTheme: (color: string) => void;
-    appearance: Ref<Appearance, Appearance>;
-    appearanceOptions: AppearancePreset[];
-    appearanceMode: ComputedRef<AppearanceMode>;
-    isDark: ComputedRef<boolean>;
-    setAppearance: (a: Appearance) => void;
-}, "setScale" | "setTheme" | "setAppearance">>;
+export interface ThemePreset {
+    id: string;
+    name: string;
+    color: string;
+}
+export declare const themePresets: ThemePreset[];
+export interface FontSizePreset {
+    id: string;
+    name: string;
+    class: string;
+}
+export declare const fontSizePresets: FontSizePreset[];
+export interface FontFamilyPreset {
+    id: string;
+    name: string;
+    class: string;
+}
+export declare const fontFamilyPresets: FontFamilyPreset[];
+export declare const useThemeStore: StoreDefinition<"theme", {
+    theme: string;
+    fontSize: string;
+    fontFamily: string;
+}, {}, {
+    setFontSize(size: string): void;
+    setFontFamily(font: string): void;
+}>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hlw-uni/mp-vue",
-    "version": "2.1.59",
+    "version": "2.1.69",
     "description": "hlw-uni 小程序运行时 — Vue 组件 + composables + theme + http + 工具集（合并自原 mp-core）",
     "main": "dist/index.js",
     "module": "dist/index.mjs",