@airpower/web 1.4.0 → 1.4.3

package/dist/http/Http.d.ts

@@ -82,34 +82,51 @@ export declare class Http {
      * @param contentType `content-shared`
      */
     setContentType(contentType: HttpContentType): this;
+    /**
+     * ### 是否直接抛出错误
+     * @param isThrowError 是否回调错误
+     */
+    throwError(isThrowError?: boolean): this;
+    /**
+     * ### 无返回发送请求
+     * @param postData 发送的数据模型(数组)
+     */
+    request<REQ extends Transformer>(postData: REQ | REQ[] | undefined): Promise<void>;
     /**
      * ### 发送请求并获取转换后的模型
-     * @param postData 请求的数据
+     * @param postData 发送的数据模型(数组)
      * @param parseClass 返回的模型
      */
-    post<REQ extends Transformer, RES extends Transformer>(postData: REQ | REQ[] | undefined, parseClass: ITransformerConstructor<RES>): Promise<RES>;
+    requestModel<REQ extends Transformer, RES extends Transformer>(postData: REQ | REQ[] | undefined, parseClass: ITransformerConstructor<RES>): Promise<RES>;
     /**
      * ### 发送请求并获取转换后的模型数组
-     * @param postData 请求的数据
+     * @param postData 发送的数据模型(数组)
      * @param parseClass 返回的模型数组
      */
-    postArray<REQ extends Transformer, RES extends Transformer>(postData: REQ | REQ[] | undefined, parseClass: ITransformerConstructor<RES>): Promise<RES[]>;
+    requestModelList<REQ extends Transformer, RES extends Transformer>(postData: REQ | REQ[] | undefined, parseClass: ITransformerConstructor<RES>): Promise<RES[]>;
     /**
-     * ### 是否直接抛出错误
-     * @param isThrowError 是否回调错误
+     * ### POST 发送请求并获取原始 `data`
+     * @param postData 发送的数据模型(数组)
+     * @returns 响应的原始 `data`
      */
-    throwError(isThrowError?: boolean): this;
+    requestRaw<REQ extends Transformer>(postData: REQ | REQ[] | undefined): Promise<IJson | IJson[]>;
     /**
-     * ### POST 发送模型/模型数组并
-     * @param postData 发送的数据模型(数组)
+     * 发送请求
+     * @param request 请求
+     * @param request.body 请求体
+     * @param request.params 请求参数
+     * @returns 响应的JSON
      */
-    request<T extends Transformer>(postData?: T | T[]): Promise<IJson | IJson[]>;
+    send(request: {
+        body?: unknown;
+        params?: unknown;
+    }): Promise<IJson | IJson[]>;
     /**
      * ### 发送请求
      *
-     * @param body `可选` 请求体
-     * @see request() 直接发送 `POST`
-     * @see get() 直接发送 `GET`
+     * @param request 请求
+     * @param request.body 请求体
+     * @param request.params 请求参数
      */
-    private send;
+    private axiosRequest;
 }

package/dist/main.js

@@ -15067,37 +15067,45 @@ class Http {
   setContentType(contentType) {
     return this.addHttpHeader(HttpHeader.CONTENT_TYPE, contentType);
   }
+  /**
+   * ### 是否直接抛出错误
+   * @param isThrowError 是否回调错误
+   */
+  throwError(isThrowError = true) {
+    this.isThrowError = isThrowError;
+    return this;
+  }
+  /**
+   * ### 无返回发送请求
+   * @param postData 发送的数据模型(数组)
+   */
+  async request(postData) {
+    await this.requestRaw(postData);
+  }
   /**
    * ### 发送请求并获取转换后的模型
-   * @param postData 请求的数据
+   * @param postData 发送的数据模型(数组)
    * @param parseClass 返回的模型
    */
-  async post(postData, parseClass) {
-    const result = await this.request(postData);
+  async requestModel(postData, parseClass) {
+    const result = await this.requestRaw(postData);
     return Transformer.parse(result, parseClass);
   }
   /**
    * ### 发送请求并获取转换后的模型数组
-   * @param postData 请求的数据
+   * @param postData 发送的数据模型(数组)
    * @param parseClass 返回的模型数组
    */
-  async postArray(postData, parseClass) {
-    const result = await this.request(postData);
+  async requestModelList(postData, parseClass) {
+    const result = await this.requestRaw(postData);
     return result.map((item) => Transformer.parse(item, parseClass));
   }
   /**
-   * ### 是否直接抛出错误
-   * @param isThrowError 是否回调错误
-   */
-  throwError(isThrowError = true) {
-    this.isThrowError = isThrowError;
-    return this;
-  }
-  /**
-   * ### POST 发送模型/模型数组并
+   * ### POST 发送请求并获取原始 `data`
    * @param postData 发送的数据模型(数组)
+   * @returns 响应的原始 `data`
    */
-  async request(postData) {
+  async requestRaw(postData) {
     let body = {};
     if (postData) {
       if (Array.isArray(postData)) {
@@ -15106,12 +15114,23 @@ class Http {
         body = postData.toJson();
       }
     }
-    this.setMethod(HttpMethod.POST);
+    return this.send({
+      body
+    });
+  }
+  /**
+   * 发送请求
+   * @param request 请求
+   * @param request.body 请求体
+   * @param request.params 请求参数
+   * @returns 响应的JSON
+   */
+  async send(request) {
     return new Promise((resolve, reject) => {
       if (this.loadingHandler) {
         this.loadingHandler(true);
       }
-      this.send(body).then((response) => {
+      this.axiosRequest(request).then((response) => {
         if (response.code === WebConfig.unAuthorizeCode) {
           if (this.isThrowError || !this.errorHandler) {
             reject(response);
@@ -15148,17 +15167,19 @@ class Http {
   /**
    * ### 发送请求
    *
-   * @param body `可选` 请求体
-   * @see request() 直接发送 `POST`
-   * @see get() 直接发送 `GET`
+   * @param request 请求
+   * @param request.body 请求体
+   * @param request.params 请求参数
    */
-  async send(body) {
+  async axiosRequest(request) {
+    const { body, params } = request;
     const axiosConfig = {};
     axiosConfig.url = this.url;
     axiosConfig.headers = this.headers;
     axiosConfig.timeout = this.timeout;
     axiosConfig.method = this.method;
     axiosConfig.data = body;
+    axiosConfig.params = params;
     axiosConfig.withCredentials = this.widthCookie;
     const response = new HttpResponse();
     try {
@@ -15217,7 +15238,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       try {
         const exportModel = new ExportModel();
         exportModel.fileCode = fileCode;
-        const downloadPath = await Http.create(props.param.queryExportUrl).throwError().request(exportModel);
+        const downloadPath = await Http.create(props.param.queryExportUrl).throwError().requestRaw(exportModel);
         isLoading.value = false;
         exportFilePath.value = WebFileUtil.getStaticFileUrl(downloadPath);
       } catch (e) {
@@ -15236,9 +15257,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       try {
         const exportRequest = props.param.param;
         exportRequest.page = void 0;
-        const fileCode = await Http.create(props.param.createExportTaskUrl).request(
-          exportRequest
-        );
+        const fileCode = await Http.create(props.param.createExportTaskUrl).requestRaw(exportRequest);
         await startLoop(fileCode);
       } catch (e) {
         console.warn(e);
@@ -18537,7 +18556,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   }, () => [
                     item.prefixText ? (openBlock(), createElementBlock("span", _hoisted_5$1, toDisplayString(item.prefixText), 1)) : createCommentVNode("", true),
                     item.formatter ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                      createTextVNode(toDisplayString(item.formatter(getValue(scope, item.key))), 1)
+                      createTextVNode(toDisplayString(item.formatter(getRowEntity(scope))), 1)
                     ], 64)) : unref(getDictionary)(unref(EntityClass), item.key) ? (openBlock(), createBlock(unref(EnumColumn), {
                       key: 2,
                       column: item,
@@ -18606,7 +18625,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                       disabled: button.disabled ? button.disabled(getRowEntity(scope)) : false,
                       type: button.dangerButton ? "danger" : button.warningButton ? "warning" : "default",
                       underline: "never",
-                      onClick: ($event) => handleDelete(getRowEntity(scope))
+                      onClick: ($event) => button.click(getRowEntity(scope))
                     }, {
                       default: withCtx(() => [
                         createTextVNode(toDisplayString(button.label), 1)
@@ -19949,7 +19968,7 @@ class AbstractCurdService extends AbstractService {
    * @param apiUrl `可选` 自定义请求URL
    */
   async getPage(request, apiUrl = this.urlGetPage) {
-    const responsePage = await this.api(apiUrl).post(request, QueryResponsePage);
+    const responsePage = await this.api(apiUrl).requestModel(request, QueryResponsePage);
     responsePage.list = responsePage.list.map((json) => Transformer.parse(json, this.entityClass));
     return responsePage;
   }
@@ -19959,7 +19978,7 @@ class AbstractCurdService extends AbstractService {
    * @param apiUrl `可选` 自定义请求URL
    */
   async getList(request, apiUrl = this.urlGetList) {
-    return this.api(apiUrl).postArray(request, this.entityClass);
+    return this.api(apiUrl).requestModelList(request, this.entityClass);
   }
   /**
    * ### 查询树结构数据数组
@@ -19967,7 +19986,7 @@ class AbstractCurdService extends AbstractService {
    * @param apiUrl `可选` 自定义请求URL
    */
   async getTreeList(request, apiUrl = this.urlGetTreeList) {
-    return this.api(apiUrl).postArray(request, this.entityClass);
+    return this.api(apiUrl).requestModelList(request, this.entityClass);
   }
   /**
    * ### 根据 `ID` 获取详情对象
@@ -19975,7 +19994,7 @@ class AbstractCurdService extends AbstractService {
    * @param apiUrl `可选` 自定义请求URL
    */
   async getDetail(id, apiUrl = this.urlGetDetail) {
-    return this.api(apiUrl).post(this.newEntityInstance(id), this.entityClass);
+    return this.api(apiUrl).requestModel(this.newEntityInstance(id), this.entityClass);
   }
   /**
    * ### 添加一条新的数据
@@ -19984,7 +20003,7 @@ class AbstractCurdService extends AbstractService {
    * @param apiUrl `可选` 自定义请求URL
    */
   async add(data, message, apiUrl = this.urlAdd) {
-    const saved = await this.api(apiUrl).post(data, this.entityClass);
+    const saved = await this.api(apiUrl).requestModel(data, this.entityClass);
     FeedbackUtil.toastSuccess(message || WebI18n.get().AddSuccess);
     return saved.id;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airpower/web",
   "type": "module",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "description": "AirPower-Web",
   "author": {
     "name": "Hamm",