@hlw-uni/mp-vue 2.1.52 → 2.1.54

package/src/composables/share/index.ts

@@ -1,189 +1,85 @@
-/**
- * useShare - 小程序分享 composable
- *
- * 两层 API 并存：
- *   - useShare(config)     —— SDK 层：直接注册 onShareAppMessage / onShareTimeline 钩子
- *   - useShareConfig(...)  —— 业务层：lazy load 后端配置 + cache + fallback resolver
- */
-import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
-import { ref } from 'vue';
-import { unwrapPayload, type AdapterPayload } from '../_internal/unwrap';
+import {
+    onShareAppMessage as registerShareAppMessage,
+    onShareTimeline as registerShareTimeline,
+} from "@dcloudio/uni-app";
 
-export interface ShareAppMessageContent {
-    /** 分享标题 */
+export interface ShareConfig {
     title?: string;
-    /** 分享路径，必须是以 / 开头的完整路径 */
     path?: string;
-    /** 自定义图片路径 */
     imageUrl?: string;
 }
 
-export interface ShareTimelineContent {
-    /** 朋友圈分享标题 */
-    title?: string;
-    /** 页面携带的 query 参数 */
-    query?: string;
-    /** 自定义图片路径 */
-    imageUrl?: string;
-}
-
-export interface ShareConfig extends ShareAppMessageContent {
-    /** 朋友圈专属配置，不填则复用朋友分享配置 */
-    timeline?: ShareTimelineContent;
-}
-
-/**
- * 分享来源。
- * - `button` 页面内转发按钮
- * - `menu` 右上角菜单
- */
-export type ShareFrom = 'button' | 'menu';
+export type ShareConfigResolver = ShareConfig | (() => ShareConfig);
 
-export type ShareConfigResolver = (from: ShareFrom) => ShareConfig;
-
-/**
- * 注册小程序分享钩子。
- */
-export function useShare(config: ShareConfig | ShareConfigResolver) {
-    /**
-     * 根据分享来源解析最终分享配置。
-     */
-    const resolve = (from: ShareFrom): ShareConfig =>
-        typeof config === 'function' ? config(from) : config;
-
-    /**
-     * 注册分享给朋友的回调。
-     */
-    onShareAppMessage((options: { from?: string } | undefined) => {
-        const resolved = resolve((options?.from as ShareFrom) ?? 'menu');
-        const payload: ShareAppMessageContent = {};
-        if (resolved.title !== undefined) payload.title = resolved.title;
-        if (resolved.path !== undefined) payload.path = resolved.path;
-        if (resolved.imageUrl !== undefined) payload.imageUrl = resolved.imageUrl;
-        return payload;
-    });
-
-    /**
-     * 注册分享到朋友圈的回调。
-     */
-    onShareTimeline(() => {
-        const resolved = resolve('menu');
-        const timeline = resolved.timeline ?? {};
-        const payload: ShareTimelineContent = {};
-        const title = timeline.title ?? resolved.title;
-        const imageUrl = timeline.imageUrl ?? resolved.imageUrl;
-        if (title !== undefined) payload.title = title;
-        if (timeline.query !== undefined) payload.query = timeline.query;
-        if (imageUrl !== undefined) payload.imageUrl = imageUrl;
-        return payload;
-    });
+export interface ShareHandlers {
+    onShareAppMessage: (config?: ShareConfigResolver) => void;
+    onShareTimeline: (config?: ShareConfigResolver) => void;
+    showShareMenu: () => void;
 }
 
-/* ============================================================
- * useShareConfig —— 业务层：lazy load 后端聚合配置 + cache + fallback resolver
- *
- * 后端按页面 key 聚合返回各页 title / image，前端拉一次缓存全局共用。
- * 返回的 resolver 同时喂给 onShareAppMessage 和 onShareTimeline。
- *
- * 使用方式：
- *
- *   1. App.vue / bootstrap 注入回调：
- *
- *      setConfigShare({
- *          getConfig: async () => {
- *              const res = await getShareConfig();
- *              return res.code === 1 ? res.data : null;
- *          },
- *      });
- *
- *   2. 任意页面 setup：
- *
- *      const share = useShareConfig("index", {
- *          title: "兜底标题",
- *          path: "/pages/index/index",
- *      });
- *      onShareAppMessage(share);
- *      onShareTimeline(share);
- * ============================================================ */
-
-/** 单页分享配置 */
-export interface PageShareItem {
-    title: string;
-    image: string;
+function resolveConfig(config?: ShareConfigResolver): ShareConfig {
+    return typeof config === "function" ? config() : (config ?? {});
 }
 
-/** 后端返回的页面 key → 配置映射 */
-export type ShareConfigMap = Record<string, PageShareItem>;
-
-/**
- * Adapter 注入接口 —— getConfig 支持「已解包」或「ThinkAdmin envelope」两种返回值。
- * 业务方可以直接传 envelope-returning 接口：setConfigShare({ getConfig: getShareConfig })
- */
-export interface ShareConfigAdapter {
-    getConfig: () => Promise<AdapterPayload<ShareConfigMap>>;
-}
-
-/** 页面声明的兜底文案 / 跳转路径 */
-export interface PageShareFallback {
-    /** 后端 title 为空时用 */
-    title: string;
-    /** 分享跳转路径（必须 / 开头）；path 不走后端，由页面自定义 */
-    path: string;
-    /** 后端 image 为空时用；通常留空让微信自动截图 */
-    image?: string;
+function buildPayload(base: ShareConfigResolver, extra?: ShareConfigResolver): ShareConfig {
+    const current = {
+        ...resolveConfig(base),
+        ...resolveConfig(extra),
+    };
+    const payload: ShareConfig = {};
+    if (current.title) payload.title = current.title;
+    if (current.path) payload.path = current.path;
+    if (current.imageUrl) payload.imageUrl = current.imageUrl;
+    return payload;
 }
 
-/** 分享 payload —— 同时喂给 onShareAppMessage / onShareTimeline */
-export interface SharePayload {
-    title: string;
-    path: string;
-    imageUrl?: string;
+function showShareMenu(): void {
+    const api = typeof uni !== "undefined" ? (uni as unknown as {
+        showShareMenu?: (options: {
+            withShareTicket?: boolean;
+            menus?: string[];
+            fail?: () => void;
+        }) => void;
+    }) : undefined;
+
+    api?.showShareMenu?.({
+        withShareTicket: true,
+        menus: ["shareAppMessage", "shareTimeline"],
+        fail: () => undefined,
+    });
 }
 
-let shareAdapter: ShareConfigAdapter | null = null;
-const shareCache = ref<ShareConfigMap | null>(null);
-let sharePending: Promise<void> | null = null;
+export function useShare(config: ShareConfigResolver = {}): ShareHandlers {
+    let appMessageRegistered = false;
+    let timelineRegistered = false;
 
-/**
- * 注入业务回调（应用启动时调用一次；不调用则始终用 fallback）。
- */
-export function setConfigShare(a: ShareConfigAdapter): void {
-    shareAdapter = a;
-}
+    const onShareAppMessage = (extra?: ShareConfigResolver) => {
+        if (appMessageRegistered) return;
+        appMessageRegistered = true;
+        showShareMenu();
+        registerShareAppMessage(() => buildPayload(config, extra));
+    };
 
-function loadShareConfig(): Promise<void> {
-    if (shareCache.value) return Promise.resolve();
-    if (sharePending) return sharePending;
-    if (!shareAdapter?.getConfig) {
-        console.warn("[useShareConfig] adapter.getConfig 未注入；先调用 setConfigShare()");
-        return Promise.resolve();
-    }
-    sharePending = shareAdapter.getConfig()
-        .then((raw) => {
-            const cfg = unwrapPayload(raw);
-            if (cfg) shareCache.value = cfg;
-        })
-        .catch((e) => {
-            console.warn("[useShareConfig] load failed", e);
-        })
-        .finally(() => {
-            sharePending = null;
+    const onShareTimeline = (extra?: ShareConfigResolver) => {
+        if (timelineRegistered) return;
+        timelineRegistered = true;
+        showShareMenu();
+        registerShareTimeline(() => {
+            const payload = buildPayload(config, extra);
+            return {
+                title: payload.title,
+                query: payload.path?.split("?")[1],
+                imageUrl: payload.imageUrl,
+            };
         });
-    return sharePending;
-}
+    };
+
+    onShareAppMessage();
+    onShareTimeline();
 
-/**
- * 业务级分享配置 helper —— 返回 resolver，可直接喂 onShareAppMessage / onShareTimeline。
- * 后端配置异步加载，加载完成前先用 fallback、加载完后自动切到后端值。
- */
-export function useShareConfig(pageKey: string, fallback: PageShareFallback) {
-    void loadShareConfig();
-    return (): SharePayload => {
-        const remote = shareCache.value?.[pageKey];
-        const title = remote?.title || fallback.title;
-        const image = remote?.image || fallback.image;
-        const payload: SharePayload = { title, path: fallback.path };
-        if (image) payload.imageUrl = image;
-        return payload;
+    return {
+        onShareAppMessage,
+        onShareTimeline,
+        showShareMenu,
     };
 }

package/src/composables/theme/index.ts

@@ -1,8 +1,6 @@
 import { computed } from "vue";
-import { useColor } from "@/composables/color";
 import { useThemeStore } from "../../stores/theme";
 
-const { varsToStyle } = useColor();
 import { getCurrentFontVars } from "./font";
 import { getCurrentThemeVars } from "./palette";
 
@@ -25,6 +23,10 @@ export function buildThemeStyle(): string {
     });
 }
 
+function varsToStyle(vars: Record<string, string>): string {
+    return Object.entries(vars).map(([key, value]) => `${key}:${value}`).join(";") + ";";
+}
+
 /**
  * 获取主题样式字符串，用于注入 <page-meta :page-style>。
  *

package/src/composables/theme/palette.ts

@@ -1,7 +1,3 @@
-import { useColor } from "@/composables/color";
-
-const { hexToRgba, darkenHex } = useColor();
-
 export interface ThemeColor {
     label: string;
     value: string;
@@ -65,3 +61,25 @@ export function getCurrentThemeVars(): Record<string, string> {
         "--info-dark": darkenHex(THEME_SEMANTIC_COLORS.info),
     };
 }
+
+const HEX_RE = /^#[0-9a-fA-F]{6}$/;
+
+function parseHex(hex: string): [number, number, number] {
+    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: string, alpha: number): string {
+    const [r, g, b] = parseHex(hex);
+    return `rgba(${r},${g},${b},${alpha})`;
+}
+
+function darkenHex(hex: string, amount = 0.15): string {
+    const [r, g, b] = parseHex(hex);
+    const darken = (value: number) => 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")}`;
+}

package/src/composables/utils/index.ts

@@ -2,160 +2,183 @@
  * 小程序通用工具。
  */
 
-export interface DownloadFileOptions {
-    /** 下载地址 */
+export interface DownloadOpt {
     url: string;
-    /** 文件保存路径，可选 */
-    filePath?: string;
-    /** HTTP 请求头，可选 */
+    path?: string;
     header?: Record<string, string>;
-    /** 下载进度回调，可选 */
-    onProgress?: (progress: number, totalBytesWritten: number, totalBytesExpectedToWrite: number) => void;
+    progress?: (value: number, done: number, total: number) => void;
 }
 
-export interface DownloadFileResult {
-    /** 是否成功 */
-    success: boolean;
-    /** 临时文件路径 */
-    tempFilePath?: string;
-    /** 状态码 */
-    statusCode?: number;
-    /** 错误信息 */
-    errMsg?: string;
+export interface DownloadRes {
+    ok: boolean;
+    path?: string;
+    code?: number;
+    msg?: string;
 }
 
-export type TapEvent = {
-    currentTarget?: { dataset?: Record<string, any> };
-    target?: { dataset?: Record<string, any> };
-};
+function withQuery(url: string, qs: string) {
+    if (!qs) return url;
+    return `${url}${url.includes("?") ? "&" : "?"}${qs}`;
+}
 
-/**
- * 剪贴板、下载与相册保存工具集合。
- */
-export function useUtils() {
-    /**
-     * 复制文本到剪贴板，可选显示成功提示。
-     * 也可直接作为 tap 事件处理函数，从 data-copy 读取文本。
-     */
-    function copy(data: string | TapEvent, showToast = true): Promise<boolean> {
-        if (typeof data !== "string") {
-            const dataset = data?.currentTarget?.dataset || data?.target?.dataset;
-            const text = dataset?.copy;
-            if (text == null || text === "") return Promise.resolve(false);
-            return copy(String(text), dataset?.copyToast !== "false");
-        }
+function toQuery(data: Record<string, unknown>) {
+    return Object.entries(data)
+        .filter(([, val]) => val !== undefined && val !== null)
+        .map(([key, val]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(val))}`)
+        .join("&");
+}
+
+function signText(url: string) {
+    const [path, qs] = url.split("?");
+    return qs ? `${qs.split("&").filter(Boolean).sort().join("&")}&` : `${path}&`;
+}
+
+function toNumber(val: unknown, def: number): number {
+    const next = Number(val);
+    return Number.isFinite(next) ? next : def;
+}
+
+function toBoolean(val: unknown, def: boolean): boolean {
+    if (typeof val === "boolean") return val;
+    if (val === 0 || val === "0") return false;
+    if (val === 1 || val === "1") return true;
+    return def;
+}
 
-        return new Promise((resolve) => {
+export function useUtils() {
+    function copy(text: string, tip = true): Promise<boolean> {
+        return new Promise((ok) => {
             uni.setClipboardData({
-                data,
+                data: text,
                 showToast: false,
                 success: () => {
-                    if (showToast) {
+                    if (tip) {
                         uni.showToast({ title: "复制成功", icon: "none", duration: 1500 });
                     }
-                    resolve(true);
+                    ok(true);
                 },
-                fail: () => resolve(false),
+                fail: () => ok(false),
             });
         });
     }
 
-    /**
-     * 从事件 dataset 的 data-copy 字段读取文本并复制。
-     */
-    function copyFromEvent(event: TapEvent) {
-        return copy(event);
-    }
-
-    /**
-     * 读取当前剪贴板文本内容。
-     */
     function paste(): Promise<string> {
-        return new Promise((resolve) => {
+        return new Promise((ok) => {
             uni.getClipboardData({
-                success: (res) => resolve(res.data),
-                fail: () => resolve(""),
+                success: (res) => ok(res.data),
+                fail: () => ok(""),
             });
         });
     }
 
-    /**
-     * 将本地图片保存到系统相册。
-     */
-    function saveImage(filePath: string): Promise<boolean> {
-        return new Promise((resolve) => {
+    function auth() {
+        uni.showModal({
+            title: "提示",
+            content: "需要授权相册权限",
+            confirmText: "去设置",
+            success: (res) => {
+                if (res.confirm) uni.openSetting();
+            },
+        });
+    }
+
+    function saveImage(path: string): Promise<boolean> {
+        return new Promise((ok) => {
             uni.saveImageToPhotosAlbum({
-                filePath,
+                filePath: path,
                 success: () => {
                     uni.showToast({ title: "保存成功", icon: "success" });
-                    resolve(true);
+                    ok(true);
                 },
                 fail: (err) => {
-                    if (err.errMsg.includes("auth deny") || err.errMsg.includes("authorize")) {
-                        uni.showModal({
-                            title: "提示",
-                            content: "需要授权相册权限",
-                            confirmText: "去设置",
-                            success: (res) => {
-                                if (res.confirm) uni.openSetting();
-                            },
-                        });
+                    const msg = String(err.errMsg || "");
+                    if (msg.includes("auth deny") || msg.includes("authorize")) {
+                        auth();
                     } else {
                         uni.showToast({ title: "保存失败", icon: "none" });
                     }
-                    resolve(false);
+                    ok(false);
                 },
             });
         });
     }
 
-    /**
-     * 下载文件并返回下载结果。
-     */
-    function downloadFile(options: DownloadFileOptions): Promise<DownloadFileResult> {
-        return new Promise((resolve) => {
+    function saveVideo(path: string): Promise<boolean> {
+        return new Promise((ok) => {
+            uni.saveVideoToPhotosAlbum({
+                filePath: path,
+                success: () => {
+                    uni.showToast({ title: "保存成功", icon: "success" });
+                    ok(true);
+                },
+                fail: (err) => {
+                    const msg = String(err.errMsg || "");
+                    if (msg.includes("auth deny") || msg.includes("authorize")) {
+                        auth();
+                    } else {
+                        uni.showToast({ title: "保存失败", icon: "none" });
+                    }
+                    ok(false);
+                },
+            });
+        });
+    }
+
+    function download(opt: DownloadOpt): Promise<DownloadRes> {
+        return new Promise((ok) => {
             const task = uni.downloadFile({
-                url: options.url,
-                filePath: options.filePath,
-                header: options.header,
+                url: opt.url,
+                filePath: opt.path,
+                header: opt.header,
                 success: (res) => {
                     if (res.statusCode === 200) {
-                        resolve({ success: true, tempFilePath: res.tempFilePath, statusCode: res.statusCode });
+                        ok({ ok: true, path: res.tempFilePath, code: res.statusCode });
                     } else {
-                        resolve({ success: false, statusCode: res.statusCode, errMsg: `下载失败，状态码：${res.statusCode}` });
+                        ok({ ok: false, code: res.statusCode, msg: `下载失败，状态码：${res.statusCode}` });
                     }
                 },
-                fail: (err) => resolve({ success: false, errMsg: err.errMsg }),
+                fail: (err) => ok({ ok: false, msg: err.errMsg }),
             });
 
-            if (options.onProgress) {
+            if (opt.progress) {
                 task.onProgressUpdate((res) => {
-                    options.onProgress!(res.progress, res.totalBytesWritten, res.totalBytesExpectedToWrite);
+                    opt.progress!(res.progress, res.totalBytesWritten, res.totalBytesExpectedToWrite);
                 });
             }
         });
     }
 
-    /**
-     * 下载远程图片并直接保存到相册。
-     */
-    async function downloadAndSaveImage(url: string, onProgress?: (progress: number) => void): Promise<boolean> {
+    async function saveImageUrl(url: string, progress?: (value: number) => void): Promise<boolean> {
         try {
             uni.showLoading({ title: "下载中...", mask: true });
+            const res = await download({ url, progress: progress ? (value) => progress(value) : undefined });
+            uni.hideLoading();
 
-            const result = await downloadFile({
-                url,
-                onProgress: onProgress ? (progress) => onProgress(progress) : undefined,
-            });
+            if (!res.ok || !res.path) {
+                uni.showToast({ title: res.msg || "下载失败", icon: "none" });
+                return false;
+            }
+
+            return await saveImage(res.path);
+        } catch {
+            uni.hideLoading();
+            uni.showToast({ title: "操作失败", icon: "none" });
+            return false;
+        }
+    }
 
+    async function saveVideoUrl(url: string, progress?: (value: number) => void): Promise<boolean> {
+        try {
+            uni.showLoading({ title: "下载中...", mask: true });
+            const res = await download({ url, progress: progress ? (value) => progress(value) : undefined });
             uni.hideLoading();
 
-            if (!result.success || !result.tempFilePath) {
-                uni.showToast({ title: result.errMsg || "下载失败", icon: "none" });
+            if (!res.ok || !res.path) {
+                uni.showToast({ title: res.msg || "下载失败", icon: "none" });
                 return false;
             }
 
-            return await saveImage(result.tempFilePath);
+            return await saveVideo(res.path);
         } catch {
             uni.hideLoading();
             uni.showToast({ title: "操作失败", icon: "none" });
@@ -163,5 +186,18 @@ export function useUtils() {
         }
     }
 
-    return { copy, copyFromEvent, paste, saveImage, downloadFile, downloadAndSaveImage };
+    return {
+        withQuery,
+        toQuery,
+        signText,
+        toNumber,
+        toBoolean,
+        copy,
+        paste,
+        saveImage,
+        saveVideo,
+        download,
+        saveImageUrl,
+        saveVideoUrl,
+    };
 }

package/src/hlw.ts

@@ -1,37 +1,29 @@
 /**
  * hlw - 全局命名空间工厂
- * 提供 $msg、$device、$http、$utils、$color 的统一访问入口。
- *
- * 注意：广告能力请直接 `import { useAd } from "@hlw-uni/mp-vue"`，不再通过 hlw.$ad 暴露。
+ * 提供 $msg、$device、$request、$utils 的统一访问入口。
  */
 import { useMsg } from '@/composables/msg';
 import { useDevice, type DeviceInfo } from '@/composables/device';
-import { http } from '@/composables/http';
+import { useRequest } from '@/composables/request';
 import { useUtils } from '@/composables/utils';
-import { useColor } from '@/composables/color';
 
 export interface HlwInstance {
   $msg: ReturnType<typeof useMsg>;
   $device: DeviceInfo;
-  $http: typeof http;
+  $request: ReturnType<typeof useRequest>;
   $utils: ReturnType<typeof useUtils>;
-  $color: ReturnType<typeof useColor>;
 }
 
 let _msg: ReturnType<typeof useMsg> | null = null;
-let _device: ReturnType<typeof useDevice> | null = null;
 let _utils: ReturnType<typeof useUtils> | null = null;
-let _color: ReturnType<typeof useColor> | null = null;
 
 export const hlw: HlwInstance = {
   /** 延迟创建消息提示实例。 */
   get $msg() { return (_msg ??= useMsg()); },
   /** 延迟读取并缓存设备信息。 */
-  get $device() { return (_device ??= useDevice()).value!; },
-  /** 复用全局 HTTP 实例。 */
-  $http: http,
+  get $device() { return useDevice().info; },
+  /** 复用全局请求实例。 */
+  $request: useRequest(),
   /** 延迟创建通用工具实例。 */
   get $utils() { return (_utils ??= useUtils()); },
-  /** 延迟创建颜色工具实例。 */
-  get $color() { return (_color ??= useColor()); },
 };