@movk/nuxt 1.2.0 → 1.3.0

package/dist/runtime/composables/useDateFormatter.d.ts

@@ -1,5 +1,7 @@
+import { CalendarDate } from '@internationalized/date';
 import type { DateValue } from '@internationalized/date';
 import type { DateRange } from 'reka-ui';
+export type ValueFormat = 'date-value' | 'iso' | 'timestamp' | 'unix' | 'date';
 /**
  * 日期格式化器配置选项
  */
@@ -55,9 +57,17 @@ export declare function useDateFormatter(options?: DateFormatterOptions): {
     toDate: (date: DateValue | undefined | null) => Date | null;
     toTimestamp: (date: DateValue | undefined | null) => number | null;
     toUnixTimestamp: (date: DateValue | undefined | null) => number | null;
-    parse: (value: string) => import("@internationalized/date").CalendarDate | import("@internationalized/date").CalendarDateTime | import("@internationalized/date").ZonedDateTime | null;
+    toFormat: (date: DateValue | undefined | null, format: ValueFormat) => unknown;
+    fromISO: (value: string | undefined | null) => DateValue | null;
+    fromDate: (value: Date | undefined | null) => CalendarDate | null;
+    fromTimestamp: (value: number | undefined | null) => CalendarDate | null;
+    fromUnixTimestamp: (value: number | undefined | null) => CalendarDate | null;
+    fromFormat: (value: unknown, format: ValueFormat) => DateValue | null;
+    parse: (value: string) => CalendarDate | import("@internationalized/date").CalendarDateTime | import("@internationalized/date").ZonedDateTime | null;
     convertData: <T>(data: T, converter: (value: DateValue) => unknown) => T;
-    getToday: () => import("@internationalized/date").CalendarDate;
+    convertToFormat: <T>(data: T, format: ValueFormat) => unknown;
+    convertFromFormat: <T>(data: T, format: ValueFormat) => unknown;
+    getToday: () => CalendarDate;
     getNow: () => import("@internationalized/date").ZonedDateTime;
     getStartOfWeek: (date: DateValue) => DateValue;
     getEndOfWeek: (date: DateValue) => DateValue;
@@ -82,4 +92,7 @@ export declare function useDateFormatter(options?: DateFormatterOptions): {
     locale: string;
     timeZone: string;
 };
-export {};
+export { CalendarDate } from '@internationalized/date';
+export type DateFormatter = ReturnType<typeof useDateFormatter>;
+export type { AnyCalendarDate, Calendar, CalendarDateTime, DateDuration, DateFields, DateValue, Time, ZonedDateTime } from '@internationalized/date';
+export type { DateRange } from 'reka-ui';

package/dist/runtime/composables/useDateFormatter.js

@@ -1,5 +1,6 @@
 import {
-  DateFormatter,
+  CalendarDate,
+  DateFormatter as IntlDateFormatter,
   getLocalTimeZone,
   today,
   now,
@@ -23,6 +24,13 @@ import {
 } from "@internationalized/date";
 const DEFAULT_LOCALE = "zh-CN";
 const DEFAULT_FORMAT_OPTIONS = { dateStyle: "medium" };
+function safe(fn, fallback) {
+  try {
+    return fn();
+  } catch {
+    return fallback;
+  }
+}
 function isDateValue(value) {
   return value !== null && value !== void 0 && typeof value === "object" && "calendar" in value && "year" in value && "month" in value && "day" in value;
 }
@@ -33,14 +41,10 @@ export function useDateFormatter(options = {}) {
   const locale = options.locale ?? DEFAULT_LOCALE;
   const formatOptions = options.formatOptions ?? DEFAULT_FORMAT_OPTIONS;
   const timeZone = options.timeZone ?? getLocalTimeZone();
-  const formatter = new DateFormatter(locale, { ...formatOptions, timeZone });
+  const formatter = new IntlDateFormatter(locale, { ...formatOptions, timeZone });
   function format(date) {
     if (!date) return "";
-    try {
-      return formatter.format(date.toDate(timeZone));
-    } catch {
-      return "";
-    }
+    return safe(() => formatter.format(date.toDate(timeZone)), "");
   }
   function formatRange(start, end, separator = " - ") {
     if (!start || !end) return "";
@@ -52,19 +56,11 @@ export function useDateFormatter(options = {}) {
   }
   function toISO(date) {
     if (!date) return "";
-    try {
-      return date.toString();
-    } catch {
-      return "";
-    }
+    return safe(() => date.toString(), "");
   }
   function toDate(date) {
     if (!date) return null;
-    try {
-      return new Date(Date.UTC(date.year, date.month - 1, date.day));
-    } catch {
-      return null;
-    }
+    return safe(() => new Date(Date.UTC(date.year, date.month - 1, date.day)), null);
   }
   function toTimestamp(date) {
     const jsDate = toDate(date);
@@ -72,7 +68,67 @@ export function useDateFormatter(options = {}) {
   }
   function toUnixTimestamp(date) {
     const timestamp = toTimestamp(date);
-    return timestamp ? Math.floor(timestamp / 1e3) : null;
+    return timestamp === null ? null : Math.floor(timestamp / 1e3);
+  }
+  function toFormat(date, format2) {
+    if (!date) return void 0;
+    switch (format2) {
+      case "date-value":
+        return date;
+      case "iso":
+        return toISO(date);
+      case "timestamp":
+        return toTimestamp(date);
+      case "unix":
+        return toUnixTimestamp(date);
+      case "date":
+        return toDate(date);
+    }
+  }
+  function convertToFormat(data, format2) {
+    if (format2 === "date-value") return data;
+    return convertData(data, (value) => toFormat(value, format2));
+  }
+  function fromDate(value) {
+    if (!value || Number.isNaN(value.getTime())) return null;
+    return safe(
+      () => new CalendarDate(value.getUTCFullYear(), value.getUTCMonth() + 1, value.getUTCDate()),
+      null
+    );
+  }
+  function fromTimestamp(value) {
+    if (value === null || value === void 0 || Number.isNaN(value)) return null;
+    return fromDate(new Date(value));
+  }
+  function fromUnixTimestamp(value) {
+    if (value === null || value === void 0 || Number.isNaN(value)) return null;
+    return fromTimestamp(value * 1e3);
+  }
+  function fromISO(value) {
+    if (!value) return null;
+    return parse(value);
+  }
+  function fromFormat(value, format2) {
+    if (value === null || value === void 0) return null;
+    if (format2 === "date-value") return isDateValue(value) ? value : null;
+    if (format2 === "iso") return typeof value === "string" ? fromISO(value) : null;
+    if (format2 === "timestamp") return typeof value === "number" ? fromTimestamp(value) : null;
+    if (format2 === "unix") return typeof value === "number" ? fromUnixTimestamp(value) : null;
+    if (format2 === "date") return value instanceof Date ? fromDate(value) : null;
+    return null;
+  }
+  function convertFromFormat(data, format2) {
+    if (data === null || data === void 0) return data;
+    if (format2 === "date-value") return data;
+    if (Array.isArray(data)) return data.map((item) => convertFromFormat(item, format2));
+    if (typeof data === "object" && "start" in data && "end" in data) {
+      const range = data;
+      return {
+        start: range.start === void 0 || range.start === null ? range.start : fromFormat(range.start, format2),
+        end: range.end === void 0 || range.end === null ? range.end : fromFormat(range.end, format2)
+      };
+    }
+    return fromFormat(data, format2);
   }
   function getToday() {
     return today(timeZone);
@@ -112,12 +168,10 @@ export function useDateFormatter(options = {}) {
     return getDayOfWeek(date, locale);
   }
   function getDayOfWeekName(date, style = "long") {
-    try {
-      const weekdayFormatter = new DateFormatter(locale, { weekday: style, timeZone });
+    return safe(() => {
+      const weekdayFormatter = new IntlDateFormatter(locale, { weekday: style, timeZone });
       return weekdayFormatter.format(date.toDate(timeZone));
-    } catch {
-      return "";
-    }
+    }, "");
   }
   function getWeeksInMonthNumber(date) {
     return getWeeksInMonth(date, locale);
@@ -156,13 +210,9 @@ export function useDateFormatter(options = {}) {
       return data.map((item) => convertData(item, converter));
     }
     if (typeof data === "object") {
-      const result = {};
-      for (const key in data) {
-        if (Object.prototype.hasOwnProperty.call(data, key)) {
-          result[key] = convertData(data[key], converter);
-        }
-      }
-      return result;
+      return Object.fromEntries(
+        Object.entries(data).map(([k, v]) => [k, convertData(v, converter)])
+      );
     }
     return data;
   }
@@ -183,8 +233,16 @@ export function useDateFormatter(options = {}) {
     toDate,
     toTimestamp,
     toUnixTimestamp,
+    toFormat,
+    fromISO,
+    fromDate,
+    fromTimestamp,
+    fromUnixTimestamp,
+    fromFormat,
     parse,
     convertData,
+    convertToFormat,
+    convertFromFormat,
     getToday,
     getNow,
     getStartOfWeek,
@@ -211,3 +269,4 @@ export function useDateFormatter(options = {}) {
     timeZone
   };
 }
+export { CalendarDate } from "@internationalized/date";

package/dist/runtime/composables/useDownloadWithProgress.d.ts

@@ -1,48 +1,47 @@
-import type { RequestToastOptions } from '../types/api.js';
+import type { NitroFetchRequest } from 'nitropack/types';
+import type { ApiError, TransferRequestOptions, TransferResult } from '../types/api';
 /**
- * 下载选项(带进度监控)
+ * 下载选项（带进度监控）
  */
-export interface DownloadWithProgressOptions {
-    /** 自定义文件名，不提供时从响应头提取 */
+export interface DownloadWithProgressOptions extends TransferRequestOptions {
+    /** HTTP 方法 @defaultValue 'GET' */
+    method?: RequestInit['method'];
+    /** 请求体，非 GET 时若非 string 自动序列化为 JSON */
+    body?: RequestInit['body'] | Record<string, unknown>;
+    /** 自定义文件名，不提供时从响应头或 URL 提取 */
     filename?: string;
-    /** 额外的请求头 */
-    headers?: Record<string, string>;
-    /** Toast 配置 */
-    toast?: RequestToastOptions | false;
-    /** 端点名称 */
-    endpoint?: string;
-    /** 下载成功回调 */
+    /** 下载成功回调（文件名） */
     onSuccess?: (filename: string) => void;
-    /** 下载失败回调 */
-    onError?: (error: Error) => void;
+    /** 下载失败回调；中止时不触发 */
+    onError?: (error: ApiError | Error) => void;
 }
 /**
- * 带进度监控的文件下载 composable
+ * 带进度监控的文件下载 composable（仅客户端）
  *
- * 基于原生 fetch + ReadableStream 实现，支持实时进度和取消下载
+ * @description 基于原生 fetch + ReadableStream 实现，复用 `@movk/nuxt` 的端点/认证/业务校验/toast/hook 体系。
+ *  - 后端返回 JSON 时按业务码校验，错误不会触发文件下载
+ *  - 后端无 content-length 时 progress 为 null，UI 据此切 indeterminate
  *
  * @example
  * ```ts
- * const { progress, downloading, download, abort } = useDownloadWithProgress()
+ * const { progress, status, error, download, abort } = useDownloadWithProgress()
  *
- * await download('/api/export', {
- *   filename: 'report.pdf',
- *   onSuccess: (name) => console.log('下载成功:', name)
+ * const { data, error: err, aborted } = await download('/api/export', {
+ *   filename: 'report.pdf'
  * })
  * ```
  */
-export declare function useDownloadWithProgress(): {
-    /** 下载进度 (0-100) */
+export declare function useDownloadWithProgress<T = Blob>(): {
+    /** 下载进度 0-100；后端未返回 content-length 时为 null（不确定） */
     progress: any;
-    /** 是否正在下载 */
-    downloading: any;
+    /** 传输状态 */
+    status: any;
+    /** 业务数据（默认 Blob；JSON 响应时为解包后的业务数据） */
+    data: any;
     /** 错误信息 */
     error: any;
     /** 执行下载 */
-    download: (url: string, options?: DownloadWithProgressOptions) => Promise<{
-        success: boolean;
-        error: Error | null;
-    }>;
+    download: (url: NitroFetchRequest, options?: DownloadWithProgressOptions) => Promise<TransferResult<T>>;
     /** 中止下载 */
     abort: () => void;
 };

package/dist/runtime/composables/useDownloadWithProgress.js

@@ -1,41 +1,135 @@
-import { ref, useRuntimeConfig } from "#imports";
-import { extractFilename, triggerDownload } from "@movk/core";
-import { showToast, extractToastMessage, getAuthHeaders, resolveEndpointConfig } from "../utils/api-utils.js";
+import { ref, useNuxtApp, useRuntimeConfig } from "#imports";
+import { triggerDownload } from "@movk/core";
+import {
+  buildFetchContext,
+  finalizeTransfer,
+  prepareTransfer,
+  resolveFilename,
+  tryParseJsonResponse
+} from "../domains/api/transfer.js";
 export function useDownloadWithProgress() {
   const publicConfig = useRuntimeConfig().public.movkApi;
+  const nuxtApp = useNuxtApp();
   const progress = ref(0);
-  const downloading = ref(false);
+  const status = ref("idle");
+  const data = ref(null);
   const error = ref(null);
-  let abortController = null;
+  let controller = null;
   const abort = () => {
-    abortController?.abort();
-    abortController = null;
-    downloading.value = false;
+    controller?.abort();
+    controller = null;
+    status.value = "aborted";
     progress.value = 0;
   };
   const download = async (url, options = {}) => {
-    const { filename, headers = {}, toast, endpoint, onSuccess, onError } = options;
-    const config = resolveEndpointConfig(publicConfig, endpoint);
-    const fullUrl = `${config.baseURL}${url}`;
+    const {
+      method = "GET",
+      body,
+      filename,
+      headers: userHeaders,
+      toast,
+      endpoint,
+      skipBusinessCheck,
+      onSuccess,
+      onError
+    } = options;
+    const urlStr = typeof url === "string" ? url : url.url;
+    const { fullUrl, headers, config } = prepareTransfer(publicConfig, urlStr, {
+      endpoint,
+      headers: userHeaders,
+      toast,
+      skipBusinessCheck
+    });
     progress.value = 0;
-    downloading.value = true;
+    status.value = "pending";
+    data.value = null;
     error.value = null;
-    abortController = new AbortController();
+    controller = new AbortController();
+    const fetchInit = {
+      method,
+      headers,
+      signal: controller.signal
+    };
+    if (method && method !== "GET" && body !== void 0 && body !== null) {
+      const isBodyInit = typeof body === "string" || body instanceof Blob || body instanceof FormData || body instanceof URLSearchParams || body instanceof ArrayBuffer || body instanceof ReadableStream || ArrayBuffer.isView(body);
+      if (isBodyInit) {
+        fetchInit.body = body;
+      } else {
+        fetchInit.body = JSON.stringify(body);
+        if (!("content-type" in headers) && !("Content-Type" in headers)) {
+          fetchInit.headers["Content-Type"] = "application/json";
+        }
+      }
+    }
     try {
-      const authHeaders = getAuthHeaders(config);
-      const response = await fetch(fullUrl, {
-        method: "GET",
-        headers: { ...headers, ...authHeaders },
-        signal: abortController.signal
+      const response = await fetch(fullUrl, fetchInit);
+      const fetchContext = buildFetchContext(fullUrl, { context: { toast, skipBusinessCheck } }, {
+        status: response.status,
+        headers: response.headers
       });
+      const contentType = response.headers.get("content-type") || "";
+      const isJson = contentType.toLowerCase().includes("application/json");
       if (!response.ok) {
-        throw new Error(`\u4E0B\u8F7D\u5931\u8D25: ${response.status} ${response.statusText}`);
+        if (isJson) {
+          const text = await response.text();
+          const raw = tryParseJsonResponse(response.headers, text);
+          const result3 = await finalizeTransfer(nuxtApp, {
+            raw,
+            fallback: { isSuccess: false, data: null, message: `HTTP ${response.status}` },
+            config,
+            publicConfig,
+            requestToast: toast,
+            skipBusinessCheck,
+            fetchContext
+          });
+          status.value = "error";
+          error.value = result3.error;
+          onError?.(result3.error);
+          return result3;
+        }
+        const result2 = await finalizeTransfer(nuxtApp, {
+          raw: null,
+          fallback: { isSuccess: false, data: null, message: `HTTP ${response.status} ${response.statusText}` },
+          config,
+          publicConfig,
+          requestToast: toast,
+          fetchContext
+        });
+        status.value = "error";
+        error.value = result2.error;
+        onError?.(result2.error);
+        return result2;
+      }
+      if (isJson) {
+        const text = await response.text();
+        const raw = tryParseJsonResponse(response.headers, text);
+        const result2 = await finalizeTransfer(nuxtApp, {
+          raw,
+          fallback: { isSuccess: false, data: null, message: "\u54CD\u5E94\u89E3\u6790\u5931\u8D25" },
+          config,
+          publicConfig,
+          requestToast: toast,
+          skipBusinessCheck,
+          fetchContext
+        });
+        if (result2.error) {
+          status.value = "error";
+          error.value = result2.error;
+          onError?.(result2.error);
+        } else {
+          status.value = "success";
+          data.value = result2.data;
+          progress.value = 100;
+        }
+        controller = null;
+        return result2;
       }
       const contentLength = response.headers.get("content-length");
       const total = contentLength ? Number.parseInt(contentLength, 10) : 0;
-      const finalFilename = filename || extractFilename(response.headers, url.split("/").pop() || "download");
+      const finalFilename = resolveFilename(response.headers, urlStr, filename);
       const reader = response.body?.getReader();
       if (!reader) throw new Error("\u65E0\u6CD5\u8BFB\u53D6\u54CD\u5E94\u6D41");
+      if (total <= 0) progress.value = null;
       const chunks = [];
       let received = 0;
       while (true) {
@@ -45,35 +139,43 @@ export function useDownloadWithProgress() {
         received += value.length;
         if (total > 0) progress.value = Math.round(received / total * 100);
       }
-      triggerDownload(new Blob(chunks), finalFilename);
-      downloading.value = false;
-      abortController = null;
+      const blob = new Blob(chunks);
+      triggerDownload(blob, finalFilename);
+      const result = await finalizeTransfer(nuxtApp, {
+        raw: null,
+        fallback: { isSuccess: true, data: blob, message: `\u4E0B\u8F7D\u6210\u529F: ${finalFilename}` },
+        config,
+        publicConfig,
+        requestToast: toast,
+        fetchContext
+      });
+      status.value = "success";
+      data.value = result.data;
       progress.value = 100;
-      if (import.meta.client && toast !== false) {
-        const message = extractToastMessage(toast, "success", `\u4E0B\u8F7D\u6210\u529F: ${finalFilename}`);
-        showToast("success", message, toast, config.toast);
-      }
+      controller = null;
       onSuccess?.(finalFilename);
-      return { success: true, error: null };
+      return result;
     } catch (err) {
-      downloading.value = false;
-      abortController = null;
+      controller = null;
+      const isAborted = err instanceof DOMException && err.name === "AbortError";
+      if (isAborted) {
+        status.value = "aborted";
+        return { data: null, error: null, aborted: true };
+      }
       const downloadError = err instanceof Error ? err : new Error("\u4E0B\u8F7D\u5931\u8D25");
+      status.value = "error";
       error.value = downloadError;
-      const isAborted = downloadError.name === "AbortError";
-      if (import.meta.client && !isAborted && toast !== false) {
-        const message = extractToastMessage(toast, "error", downloadError.message || "\u4E0B\u8F7D\u5931\u8D25");
-        showToast("error", message, toast, config.toast);
-      }
-      if (!isAborted) onError?.(downloadError);
-      return { success: false, error: downloadError };
+      onError?.(downloadError);
+      return { data: null, error: downloadError, aborted: false };
     }
   };
   return {
-    /** 下载进度 (0-100) */
+    /** 下载进度 0-100；后端未返回 content-length 时为 null（不确定） */
     progress,
-    /** 是否正在下载 */
-    downloading,
+    /** 传输状态 */
+    status,
+    /** 业务数据（默认 Blob；JSON 响应时为解包后的业务数据） */
+    data,
     /** 错误信息 */
     error,
     /** 执行下载 */

package/dist/runtime/composables/useLazyApiFetch.d.ts

@@ -1,4 +1,5 @@
-import type { UseApiFetchOptions, UseApiFetchReturn } from '../types/api.js';
+import type { NitroFetchRequest } from 'nitropack/types';
+import type { UseApiFetchOptions, UseApiFetchReturn } from '../types/api';
 /**
  * 懒加载版 useApiFetch
  *
@@ -15,4 +16,4 @@ import type { UseApiFetchOptions, UseApiFetchReturn } from '../types/api.js';
  * // <div v-if="status === 'pending'">Loading...</div>
  * ```
  */
-export declare function useLazyApiFetch<T = unknown, DataT = T>(url: string | (() => string), options?: UseApiFetchOptions<T, DataT>): UseApiFetchReturn<DataT>;
+export declare function useLazyApiFetch<T = unknown, DataT = T>(url: NitroFetchRequest | (() => NitroFetchRequest), options?: UseApiFetchOptions<T, DataT>): UseApiFetchReturn<DataT>;

package/dist/runtime/composables/useMessageBox.d.ts

@@ -0,0 +1,6 @@
+import type { MessageBoxProps } from '../types/components/message-box';
+import type { OmitByKey } from '@movk/core';
+export declare function useMessageBox(): {
+    alert: (options: OmitByKey<MessageBoxProps, "mode">) => Promise<void>;
+    confirm: (options: OmitByKey<MessageBoxProps, "mode">) => Promise<boolean>;
+};

package/dist/runtime/composables/useMessageBox.js

@@ -0,0 +1,16 @@
+import { useOverlay } from "#imports";
+import { LazyMMessageBox } from "#components";
+export function useMessageBox() {
+  const overlay = useOverlay();
+  function createInstance() {
+    return overlay.create(LazyMMessageBox, { destroyOnClose: true });
+  }
+  async function alert(options) {
+    await createInstance().open({ ...options, mode: "alert" });
+  }
+  async function confirm(options) {
+    const result = await createInstance().open({ ...options, mode: "confirm" });
+    return result ?? false;
+  }
+  return { alert, confirm };
+}

package/dist/runtime/composables/useTheme.d.ts

@@ -1,30 +1,40 @@
 export declare function useTheme(): {
+    color: import("vue").ComputedRef<any>;
     style: {
-        innerHTML: any;
+        innerHTML: import("vue").ComputedRef<string>;
         id: string;
         tagPriority: number;
     }[];
-    link: any;
-    neutralColors: string[];
-    neutral: any;
+    link: import("vue").ComputedRef<{
+        rel: "stylesheet";
+        href: any;
+        id: string;
+    }[]>;
+    neutralColors: any;
+    neutral: import("vue").WritableComputedRef<any, any>;
     primaryColors: string[];
-    primary: any;
-    blackAsPrimary: import("@vueuse/core").RemovableRef<boolean>;
-    radiuses: number[];
-    radius: import("@vueuse/core").RemovableRef<number>;
-    fonts: string[];
-    font: import("@vueuse/core").RemovableRef<string>;
-    icon: any;
+    primary: import("vue").WritableComputedRef<any, any>;
+    blackAsPrimary: import("vue").ComputedRef<boolean>;
+    setBlackAsPrimary: (value: boolean) => void;
+    radiuses: any;
+    radius: import("vue").WritableComputedRef<any, any>;
+    fonts: any;
+    font: import("vue").WritableComputedRef<any, any>;
+    icon: import("vue").WritableComputedRef<any, any>;
     icons: {
         label: string;
         icon: string;
         value: string;
     }[];
-    modes: any;
-    mode: any;
-    hasCSSChanges: any;
-    hasAppConfigChanges: any;
+    modes: import("vue").ComputedRef<{
+        label: string;
+        icon: any;
+    }[]>;
+    mode: import("vue").WritableComputedRef<any, any>;
+    hasCSSChanges: import("vue").ComputedRef<boolean>;
+    hasConfigChanges: import("vue").ComputedRef<boolean>;
+    configLabel: string;
     exportCSS: () => string;
-    exportAppConfig: () => string;
+    exportConfig: () => string;
     resetTheme: () => void;
 };