hy-app 0.6.4 → 0.6.6

package/libs/api/http.ts

@@ -1,119 +1,119 @@
-import { objectToUrlParams } from '../../libs'
-
-export class Http {
-    /**
-     * 默认请求配置
-     */
-    config: HyHttps.HttpRequestConfig = {
-        baseURL: '',
-        url: '',
-        data: {},
-        dataType: 'json',
-        header: {},
-        method: 'POST',
-        responseType: 'text',
-        timeout: 10000
-    }
-
-    /* 私有回调槽 */
-    private _requestHook?: (conf: UniNamespace.RequestOptions) => UniNamespace.RequestOptions
-    private _responseSuccessHook?: (res: UniNamespace.RequestSuccessCallbackResult) => any
-    private _responseFailHook?: (err: UniNamespace.GeneralCallbackResult) => any
-
-    /**
-     * @description 拦截器
-     */
-    interceptor = {
-        /**
-         * @description 请求拦截 请求配置
-         * @param hook
-         */
-        request: (hook: (conf: UniNamespace.RequestOptions) => UniNamespace.RequestOptions) => {
-            this._requestHook = hook
-        },
-        /**
-         * @description 响应拦截
-         * @param success 成功响应
-         * @param fail 失败响应
-         */
-        response: (
-            success?: (response: UniNamespace.RequestSuccessCallbackResult) => any,
-            fail?: (error: UniNamespace.GeneralCallbackResult) => any
-        ) => {
-            if (success) {
-                this._responseSuccessHook = success
-            }
-            if (fail) {
-                this._responseFailHook = fail
-            }
-        }
-    }
-
-    /**
-     * @description 请求拦截
-     * @param conf 请求配置
-     */
-    private requestBefore(conf: UniNamespace.RequestOptions): UniNamespace.RequestOptions {
-        return this._requestHook ? this._requestHook(conf) : conf
-    }
-
-    /**
-     * @description uni异步请求
-     * @param options 请求配置
-     */
-    async request<T = any>(options: UniNamespace.RequestOptions): Promise<T> {
-        options.url = this.config.baseURL + options.url || this.config.url
-        options.data = options.data || this.config.data
-        options.header = options.header || this.config.header
-        options.method = options.method || this.config.method
-        options.responseType = options.responseType || this.config.responseType
-        options.timeout = options.timeout || this.config.timeout
-        /* 合并默认配置 ... */
-        return new Promise((resolve, reject) => {
-            options = this.requestBefore(options) // ⭐这里会调用钩子
-            uni.request({
-                ...options,
-                success: (res: UniNamespace.RequestSuccessCallbackResult) => {
-                    const after = this._responseSuccessHook ? this._responseSuccessHook(res) : res
-                    resolve(after)
-                },
-                fail: (err: UniNamespace.GeneralCallbackResult) => {
-                    const after = this._responseFailHook ? this._responseFailHook(err) : err
-                    reject(after)
-                }
-            })
-        })
-    }
-
-    /**
-     * post请求
-     * @param url 请求地址
-     * @param params 请求JSON参数
-     * @param options 请求配置
-     */
-    post<T = any>(url: string, params?: any, options?: HyHttps.HttpRequestConfig): Promise<T> {
-        return this.request({
-            url: url,
-            method: 'POST',
-            data: params,
-            ...options
-        })
-    }
-
-    /**
-     * get请求
-     * @param url 请求地址
-     * @param params URL查询参数
-     * @param options 请求配置
-     */
-    get<T = any>(url: string, params?: any, options?: HyHttps.HttpRequestConfig): Promise<T> {
-        if (params) {
-            url += '?' + objectToUrlParams(params)
-        }
-        return this.request({
-            url: url,
-            method: 'GET',
-            ...options
-        })
-    }
-}
+import { objectToUrlParams } from '../../libs'
+
+export class Http {
+    /**
+     * 默认请求配置
+     */
+    config: HyHttps.HttpRequestConfig = {
+        baseURL: '',
+        url: '',
+        data: {},
+        dataType: 'json',
+        header: {},
+        method: 'POST',
+        responseType: 'text',
+        timeout: 10000
+    }
+
+    /* 私有回调槽 */
+    private _requestHook?: (conf: UniNamespace.RequestOptions) => UniNamespace.RequestOptions
+    private _responseSuccessHook?: (res: UniNamespace.RequestSuccessCallbackResult) => any
+    private _responseFailHook?: (err: UniNamespace.GeneralCallbackResult) => any
+
+    /**
+     * @description 拦截器
+     */
+    interceptor = {
+        /**
+         * @description 请求拦截 请求配置
+         * @param hook
+         */
+        request: (hook: (conf: UniNamespace.RequestOptions) => UniNamespace.RequestOptions) => {
+            this._requestHook = hook
+        },
+        /**
+         * @description 响应拦截
+         * @param success 成功响应
+         * @param fail 失败响应
+         */
+        response: (
+            success?: (response: UniNamespace.RequestSuccessCallbackResult) => any,
+            fail?: (error: UniNamespace.GeneralCallbackResult) => any
+        ) => {
+            if (success) {
+                this._responseSuccessHook = success
+            }
+            if (fail) {
+                this._responseFailHook = fail
+            }
+        }
+    }
+
+    /**
+     * @description 请求拦截
+     * @param conf 请求配置
+     */
+    private requestBefore(conf: UniNamespace.RequestOptions): UniNamespace.RequestOptions {
+        return this._requestHook ? this._requestHook(conf) : conf
+    }
+
+    /**
+     * @description uni异步请求
+     * @param options 请求配置
+     */
+    async request<T = any>(options: UniNamespace.RequestOptions): Promise<T> {
+        options.url = this.config.baseURL + options.url || this.config.url
+        options.data = options.data || this.config.data
+        options.header = options.header || this.config.header
+        options.method = options.method || this.config.method
+        options.responseType = options.responseType || this.config.responseType
+        options.timeout = options.timeout || this.config.timeout
+        /* 合并默认配置 ... */
+        return new Promise((resolve, reject) => {
+            options = this.requestBefore(options) // ⭐这里会调用钩子
+            uni.request({
+                ...options,
+                success: (res: UniNamespace.RequestSuccessCallbackResult) => {
+                    const after = this._responseSuccessHook ? this._responseSuccessHook(res) : res
+                    resolve(after)
+                },
+                fail: (err: UniNamespace.GeneralCallbackResult) => {
+                    const after = this._responseFailHook ? this._responseFailHook(err) : err
+                    reject(after)
+                }
+            })
+        })
+    }
+
+    /**
+     * post请求
+     * @param url 请求地址
+     * @param params 请求JSON参数
+     * @param options 请求配置
+     */
+    post<T = any>(url: string, params?: any, options?: HyHttps.HttpRequestConfig): Promise<T> {
+        return this.request({
+            url: url,
+            method: 'POST',
+            data: params,
+            ...options
+        })
+    }
+
+    /**
+     * get请求
+     * @param url 请求地址
+     * @param params URL查询参数
+     * @param options 请求配置
+     */
+    get<T = any>(url: string, params?: any, options?: HyHttps.HttpRequestConfig): Promise<T> {
+        if (params) {
+            url += '?' + objectToUrlParams(params)
+        }
+        return this.request({
+            url: url,
+            method: 'GET',
+            ...options
+        })
+    }
+}

package/libs/composables/index.ts

@@ -1,8 +1,8 @@
-export * from './useShare'
-export * from './useTouch'
-export * from './usePopover'
-export * from './useQueue'
-export * from './useToast'
-export * from './useMessage'
-export * from './useShakeService'
-export * from './useTranslate'
+export * from './useShare'
+export * from './useTouch'
+export * from './usePopover'
+export * from './useQueue'
+export * from './useToast'
+export * from './useMessage'
+export * from './useShakeService'
+export * from './useTranslate'

package/libs/composables/useMessage.ts

@@ -1,149 +1,149 @@
-import { ref, reactive, provide, inject, type Ref } from 'vue'
-import type { HyModalProps } from '../../components/hy-modal/typing'
-
-interface UseMessageOptions extends Partial<HyModalProps> {
-    confirm?: () => void | Promise<void>
-    cancel?: () => void
-    close?: () => void
-}
-
-interface UseMessageReturn {
-    alert: (options: UseMessageOptions | string) => Promise<boolean>
-    confirm: (options: UseMessageOptions | string) => Promise<boolean>
-}
-
-interface IMessageConfig {
-    showModal: Ref<boolean>
-    loading: Ref<boolean>
-    modalOptions: UseMessageOptions
-    confirmHandler: () => void
-    cancelHandler: () => void
-    closeHandler: () => void
-}
-
-// 注入键
-const UseMessageKey = 'hy-message'
-
-export function useMessage(): UseMessageReturn {
-    const showModal = ref(false)
-    const loading = ref(false)
-    const modalOptions = reactive<UseMessageOptions>({})
-    let resolveFn: ((value: boolean) => void) | null = null
-
-    const normalizeOptions = (options: UseMessageOptions | string): UseMessageOptions => {
-        if (typeof options === 'string') {
-            return {
-                title: options
-            }
-        }
-        return options
-    }
-
-    const confirmHandler = async () => {
-        if (loading.value) return
-
-        if (modalOptions.confirm) {
-            const result = modalOptions.confirm()
-            if (result instanceof Promise) {
-                loading.value = true
-                await result
-                loading.value = false
-            }
-        }
-
-        if (resolveFn) {
-            resolveFn(true)
-            resolveFn = null
-        }
-        showModal.value = false
-    }
-
-    const cancelHandler = () => {
-        modalOptions.cancel?.()
-        if (resolveFn) {
-            resolveFn(false)
-            resolveFn = null
-        }
-        showModal.value = false
-    }
-
-    const closeHandler = () => {
-        modalOptions.close?.()
-        if (resolveFn) {
-            resolveFn(false)
-            resolveFn = null
-        }
-        showModal.value = false
-    }
-
-    const createMessage = (options: UseMessageOptions): Promise<boolean> => {
-        return new Promise((resolve) => {
-            resolveFn = resolve
-
-            // 重置选项
-            Object.assign(modalOptions, {
-                title: undefined,
-                content: undefined,
-                confirmText: undefined,
-                cancelText: undefined,
-                showConfirmButton: undefined,
-                showCancelButton: undefined,
-                confirmColor: undefined,
-                cancelColor: undefined,
-                buttonReverse: undefined,
-                zoom: undefined,
-                round: undefined,
-                autoClose: undefined,
-                loading: undefined,
-                closeOnClickOverlay: undefined,
-                negativeTop: undefined,
-                width: undefined,
-                confirmButtonShape: undefined,
-                contentTextAlign: undefined,
-                confirm: undefined,
-                cancel: undefined,
-                close: undefined
-            })
-
-            // 应用新选项
-            Object.assign(modalOptions, options)
-
-            loading.value = options.loading || false
-            showModal.value = true
-        })
-    }
-
-    // 提供状态给子组件
-    provide(UseMessageKey, {
-        showModal,
-        loading,
-        modalOptions,
-        confirmHandler,
-        cancelHandler,
-        closeHandler
-    })
-
-    return {
-        alert: (options) => {
-            const normalized = normalizeOptions(options)
-            return createMessage({
-                showConfirmButton: true,
-                showCancelButton: false,
-                ...normalized
-            })
-        },
-        confirm: (options) => {
-            const normalized = normalizeOptions(options)
-            return createMessage({
-                showConfirmButton: true,
-                showCancelButton: true,
-                ...normalized
-            })
-        }
-    }
-}
-
-// 注入函数，供 hy-modal 组件使用
-export function useMessageInject() {
-    return inject<IMessageConfig | null>(UseMessageKey, null)
-}
+import { ref, reactive, provide, inject, type Ref } from 'vue'
+import type { HyModalProps } from '../../components/hy-modal/typing'
+
+interface UseMessageOptions extends Partial<HyModalProps> {
+    confirm?: () => void | Promise<void>
+    cancel?: () => void
+    close?: () => void
+}
+
+interface UseMessageReturn {
+    alert: (options: UseMessageOptions | string) => Promise<boolean>
+    confirm: (options: UseMessageOptions | string) => Promise<boolean>
+}
+
+interface IMessageConfig {
+    showModal: Ref<boolean>
+    loading: Ref<boolean>
+    modalOptions: UseMessageOptions
+    confirmHandler: () => void
+    cancelHandler: () => void
+    closeHandler: () => void
+}
+
+// 注入键
+const UseMessageKey = 'hy-message'
+
+export function useMessage(): UseMessageReturn {
+    const showModal = ref(false)
+    const loading = ref(false)
+    const modalOptions = reactive<UseMessageOptions>({})
+    let resolveFn: ((value: boolean) => void) | null = null
+
+    const normalizeOptions = (options: UseMessageOptions | string): UseMessageOptions => {
+        if (typeof options === 'string') {
+            return {
+                title: options
+            }
+        }
+        return options
+    }
+
+    const confirmHandler = async () => {
+        if (loading.value) return
+
+        if (modalOptions.confirm) {
+            const result = modalOptions.confirm()
+            if (result instanceof Promise) {
+                loading.value = true
+                await result
+                loading.value = false
+            }
+        }
+
+        if (resolveFn) {
+            resolveFn(true)
+            resolveFn = null
+        }
+        showModal.value = false
+    }
+
+    const cancelHandler = () => {
+        modalOptions.cancel?.()
+        if (resolveFn) {
+            resolveFn(false)
+            resolveFn = null
+        }
+        showModal.value = false
+    }
+
+    const closeHandler = () => {
+        modalOptions.close?.()
+        if (resolveFn) {
+            resolveFn(false)
+            resolveFn = null
+        }
+        showModal.value = false
+    }
+
+    const createMessage = (options: UseMessageOptions): Promise<boolean> => {
+        return new Promise((resolve) => {
+            resolveFn = resolve
+
+            // 重置选项
+            Object.assign(modalOptions, {
+                title: undefined,
+                content: undefined,
+                confirmText: undefined,
+                cancelText: undefined,
+                showConfirmButton: undefined,
+                showCancelButton: undefined,
+                confirmColor: undefined,
+                cancelColor: undefined,
+                buttonReverse: undefined,
+                zoom: undefined,
+                round: undefined,
+                autoClose: undefined,
+                loading: undefined,
+                closeOnClickOverlay: undefined,
+                negativeTop: undefined,
+                width: undefined,
+                confirmButtonShape: undefined,
+                contentTextAlign: undefined,
+                confirm: undefined,
+                cancel: undefined,
+                close: undefined
+            })
+
+            // 应用新选项
+            Object.assign(modalOptions, options)
+
+            loading.value = options.loading || false
+            showModal.value = true
+        })
+    }
+
+    // 提供状态给子组件
+    provide(UseMessageKey, {
+        showModal,
+        loading,
+        modalOptions,
+        confirmHandler,
+        cancelHandler,
+        closeHandler
+    })
+
+    return {
+        alert: (options) => {
+            const normalized = normalizeOptions(options)
+            return createMessage({
+                showConfirmButton: true,
+                showCancelButton: false,
+                ...normalized
+            })
+        },
+        confirm: (options) => {
+            const normalized = normalizeOptions(options)
+            return createMessage({
+                showConfirmButton: true,
+                showCancelButton: true,
+                ...normalized
+            })
+        }
+    }
+}
+
+// 注入函数，供 hy-modal 组件使用
+export function useMessageInject() {
+    return inject<IMessageConfig | null>(UseMessageKey, null)
+}

package/libs/composables/useToast.ts

@@ -1,45 +1,45 @@
-/**
- * 消息提示hooks
- * */
-
-import type ToastOptions from '../../components/hy-toast/typing'
-import { error } from '../../libs'
-
-// 用于缓存全局唯一实例
-let toastInstance: any = null
-
-/**
- * useToast 适用于任意页面直接调用 toast
- * 兼容 H5 + 微信小程序 + App
- */
-export const useToast = () => {
-    const show = (msg: string, opt?: ToastOptions) =>
-        openToast({ message: msg, icon: false, type: '', ...opt })
-    const info = (msg: string, opt?: ToastOptions) =>
-        openToast({ message: msg, type: 'info', icon: true, ...opt })
-    const success = (msg: string, opt?: ToastOptions) =>
-        openToast({ message: msg, type: 'success', icon: true, ...opt })
-    const error = (msg: string, opt?: ToastOptions) =>
-        openToast({ message: msg, type: 'error', icon: true, ...opt })
-    const warning = (msg: string, opt?: ToastOptions) =>
-        openToast({ message: msg, type: 'warning', icon: true, ...opt })
-    const primary = (msg: string, opt?: ToastOptions) =>
-        openToast({ message: msg, type: 'primary', icon: true, ...opt })
-    const loading = (msg: string = '加载中...', opt?: ToastOptions) =>
-        openToast({ message: msg, type: 'primary', loading: true, ...opt })
-    const close = (all?: boolean) => closeToast()
-
-    return { show, info, success, error, warning, primary, loading, close }
-}
-
-/**
- * ✅ 实现
- * 页面创建总事件，调用方法实现
- */
-const openToast = (opt: ToastOptions) => {
-    uni.$emit('__hy_toast_open__', opt)
-}
-
-const closeToast = () => {
-    uni.$emit('__hy_toast_close__')
-}
+/**
+ * 消息提示hooks
+ * */
+
+import type ToastOptions from '../../components/hy-toast/typing'
+import { error } from '../../libs'
+
+// 用于缓存全局唯一实例
+let toastInstance: any = null
+
+/**
+ * useToast 适用于任意页面直接调用 toast
+ * 兼容 H5 + 微信小程序 + App
+ */
+export const useToast = () => {
+    const show = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, icon: false, type: '', ...opt })
+    const info = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'info', icon: true, ...opt })
+    const success = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'success', icon: true, ...opt })
+    const error = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'error', icon: true, ...opt })
+    const warning = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'warning', icon: true, ...opt })
+    const primary = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'primary', icon: true, ...opt })
+    const loading = (msg: string = '加载中...', opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'primary', loading: true, ...opt })
+    const close = (all?: boolean) => closeToast()
+
+    return { show, info, success, error, warning, primary, loading, close }
+}
+
+/**
+ * ✅ 实现
+ * 页面创建总事件，调用方法实现
+ */
+const openToast = (opt: ToastOptions) => {
+    uni.$emit('__hy_toast_open__', opt)
+}
+
+const closeToast = () => {
+    uni.$emit('__hy_toast_close__')
+}

package/libs/composables/useTranslate.ts

@@ -1,10 +1,10 @@
-import { getByPath, Locale } from '../index'
-
-export const useTranslate = (name: string) => {
-    const t = (key: string, ...args: unknown[]) => {
-        const currentMessages = Locale.messages()
-        const value = getByPath(currentMessages[name], key)
-        return typeof value === 'function' ? value(...args) : value
-    }
-    return { t }
-}
+import { getByPath, Locale } from '../index'
+
+export const useTranslate = (name: string) => {
+    const t = (key: string, ...args: unknown[]) => {
+        const currentMessages = Locale.messages()
+        const value = getByPath(currentMessages[name], key)
+        return typeof value === 'function' ? value(...args) : value
+    }
+    return { t }
+}