hy-app 0.7.0 → 0.7.2

package/components/hy-number-step/index.scss

@@ -61,6 +61,7 @@
     align-items: center;
     justify-content: center;
     color: $hy-text-color;
+    box-sizing: border-box;
 
     @include m(disabled) {
       color: $hy-text-color--disabled;

package/components/hy-number-step/props.ts

@@ -11,7 +11,7 @@ const numberStepProps = {
     /** 最小值 */
     min: {
         type: Number,
-        default: 1
+        default: 0
     },
     /** 最大值 */
     max: {

package/components/hy-popover/hy-popover.vue

@@ -115,7 +115,7 @@ import {
     inject,
     nextTick
 } from 'vue'
-import type { IPopoverEmits, PopoverExpose } from './typing'
+import type { IPopoverEmits, IPopoverExpose } from './typing'
 import {
     type Queue,
     queueKey,
@@ -241,7 +241,7 @@ function updateModelValue(value: boolean) {
     emit('update:modelValue', value)
 }
 
-defineExpose<PopoverExpose>({
+defineExpose<IPopoverExpose>({
     open,
     close
 })

package/components/hy-popover/typing.d.ts

@@ -13,7 +13,7 @@ export type IPlacementVo =
     | 'right-end'
 export type IOffset = number | number[] | Record<'x' | 'y', number>
 
-export type PopoverExpose = {
+export type IPopoverExpose = {
     open: () => void
     close: () => void
 }

package/components/hy-popup/hy-popup.vue

@@ -30,7 +30,7 @@
                     hover-class="hy-popup__content__close--hover"
                     hover-stay-time="150"
                 >
-                    <hy-icon :name="IconConfig.CLOSE" color="#909399" size="18" bold></hy-icon>
+                    <hy-icon :name="IconConfig.CLOSE" color="#909399" size="28"></hy-icon>
                 </view>
                 <!--        <hy-safe-bottom v-if="safeAreaInsetBottom"></hy-safe-bottom>-->
             </view>

package/components/hy-signature/hy-signature.vue

@@ -99,7 +99,7 @@ export default {
 import { computed, getCurrentInstance, onBeforeMount, onMounted, reactive, ref, watch } from 'vue'
 import type { CSSProperties } from 'vue'
 import { addUnit, getRect, guid } from '../../libs'
-import type { SignatureExpose, SignatureResult, Point, Line, ISignatureEmits } from './typing'
+import type { ISignatureExpose, SignatureResult, Point, Line, ISignatureEmits } from './typing'
 // #ifdef MP-WEIXIN
 import { canvas2dAdapter } from './canvasHelper'
 // #endif
@@ -165,7 +165,7 @@ const currentLine = ref<Line>() // 当前正在绘制的线
 const currentStep = ref(0) // 当前步骤
 
 /**
- * @description 添加计算笔画宽度的方法
+ * 添加计算笔画宽度的方法
  * */
 function calculateLineWidth(speed: number): number {
     if (!props.pressure) return props.lineWidth
@@ -178,7 +178,7 @@ function calculateLineWidth(speed: number): number {
 }
 
 /**
- * @description 获取默认笔画宽度
+ * 获取默认笔画宽度
  * */
 const getDefaultLineWidth = () => {
     if (props.pressure) {
@@ -189,7 +189,7 @@ const getDefaultLineWidth = () => {
 }
 
 /**
- * @description 开始画线
+ * 开始画线
  * */
 const startDrawing = (e: any) => {
     e.preventDefault()
@@ -219,7 +219,7 @@ const startDrawing = (e: any) => {
 }
 
 /**
- * @description 结束画线
+ * 结束画线
  * */
 const stopDrawing = (e: TouchEvent) => {
     e.preventDefault()
@@ -250,7 +250,7 @@ const stopDrawing = (e: TouchEvent) => {
 }
 
 /**
- * @description 初始化 canvas
+ * 初始化 canvas
  * @param forceUpdate 是否强制更新
  */
 const initCanvas = (forceUpdate: boolean = false) => {
@@ -269,7 +269,7 @@ const initCanvas = (forceUpdate: boolean = false) => {
 }
 
 /**
- * @description 清空 canvas
+ * 清空 canvas
  * */
 const clear = () => {
     lines.value = []
@@ -285,7 +285,7 @@ const confirmSignature = () => {
 }
 
 /**
- * @description canvas划线
+ * canvas划线
  * */
 const draw = (e: any) => {
     e.preventDefault()
@@ -349,7 +349,7 @@ const draw = (e: any) => {
 }
 
 /**
- * @description 重绘整个画布
+ * 重绘整个画布
  * */
 const redrawCanvas = () => {
     const { ctx } = canvasState
@@ -422,7 +422,7 @@ const redrawCanvas = () => {
 }
 
 /**
- * @description 修改撤销功能
+ * 修改撤销功能
  * */
 const revoke = () => {
     if (!lines.value.length) return
@@ -434,7 +434,7 @@ const revoke = () => {
 }
 
 /**
- * @description 修改恢复功能
+ * 修改恢复功能
  * */
 const restore = () => {
     if (!redoLines.value.length) return
@@ -446,7 +446,7 @@ const restore = () => {
 }
 
 /**
- * @description 添加平滑线条绘制方法
+ * 添加平滑线条绘制方法
  * */
 function drawSmoothLine(prePoint: Point, point: Point) {
     const { ctx } = canvasState
@@ -513,7 +513,7 @@ onBeforeMount(() => {
 })
 
 /**
- * @description 获取canvas上下文
+ * 获取canvas上下文
  */
 function getContext() {
     return new Promise<UniApp.CanvasContext>((resolve) => {
@@ -557,7 +557,7 @@ function getContext() {
 }
 
 /**
- * @description 设置 canvasState
+ * 设置 canvasState
  */
 function setCanvasState(width: number, height: number) {
     canvasState.canvasHeight = height * pixelRatio.value
@@ -565,7 +565,7 @@ function setCanvasState(width: number, height: number) {
 }
 
 /**
- * @description 设置线段
+ * 设置线段
  * */
 function setLine() {
     const { ctx } = canvasState
@@ -578,7 +578,7 @@ function setLine() {
 }
 
 /**
- *  @description canvas 绘制图片输出成文件类型
+ *  canvas 绘制图片输出成文件类型
  */
 function canvasToImage() {
     const { fileType, quality, exportScale } = props
@@ -633,7 +633,7 @@ function clearCanvas() {
     }
 }
 
-defineExpose<SignatureExpose>({
+defineExpose<ISignatureExpose>({
     init: initCanvas,
     clear,
     confirm: confirmSignature,

package/components/hy-signature/typing.d.ts

@@ -64,7 +64,7 @@ export interface Point {
  * @property restore - 恢复上一步操作
  * @property revoke - 撤销上一步操作
  */
-export type SignatureExpose = {
+export type ISignatureExpose = {
     /** 初始化签名板
      * @param forceUpdate - 是否强制更新
      */

package/components/hy-toast/hy-toast.vue

@@ -54,8 +54,8 @@ export default {
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, reactive, ref } from 'vue'
 import type { CSSProperties } from 'vue'
-import type ToastOptions from './typing'
-import { ColorConfig, iconName, getWindowInfo, hexToRgb, deepMerge } from '../../libs'
+import type { IToastExpose, ToastOptions } from './typing'
+import { ColorConfig, iconName, getWindowInfo, hexToRgb } from '../../libs'
 // 组件
 import HyOverlay from '../hy-overlay/hy-overlay.vue'
 import HyIcon from '../hy-icon/hy-icon.vue'
@@ -197,7 +197,7 @@ const clearTimer = () => {
     // config.loading = false
 }
 
-defineExpose({
+defineExpose<IToastExpose>({
     show,
     hide
 })

package/components/hy-toast/index.scss

@@ -13,7 +13,7 @@
     max-width: 600rpx;
     /* #endif */
     position: relative;
-    z-index: 10090;
+    z-index: 11000;
 
     @include m(loading) {
       flex-direction: column;

package/components/hy-toast/typing.d.ts

@@ -1,6 +1,6 @@
 import type { HyIconProps } from '../hy-icon/typing'
 
-export default interface ToastOptions {
+export interface ToastOptions {
     /**
      * 显示文本
      * */
@@ -42,3 +42,16 @@ export default interface ToastOptions {
      * */
     complete?: Function | null
 }
+
+/** HyToast 组件实例暴露的方法 */
+export interface IToastExpose {
+    /**
+     * 显示 Toast
+     * @param options Toast 配置选项
+     */
+    show: (options: ToastOptions) => void
+    /**
+     * 隐藏 Toast
+     */
+    hide: () => void
+}

package/libs/api/http.ts

@@ -1,119 +1,122 @@
-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 =
+            options.url && /^https?:\/\//.test(options.url)
+                ? options.url
+                : this.config.baseURL + options.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
+        })
+    }
+}