@hlw-uni/mp-vue 2.1.52 → 2.1.55

package/dist/app.d.ts

@@ -1,19 +1,7 @@
 import { App, Component } from 'vue';
 import { HlwInstance } from './hlw';
-import { HttpClient } from './composables/http';
+import { RequestClient } from './composables/request';
 
-export interface InterceptorOptions {
-    /** API 基础地址 */
-    baseURL?: string;
-    /** 自动注入 Token 的 header 键名 */
-    tokenHeader?: string;
-    /** Token 来源函数 */
-    getToken?: () => string;
-    /** 登录失效时的处理函数 */
-    onLogout?: () => void;
-    /** 接口业务错误码是否自动 toast */
-    autoToastError?: boolean;
-}
 /**
  * 创建 uni-app 应用入口工具。
  */
@@ -23,11 +11,5 @@ export declare function useApp(): {
     };
     use: (pluginOrInstaller: any) => void;
     hlw: HlwInstance;
-    http: HttpClient;
+    request: RequestClient;
 };
-/**
- * 注册默认请求、响应和错误拦截器。
- */
-export declare function setupInterceptors(options?: InterceptorOptions & {
-    sigSecret?: string;
-}): void;

package/dist/composables/ad/index.d.ts

@@ -1,78 +1,16 @@
-import { AdapterPayload } from '../_internal/unwrap';
-import { ComputedRef, Ref } from 'vue';
-
-/** 6 种广告类型 */
-export type AdType = "banner" | "grid" | "custom" | "video" | "reward" | "popup";
-/** 广告配置 —— 字段名跟后端表列名对齐（plugin_qz_mp.{type}_unit_id） */
-export interface AdConfig {
-    banner_unit_id: string;
-    grid_unit_id: string;
-    custom_unit_id: string;
-    video_unit_id: string;
-    reward_unit_id: string;
-    popup_unit_id: string;
-    /** VIP 屏蔽展示型广告（reward 除外）：0=否，1=屏蔽 banner/grid/custom/video/popup */
-    vip_no_ad?: 0 | 1;
-}
-/** 广告错误对象（onError 回调参数） */
-export interface AdError {
-    errCode: number;
-    errMsg: string;
-}
 /**
- * 业务回调注入接口 —— setConfigAd 时由项目提供。
- *
- * getConfig 支持两种返回：
- *   - 已解包：直接返回 AdConfig 或 null
- *   - ThinkAdmin envelope：返回 { code, data } 对象，库自动按 code===1 解包
- *
- * 业务方可以直接传 envelope-returning 的接口函数引用：
- *   setConfigAd({ getConfig: getAdConfig })
+ * 小程序广告工具。
  */
-export interface AdAdapter {
-    getConfig: () => Promise<AdapterPayload<AdConfig>>;
-    /** 是否已登录；不传 = 不校验（showReward 调用前会问一次） */
-    isAuth?: () => boolean;
-    /** 是否 VIP；配合 config.vip_no_ad=1 时屏蔽展示型广告（reward 不受影响） */
-    isVip?: () => boolean;
-    /**
-     * 用户级强制屏蔽：返回 true 直接屏蔽展示型广告（reward 不受影响），
-     * 优先级高于 mp.vip_no_ad + isVip 的联合判断；不传 = 不强制。
-     */
-    userNoAd?: () => boolean;
+export interface AdRes {
+    ok: boolean;
+    isEnded?: boolean;
+    err?: unknown;
 }
-/** 激励视频关闭回调返回 */
-export interface AdCloseResult {
-    /** 用户是否完整观看 */
-    isEnded: boolean;
-}
-/**
- * 注入业务回调，应用启动时调用一次。
- * 不调用也不会崩，但 loadConfig / showReward 会无效。
- */
-export declare function setConfigAd(a: AdAdapter): void;
-export declare function useAd(): {
-    config: ComputedRef<AdConfig>;
-    loaded: Ref<boolean, boolean>;
-    loadConfig: (force?: boolean) => Promise<void>;
-    getUnitId: (type: AdType) => string;
-    showReward: (onClose?: ((res: AdCloseResult) => void | Promise<void>) | undefined) => Promise<void>;
-    showPopup: (delayMs?: number) => Promise<boolean>;
-    confirm: typeof confirmModal;
+type AdDone = (res: AdRes) => void;
+export declare function useHlwAd(): {
+    setAdPopup: (adId: string, done?: ((ok: boolean) => void) | undefined) => boolean;
+    showAdPopup: (delay?: number) => Promise<boolean>;
+    setAdReward: (adId: string, done?: AdDone) => Promise<AdRes>;
+    showAdReward: () => Promise<AdRes>;
 };
-/**
- * 激励视频中途关闭挽留弹窗 —— 通过 useAd().confirm 暴露给业务方：
- *
- *   const { showReward, confirm } = useAd();
- *   showReward(async ({ isEnded }) => {
- *       if (!isEnded) return { ok: false, retry: await confirm() };
- *       const r = await claimAdReward();
- *       return r.code === 1 ? { ok: true, reward: r.data?.reward } : { ok: false, msg: r.info };
- *   });
- *
- * @returns true=用户选「继续观看」 / false=放弃
- */
-declare function confirmModal(): Promise<boolean>;
-/** 销毁全部广告实例并清空缓存（业务一般不用，hot reload 时调） */
-export declare function destroyAds(): void;
 export {};

package/dist/composables/device/index.d.ts

@@ -1,4 +1,3 @@
-import { Ref } from 'vue';
 export interface DeviceInfo {
     /** 小程序 appId */
     appid: string;
@@ -57,73 +56,9 @@ export interface DeviceInfo {
     /** 客户端版本号 */
     version: string;
 }
-/**
- * 获取单例缓存的设备信息。
- */
-export declare function useDevice(): Ref<{
-    appid: string;
-    app_name: string;
-    app_version: string;
-    app_version_code: string;
-    app_channel: string;
-    device_brand: string;
-    device_model: string;
-    device_id: string;
-    device_type: string;
-    device_orientation: "portrait" | "landscape";
-    brand: string;
-    model: string;
-    system: string;
-    os: string;
-    pixel_ratio: number;
-    screen_width: number;
-    screen_height: number;
-    window_width: number;
-    window_height: number;
-    status_bar_height: number;
-    sdk_version: string;
-    host_name: string;
-    host_version: string;
-    host_language: string;
-    host_theme: string;
-    platform: string;
-    language: string;
-    version: string;
-} | null, DeviceInfo | {
-    appid: string;
-    app_name: string;
-    app_version: string;
-    app_version_code: string;
-    app_channel: string;
-    device_brand: string;
-    device_model: string;
-    device_id: string;
-    device_type: string;
-    device_orientation: "portrait" | "landscape";
-    brand: string;
-    model: string;
-    system: string;
-    os: string;
-    pixel_ratio: number;
-    screen_width: number;
-    screen_height: number;
-    window_width: number;
-    window_height: number;
-    status_bar_height: number;
-    sdk_version: string;
-    host_name: string;
-    host_version: string;
-    host_language: string;
-    host_theme: string;
-    platform: string;
-    language: string;
-    version: string;
-} | null>;
-/**
- * 把 deviceInfo 对象转成 URL query string（不含前导 ?）
- */
-export declare function deviceToQuery(): string;
-/**
- * 手动清除缓存（切换账号等场景可能需要）
- */
+export type DeviceQueryInfo = Pick<DeviceInfo, "appid" | "device_brand" | "device_model" | "device_id" | "device_type" | "device_orientation" | "platform" | "system" | "os" | "version" | "sdk_version" | "host_name" | "host_version" | "host_language" | "language" | "app_version" | "app_version_code" | "screen_width" | "screen_height">;
+export declare function useDevice(): {
+    info: DeviceInfo;
+    query: string;
+};
 export declare function clearDeviceCache(): void;

package/dist/composables/index.d.ts

@@ -1,22 +1,14 @@
 /**
  * Composables 统一导出
  */
-export * from './http';
-export { useLoading } from './loading';
+export * from './request';
 export { useMsg, type HlwMsg, type ToastOptions, type ModalOptions, type ToastIcon } from './msg';
-export { useDevice, deviceToQuery, clearDeviceCache, type DeviceInfo } from './device';
+export { useDevice, clearDeviceCache, type DeviceInfo, type DeviceQueryInfo, } from './device';
 export { useRefs } from './refs';
-export { usePageMeta } from './page-meta';
-export { useStorage, type StorageInstance } from './storage';
-export { useValidate } from './validate';
-export { useFormat } from './format';
-export { useAd, setConfigAd, destroyAds, type AdType, type AdConfig, type AdError, type AdAdapter, type AdCloseResult, } from './ad';
-export { useShare, useShareConfig, setConfigShare, type ShareConfig, type ShareConfigResolver, type ShareFrom, type ShareAppMessageContent, type ShareTimelineContent, type ShareConfigMap, type ShareConfigAdapter, type PageShareItem, type PageShareFallback, type SharePayload, } from './share';
-export { useContact, setConfigContact, type ContactConfig, type ContactAdapter, type ContactBindProps, } from './contact';
-export { useUtils, type DownloadFileOptions, type DownloadFileResult, type TapEvent } from './utils';
-export { useColor } from './color';
-export { useRouter, type NavigateType, type NavigateOptions } from './navigator';
-export { useUuid } from './algo';
+export { useShare, type ShareConfig, } from './share';
+export { useHlwAd, type AdRes } from './ad';
+export { useUtils, 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';

package/dist/composables/navigator/index.d.ts

@@ -1,47 +1,23 @@
 /**
- * 路由/跳转能力 —— 包装 uni-app 各类 jump API 为一个统一对象
- *
- * 使用：
- *   const { navigate } = useRouter();
- *   navigate(tool.jump_type, tool.jump_value);
- *
- * 未装 vue-router 也能用；命名风格对齐 Vue Router，熟悉的 push/replace/back
- * 会在后续迭代中补齐。
+ * useNavigate - uni-app 跳转工具
  */
-/** 已知的跳转类型；保留 `(string & {})` 允许任意自定义值向下兼容 */
-export type NavigateType = "navigateTo" | "redirectTo" | "switchTab" | "reLaunch" | "webview" | "miniprogram" | (string & {});
+export type NavigateType = "navigateTo" | "redirectTo" | "switchTab" | "reLaunch" | "navigateBack" | "miniprogram" | "webview" | (string & {});
 export interface NavigateOptions {
-    /** 失败回调，收到 uni 返回的错误信息 */
-    onFail?: (errMsg: string) => void;
-    /** 是否禁用默认的 Toast 错误提示，默认 false */
     silent?: boolean;
-    /** 仅 miniprogram：目标小程序的页面路径（如 pages/index/index?id=1），留空/null 则打开首页 */
-    path?: string | null;
-    /** 仅 miniprogram：目标小程序版本，默认 release */
+    onFail?: (message: string) => void;
+    delta?: number;
+    path?: string;
     envVersion?: "develop" | "trial" | "release";
-    /** 仅 miniprogram：传给目标小程序的额外数据，对方从 onLaunch/onShow 读取 */
-    extraData?: Record<string, unknown> | null;
+    extraData?: Record<string, unknown>;
 }
-/**
- * 根据 type + value 调用对应的 uni API，屏蔽参数差异。
- *
- * 对应关系：
- * - `navigateTo`（默认） → uni.navigateTo
- * - `redirectTo`          → uni.redirectTo
- * - `switchTab`           → uni.switchTab（value 必须是 tabBar 页）
- * - `reLaunch`            → uni.reLaunch
- * - `webview`             → 默认 Toast 提示，上层需接入 web-view 承载页
- * - `miniprogram`         → uni.navigateToMiniProgram，value 格式 `appid:path`
- */
-declare function doNavigate(type: NavigateType, value: string, options?: NavigateOptions): void;
-/**
- * 路由 composable：返回跳转方法集合。
- *
- * @example
- *   const { navigate } = useRouter();
- *   navigate("switchTab", "/pages/index/index");
- */
-export declare function useRouter(): {
-    navigate: typeof doNavigate;
+declare function navigate(type?: NavigateType, url?: string, options?: NavigateOptions): void;
+export declare function useNavigate(): {
+    navigate: typeof navigate;
+    to: (url: string, options?: NavigateOptions) => void;
+    redirect: (url: string, options?: NavigateOptions) => void;
+    tab: (url: string, options?: NavigateOptions) => void;
+    reLaunch: (url: string, options?: NavigateOptions) => void;
+    back: (delta?: number, options?: NavigateOptions) => void;
+    miniProgram: (appId: string, options?: NavigateOptions) => void;
 };
 export {};

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

@@ -0,0 +1,21 @@
+import { ApiResponse, ErrorInterceptor, RequestConfig, RequestInterceptor, ResponseInterceptor, UploadConfig, UploadResult } from './types';
+import { Ref } from 'vue';
+
+export interface RequestClient {
+    request<T = unknown>(config: RequestConfig): Promise<ApiResponse<T>>;
+    get<T = unknown>(url: string, data?: unknown): Promise<ApiResponse<T>>;
+    post<T = unknown>(url: string, data?: unknown): Promise<ApiResponse<T>>;
+    put<T = unknown>(url: string, data?: unknown): Promise<ApiResponse<T>>;
+    del<T = unknown>(url: string, data?: unknown): Promise<ApiResponse<T>>;
+    upload(config: UploadConfig): Promise<UploadResult>;
+    setBaseURL(url: string): void;
+    resolveServiceUrl(namespace: string, url: string, servicePrefix?: string): string;
+    onRequest(fn: RequestInterceptor): () => void;
+    onResponse<T = unknown>(fn: ResponseInterceptor<T>): () => void;
+    onError(fn: ErrorInterceptor): () => void;
+}
+export declare function useRequest(): RequestClient;
+export declare function useUpload(): {
+    uploading: Ref<boolean, boolean>;
+    upload: (options: UploadConfig) => Promise<UploadResult>;
+};

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

@@ -0,0 +1,6 @@
+export { useRequest, useUpload } from './client';
+export { BaseService, ServiceNamespace, ServicePrefix } from './service';
+export type { RequestClient } from './client';
+export type { ApiResponse, PageResult, RequestConfig, RequestInterceptor, ResponseInterceptor, ErrorInterceptor, UploadConfig, UploadResult, } from './types';
+export type { ServiceNamespaceOptions, ServicePrefixOptions, ServiceRequestConfig } from './service';
+export * from './adapters';

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

@@ -0,0 +1,30 @@
+import { ApiResponse, RequestConfig } from './types';
+
+export type ServiceRequestConfig = Omit<RequestConfig, "url"> & {
+    url: string;
+};
+export interface ServiceNamespaceOptions {
+    namespace: string;
+}
+export interface ServicePrefixOptions {
+    prefix: string;
+}
+export declare class BaseService {
+    namespace: string;
+    servicePrefix: string;
+    request<T = unknown>(options: ServiceRequestConfig): Promise<ApiResponse<T>>;
+    get<T = unknown>(url: string, data?: unknown): Promise<ApiResponse<T>>;
+    post<T = unknown>(url: string, data?: unknown): Promise<ApiResponse<T>>;
+    put<T = unknown>(url: string, data?: unknown): Promise<ApiResponse<T>>;
+    del<T = unknown>(url: string, data?: unknown): Promise<ApiResponse<T>>;
+}
+export declare function ServiceNamespace(value: string | ServiceNamespaceOptions): (target: {
+    prototype: {
+        namespace?: string;
+    };
+}) => void;
+export declare function ServicePrefix(value: string | ServicePrefixOptions): (target: {
+    prototype: {
+        servicePrefix?: string;
+    };
+}) => void;

package/dist/composables/{http → request}/types.d.ts

@@ -1,6 +1,3 @@
-/**
- * HTTP 类型定义
- */
 /** API 统一响应格式 */
 export interface ApiResponse<T = unknown> {
     code: number;

package/dist/composables/share/index.d.ts

@@ -1,71 +1,12 @@
-import { AdapterPayload } from '../_internal/unwrap';
-
-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 = (from: ShareFrom) => ShareConfig;
-/**
- * 注册小程序分享钩子。
- */
-export declare function useShare(config: ShareConfig | ShareConfigResolver): void;
-/** 单页分享配置 */
-export interface PageShareItem {
-    title: string;
-    image: string;
-}
-/** 后端返回的页面 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;
-}
-/** 分享 payload —— 同时喂给 onShareAppMessage / onShareTimeline */
-export interface SharePayload {
-    title: string;
-    path: string;
-    imageUrl?: string;
+export type ShareConfigResolver = ShareConfig | (() => ShareConfig);
+export interface ShareHandlers {
+    onShareAppMessage: (config?: ShareConfigResolver) => void;
+    onShareTimeline: (config?: ShareConfigResolver) => void;
+    showShareMenu: () => void;
 }
-/**
- * 注入业务回调（应用启动时调用一次；不调用则始终用 fallback）。
- */
-export declare function setConfigShare(a: ShareConfigAdapter): void;
-/**
- * 业务级分享配置 helper —— 返回 resolver，可直接喂 onShareAppMessage / onShareTimeline。
- * 后端配置异步加载，加载完成前先用 fallback、加载完后自动切到后端值。
- */
-export declare function useShareConfig(pageKey: string, fallback: PageShareFallback): () => SharePayload;
+export declare function useShare(config?: ShareConfigResolver): ShareHandlers;

package/dist/composables/utils/index.d.ts

@@ -1,42 +1,35 @@
 /**
  * 小程序通用工具。
  */
-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>;
-    };
-};
-/**
- * 剪贴板、下载与相册保存工具集合。
- */
+declare function withQuery(url: string, qs: string): string;
+declare function toQuery(data: Record<string, unknown>): string;
+declare function signText(url: string): string;
+declare function toNumber(val: unknown, def: number): number;
+declare function toBoolean(val: unknown, def: boolean): boolean;
 export declare function useUtils(): {
-    copy: (data: string | TapEvent, showToast?: boolean) => Promise<boolean>;
-    copyFromEvent: (event: TapEvent) => Promise<boolean>;
+    withQuery: typeof withQuery;
+    toQuery: typeof toQuery;
+    signText: typeof signText;
+    toNumber: typeof toNumber;
+    toBoolean: typeof toBoolean;
+    copy: (text: string, tip?: boolean) => Promise<boolean>;
     paste: () => Promise<string>;
-    saveImage: (filePath: string) => Promise<boolean>;
-    downloadFile: (options: DownloadFileOptions) => Promise<DownloadFileResult>;
-    downloadAndSaveImage: (url: string, onProgress?: ((progress: number) => void) | undefined) => Promise<boolean>;
+    saveImage: (path: string) => Promise<boolean>;
+    saveVideo: (path: string) => Promise<boolean>;
+    download: (opt: DownloadOpt) => Promise<DownloadRes>;
+    saveImageUrl: (url: string, progress?: ((value: number) => void) | undefined) => Promise<boolean>;
+    saveVideoUrl: (url: string, progress?: ((value: number) => void) | undefined) => Promise<boolean>;
 };
+export {};

package/dist/hlw.d.ts

@@ -1,14 +1,12 @@
 import { useMsg } from './composables/msg';
 import { 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>;
 }
 export declare const hlw: HlwInstance;

package/dist/index.d.ts

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