hy-app 0.3.11 → 0.3.13

package/api/http.ts

@@ -1,8 +1,4 @@
-import type {
-  HttpRequestConfig,
-  HttpInterceptorManager,
-  HttpResponse,
-} from "../typing";
+import type { HttpRequestConfig } from "../typing";
 import { objectToUrlParams } from "../utils";
 
 export default class Http {
@@ -20,18 +16,27 @@ export default class Http {
     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 config
+     * @param hook
      */
-    request: (config: HttpRequestConfig) => {
-      if (config) {
-        this.requestBefore(config);
-      }
+    request: (
+      hook: (conf: UniNamespace.RequestOptions) => UniNamespace.RequestOptions,
+    ) => {
+      this._requestHook = hook;
     },
     /**
      * @description 响应拦截
@@ -39,66 +44,55 @@ export default class Http {
      * @param fail 失败响应
      */
     response: (
-      success: (response: HttpResponse) => any,
-      fail: (error: HttpResponse) => any,
+      success?: (response: UniNamespace.RequestSuccessCallbackResult) => any,
+      fail?: (error: UniNamespace.GeneralCallbackResult) => any,
     ) => {
       if (success) {
-        this.responseSuccess = success;
+        this._responseSuccessHook = success;
       }
       if (fail) {
-        this.responseFail = fail;
+        this._responseFailHook = fail;
       }
     },
   };
 
   /**
    * @description 请求拦截
-   * @param config 请求配置
-   */
-  requestBefore(config: HttpRequestConfig) {
-    return config;
-  }
-
-  /**
-   * @description 成功响应
-   * @param response
-   */
-  responseSuccess(response: UniNamespace.RequestSuccessCallbackResult) {
-    return response;
-  }
-
-  /**
-   * @description 失败响应
-   * @param response
+   * @param conf 请求配置
    */
-  responseFail(response: UniNamespace.GeneralCallbackResult) {
-    return response;
+  private requestBefore(
+    conf: UniNamespace.RequestOptions,
+  ): UniNamespace.RequestOptions {
+    return this._requestHook ? this._requestHook(conf) : conf;
   }
 
   /**
    * @description uni异步请求
    * @param options 请求配置
    */
-  async request(options: Record<string, any>) {
+  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<any>((resolve, reject) => {
-      options = this.requestBefore(options);
+    /* 合并默认配置 ... */
+    return new Promise((resolve, reject) => {
+      options = this.requestBefore(options); // ⭐这里会调用钩子
       uni.request({
-        url: options.url,
-        data: options.data,
-        header: options.header,
-        method: options.method,
-        timeout: options.timeout,
-        success: (response: UniNamespace.RequestSuccessCallbackResult) => {
-          resolve(this.responseSuccess(response));
+        ...options,
+        success: (res: UniNamespace.RequestSuccessCallbackResult) => {
+          const after = this._responseSuccessHook
+            ? this._responseSuccessHook(res)
+            : res;
+          resolve(after);
         },
-        fail: (error: UniNamespace.GeneralCallbackResult) => {
-          reject(this.responseFail(error));
+        fail: (err: UniNamespace.GeneralCallbackResult) => {
+          const after = this._responseFailHook
+            ? this._responseFailHook(err)
+            : err;
+          reject(after);
         },
       });
     });
@@ -110,7 +104,11 @@ export default class Http {
    * @param params 请求JSON参数
    * @param options 请求配置
    */
-  post(url: string, params?: any, options?: Record<string, any>) {
+  post<T = any>(
+    url: string,
+    params?: any,
+    options?: HttpRequestConfig,
+  ): Promise<T> {
     return this.request({
       url: url,
       method: "POST",
@@ -125,7 +123,11 @@ export default class Http {
    * @param params URL查询参数
    * @param options 请求配置
    */
-  get(url: string, params?: any, options?: Record<string, any>) {
+  get<T = any>(
+    url: string,
+    params?: any,
+    options?: HttpRequestConfig,
+  ): Promise<T> {
     if (params) {
       url += "?" + objectToUrlParams(params);
     }

package/components/hy-card/hy-card.vue

@@ -134,7 +134,7 @@ const props = defineProps({
   /** 卡片与屏幕两边和上下元素的间距，需带单位，如"30px 20px" */
   margin: {
     type: String,
-    default: "10px",
+    default: "0 0 20rpx",
   },
   /** 卡片整体的圆角值，单位px */
   borderRadius: {

package/components/hy-search/hy-search.vue

@@ -73,7 +73,7 @@
         v-if="showClear"
         @click="onClear"
       >
-        <HyIcon :name="IconConfig.CLOSE" color="#ffffff"></HyIcon>
+        <HyIcon :name="IconConfig.CLOSE"></HyIcon>
       </view>
     </view>
     <text
@@ -102,7 +102,7 @@ export default {
 import { computed, nextTick, ref, watch } from "vue";
 import type { PropType, CSSProperties } from "vue";
 import type { ISearchEmits } from "./typing";
-import { sleep, addUnit } from "../../utils";
+import { addUnit } from "../../utils";
 import { IconConfig } from "../../config";
 import HyIcon from "../hy-icon/hy-icon.vue";
 import type HyIconProps from "../hy-icon/typing";

package/components/hy-text/hy-text.vue

@@ -13,7 +13,13 @@
       ￥
     </text>
     <view class="hy-text__prefix-icon" v-if="prefixIcon">
-      <HyIcon :name="prefixIcon" :customStyle="iconStyle"></HyIcon>
+      <HyIcon
+        :name="prefixIcon"
+        :color="color"
+        :size="size"
+        space="2"
+        :customStyle="iconStyle"
+      ></HyIcon>
     </view>
     <template v-if="openType && isMp">
       <button
@@ -51,7 +57,12 @@
       {{ value }}
     </text>
     <view class="hy-text__suffix-icon" v-if="suffixIcon">
-      <HyIcon :name="suffixIcon" :customStyle="iconStyle"></HyIcon>
+      <HyIcon
+        :name="suffixIcon"
+        :color="color"
+        :size="size"
+        :customStyle="iconStyle"
+      ></HyIcon>
     </view>
   </view>
 </template>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hy-app",
-  "version": "0.3.11",
-  "description": "修复搜索输入框，有值时候获取焦点会立马失去焦点问题",
+  "version": "0.3.13",
+  "description": "拦截器get和post加类型判断",
   "main": "./index.ts",
   "private": false,
   "scripts": {},

package/typing/modules/http.ts

@@ -1,57 +1,6 @@
-export interface HttpRequestConfig {
+export interface HttpRequestConfig extends UniNamespace.RequestOptions {
   /** 请求基地址 */
   baseURL?: string;
-  /** 请求服务器接口地址 */
-  url?: string;
-
-  /** 请求查询参数，自动拼接为查询字符串 */
-  params?: AnyObject;
-  /** 请求体参数 */
-  data?: AnyObject;
-
-  /** 文件对应的 key */
-  name?: string;
-  /** HTTP 请求中其他额外的 form data */
-  formData?: AnyObject;
-  /** 要上传文件资源的路径。 */
-  filePath?: string;
-  /** 需要上传的文件列表。使用 files 时，filePath 和 name 不生效，App、H5（ 2.6.15+） */
-  files?: Array<{
-    name?: string;
-    file?: File;
-    uri: string;
-  }>;
-  /** 要上传的文件对象，仅H5（2.6.15+）支持 */
-  file?: File;
-
-  /** 请求头信息 */
-  header?: AnyObject;
-  /** 请求方式 */
-  method?:
-    | "GET"
-    | "POST"
-    | "PUT"
-    | "DELETE"
-    | "CONNECT"
-    | "HEAD"
-    | "OPTIONS"
-    | "TRACE"
-    | "UPLOAD"
-    | "DOWNLOAD";
-  /** 如果设为 json，会尝试对返回的数据做一次 JSON.parse */
-  dataType?: string;
-  /** 设置响应的数据类型，支付宝小程序不支持 */
-  responseType?: "text" | "arraybuffer";
-  /** 自定义参数 */
-  custom?: AnyObject;
-  /** 超时时间，仅微信小程序（2.10.0）、支付宝小程序支持 */
-  timeout?: number;
-  /** DNS解析时优先使用ipv4，仅 App-Android 支持 (HBuilderX 2.8.0+) */
-  firstIpv4?: boolean;
-  /** 验证 ssl 证书 仅5+App安卓端支持（HBuilderX 2.3.3+） */
-  sslVerify?: boolean;
-  /** 跨域请求时是否携带凭证（cookies）仅H5支持（HBuilderX 2.6.15+） */
-  withCredentials?: boolean;
 }
 
 export interface HttpResponse<T = any> {