@skyfox2000/webui 1.5.21 → 1.5.22

package/lib/assets/modules/{uploadList-2nN7g3jv.js → uploadList-BVcO1MPp.js}

@@ -1,11 +1,11 @@
 import { defineComponent as ce, ref as R, computed as I, watch as $, resolveDirective as de, createElementBlock as m, openBlock as d, normalizeClass as z, unref as n, createElementVNode as w, withDirectives as b, createCommentVNode as y, createBlock as V, mergeProps as G, withCtx as v, createVNode as p, createTextVNode as E, toDisplayString as P, Fragment as pe, renderList as me } from "vue";
-import { _ as H } from "./index-xBhZt3kd.js";
-import { a as B, _ as K } from "./toolIcon-CQYHaCan.js";
+import { _ as H } from "./index-D62pvKsu.js";
+import { a as B, _ as K } from "./toolIcon-BPUk821a.js";
 import { httpPost as N, ResStatus as j } from "@skyfox2000/fapi";
-import { L as X, u as Y, $ as a, v as fe, _ as he } from "./upload-template-DBTaPGiN.js";
+import { L as X, u as Y, $ as a, v as fe, _ as he } from "./upload-template-1qHFUTUu.js";
 import U from "vue-m-message";
 import { Upload as J, Tag as we, Popconfirm as ve, Progress as xe } from "ant-design-vue";
-import { U as r, f as be, p as W } from "./file-upload-D0PzDzw5.js";
+import { U as r, f as be, p as W } from "./file-upload-czkP0_KZ.js";
 import { combineParams as Z } from "@skyfox2000/microbase";
 import "async-validator";
 import "dayjs";

package/lib/es/AceEditor/index.js

@@ -1,10 +1,10 @@
 import { defineComponent as V, defineAsyncComponent as J, ref as m, watch as K, onMounted as W, createElementBlock as x, openBlock as p, Fragment as z, createElementVNode as f, createVNode as N, toDisplayString as $, unref as l, createBlock as A, withKeys as v, normalizeClass as O, withModifiers as w, withCtx as L, createCommentVNode as q } from "vue";
 import "ant-design-vue";
-import { _ as D } from "../../assets/modules/toolIcon-CQYHaCan.js";
+import { _ as D } from "../../assets/modules/toolIcon-BPUk821a.js";
 import "@skyfox2000/fapi";
-import { $ as b } from "../../assets/modules/upload-template-DBTaPGiN.js";
+import { $ as b } from "../../assets/modules/upload-template-1qHFUTUu.js";
 import "vue-m-message";
-import { _ as Q } from "../../assets/modules/index-Br13CsSY.js";
+import { _ as Q } from "../../assets/modules/index-BM6-4CHA.js";
 import "@skyfox2000/microbase";
 import "async-validator";
 import "dayjs";

package/lib/es/BasicLayout/index.js

@@ -1,6 +1,6 @@
 import { defineComponent as f, ref as d, watch as _, onMounted as v, resolveComponent as h, createBlock as o, openBlock as t, withCtx as s, createElementVNode as C, normalizeClass as x, createVNode as w, KeepAlive as y, unref as n, resolveDynamicComponent as I } from "vue";
-import { _ as g } from "../../assets/modules/baseLayout-D1c-i5Jy.js";
-import { al as A, a as S } from "../../assets/modules/upload-template-DBTaPGiN.js";
+import { _ as g } from "../../assets/modules/baseLayout-BbWv6Njy.js";
+import { al as A, a as S } from "../../assets/modules/upload-template-1qHFUTUu.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import b from "vue-m-message";

package/lib/es/Error403/index.js

@@ -1,5 +1,5 @@
 import { defineComponent as i, createBlock as n, openBlock as p, unref as r, withCtx as e, createVNode as m, createTextVNode as c, toDisplayString as a } from "vue";
-import { r as s } from "../../assets/modules/upload-template-DBTaPGiN.js";
+import { r as s } from "../../assets/modules/upload-template-1qHFUTUu.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import "vue-m-message";

package/lib/es/Error404/index.js

@@ -1,5 +1,5 @@
 import { defineComponent as i, createBlock as n, openBlock as p, unref as e, withCtx as r, createVNode as m, createTextVNode as a, toDisplayString as c } from "vue";
-import { r as u } from "../../assets/modules/upload-template-DBTaPGiN.js";
+import { r as u } from "../../assets/modules/upload-template-1qHFUTUu.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import "vue-m-message";

package/lib/es/ExcelForm/index.js

@@ -1,11 +1,11 @@
 import { defineComponent as be, ref as p, computed as S, watch as H, onMounted as he, createBlock as Q, openBlock as f, unref as r, withCtx as D, renderSlot as W, createElementBlock as g, createCommentVNode as B, createElementVNode as b, createVNode as _, createTextVNode as J, toDisplayString as E, normalizeClass as Fe, Fragment as ie, renderList as ne } from "vue";
-import { _ as Y } from "../../assets/modules/index-xBhZt3kd.js";
+import { _ as Y } from "../../assets/modules/index-D62pvKsu.js";
 import { Modal as Ce, Upload as ce, Space as Ue } from "ant-design-vue";
 import { httpGet as _e, ResStatus as de } from "@skyfox2000/fapi";
-import { $ as a, H as Ee, a8 as Te, af as Re } from "../../assets/modules/upload-template-DBTaPGiN.js";
+import { $ as a, H as Ee, a8 as Te, af as Re } from "../../assets/modules/upload-template-1qHFUTUu.js";
 import m from "vue-m-message";
-import { c as pe, _ as Z, h as Se, p as De, i as ke } from "../../assets/modules/index-2FnjnZKE.js";
-import { A as Pe, p as Le, U as ue } from "../../assets/modules/file-upload-D0PzDzw5.js";
+import { c as pe, _ as Z, h as Se, p as De, i as ke } from "../../assets/modules/index-CnrS4kfC.js";
+import { A as Pe, p as Le, U as ue } from "../../assets/modules/file-upload-czkP0_KZ.js";
 import "@skyfox2000/microbase";
 import "dayjs";
 import "vue-draggable-next";

package/lib/es/MenuLayout/index.js

@@ -1,6 +1,6 @@
 import { defineComponent as f, ref as d, watch as _, onMounted as v, resolveComponent as h, createBlock as o, openBlock as t, withCtx as s, createElementVNode as C, normalizeClass as x, createVNode as w, KeepAlive as I, unref as n, resolveDynamicComponent as g } from "vue";
-import { _ as y } from "../../assets/modules/baseLayout-D1c-i5Jy.js";
-import { al as A, a as S } from "../../assets/modules/upload-template-DBTaPGiN.js";
+import { _ as y } from "../../assets/modules/baseLayout-BbWv6Njy.js";
+import { al as A, a as S } from "../../assets/modules/upload-template-1qHFUTUu.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import k from "vue-m-message";

package/lib/es/TemplateFile/index.js

@@ -1,15 +1,15 @@
 import { defineComponent as T, ref as l, watch as x, onMounted as F, createBlock as C, openBlock as q, unref as u, withCtx as d, createVNode as f, createTextVNode as L, toDisplayString as b } from "vue";
-import { _ as g } from "../../assets/modules/index-xBhZt3kd.js";
+import { _ as g } from "../../assets/modules/index-D62pvKsu.js";
 import { Modal as D, Space as z } from "ant-design-vue";
 import { httpPost as N, ResStatus as O } from "@skyfox2000/fapi";
-import { ao as n, $ as w } from "../../assets/modules/upload-template-DBTaPGiN.js";
+import { ao as n, $ as w } from "../../assets/modules/upload-template-1qHFUTUu.js";
 import "vue-m-message";
-import { U as M } from "../../assets/modules/file-upload-D0PzDzw5.js";
+import { U as M } from "../../assets/modules/file-upload-czkP0_KZ.js";
 import "@skyfox2000/microbase";
 import "async-validator";
 import "dayjs";
 import "vue-draggable-next";
-import { U as $ } from "../../assets/modules/uploadList-2nN7g3jv.js";
+import { U as $ } from "../../assets/modules/uploadList-BVcO1MPp.js";
 const H = /* @__PURE__ */ T({
   __name: "templateFile",
   props: {

package/lib/es/UploadForm/index.js

@@ -1,15 +1,15 @@
 import { defineComponent as F, ref as s, watch as y, onMounted as z, createBlock as D, openBlock as _, unref as u, withCtx as p, createVNode as m, mergeProps as L, createTextVNode as w, toDisplayString as C } from "vue";
-import { _ as g } from "../../assets/modules/index-xBhZt3kd.js";
+import { _ as g } from "../../assets/modules/index-D62pvKsu.js";
 import { Modal as k, Space as N } from "ant-design-vue";
 import { ResStatus as T } from "@skyfox2000/fapi";
-import { $ as v, ab as $ } from "../../assets/modules/upload-template-DBTaPGiN.js";
+import { $ as v, ab as $ } from "../../assets/modules/upload-template-1qHFUTUu.js";
 import A from "vue-m-message";
 import "@skyfox2000/microbase";
 import "async-validator";
 import "dayjs";
-import { A as E } from "../../assets/modules/file-upload-D0PzDzw5.js";
+import { A as E } from "../../assets/modules/file-upload-czkP0_KZ.js";
 import "vue-draggable-next";
-import { U as B } from "../../assets/modules/uploadList-2nN7g3jv.js";
+import { U as B } from "../../assets/modules/uploadList-BVcO1MPp.js";
 const W = /* @__PURE__ */ F({
   __name: "uploadForm",
   props: {

package/lib/webui.es.js

@@ -1,7 +1,7 @@
-import { u as Be, i as ve, $ as y, a as Ae, L as $t, c as Dt, P as oe, o as Qe, b as Ft, d as Pt, e as Je, g as Xe, r as fe, f as Ze, h as et, j as tt, k as It, l as be, m as at, _ as lt, n as rt, O as ze, p as Et, q as ot, s as Lt, t as Ut, v as te, w as Mt, x as Nt, y as Rt, z as Bt, A as At, B as zt, C as se, D as Ot, E as de, F as Kt, G as jt, H as st, M as Vt } from "./assets/modules/upload-template-DBTaPGiN.js";
-import { ah as Vr, V as Yr, W as Gr, a0 as Wr, ag as Hr, ae as qr, af as Qr, ai as Jr, as as Xr, a3 as Zr, Y as eo, at as to, ac as ao, a8 as lo, T as ro, a9 as oo, ab as so, aq as no, ar as io, Z as co, K as uo, J as po, a5 as fo, aa as vo, ad as mo, U as go, X as ho, aj as bo, I as xo, a7 as yo, ak as wo, a2 as ko, a4 as _o, au as Co, a1 as So, ap as To, ao as $o, al as Do, N as Fo, Q as Po, am as Io, S as Eo, an as Lo, R as Uo, a6 as Mo } from "./assets/modules/upload-template-DBTaPGiN.js";
-import { f as Yt, p as Ve } from "./assets/modules/file-upload-D0PzDzw5.js";
-import { A as Ro, U as Bo } from "./assets/modules/file-upload-D0PzDzw5.js";
+import { u as Be, i as ve, $ as y, a as Ae, L as $t, c as Dt, P as oe, o as Qe, b as Ft, d as Pt, e as Je, g as Xe, r as fe, f as Ze, h as et, j as tt, k as It, l as be, m as at, _ as lt, n as rt, O as ze, p as Et, q as ot, s as Lt, t as Ut, v as te, w as Mt, x as Nt, y as Rt, z as Bt, A as At, B as zt, C as se, D as Ot, E as de, F as Kt, G as jt, H as st, M as Vt } from "./assets/modules/upload-template-1qHFUTUu.js";
+import { ah as Vr, V as Yr, W as Gr, a0 as Wr, ag as Hr, ae as qr, af as Qr, ai as Jr, as as Xr, a3 as Zr, Y as eo, at as to, ac as ao, a8 as lo, T as ro, a9 as oo, ab as so, aq as no, ar as io, Z as co, K as uo, J as po, a5 as fo, aa as vo, ad as mo, U as go, X as ho, aj as bo, I as xo, a7 as yo, ak as wo, a2 as ko, a4 as _o, au as Co, a1 as So, ap as To, ao as $o, al as Do, N as Fo, Q as Po, am as Io, S as Eo, an as Lo, R as Uo, a6 as Mo } from "./assets/modules/upload-template-1qHFUTUu.js";
+import { f as Yt, p as Ve } from "./assets/modules/file-upload-czkP0_KZ.js";
+import { A as Ro, U as Bo } from "./assets/modules/file-upload-czkP0_KZ.js";
 import { EnvConfig as Ye, isMicroApp as Gt } from "@skyfox2000/microbase";
 import { FrontCache as he, httpPost as Oe, ResStatus as Ke, SERVER_HOST as Wt, fieldMapping as xe } from "@skyfox2000/fapi";
 import ae from "vue-m-message";
@@ -10,15 +10,15 @@ import "async-validator";
 import Ne from "dayjs";
 import { Popover as Jt, theme as ct, Drawer as Xt, Space as pe, Form as ut, message as Zt, FormItem as dt, ConfigProvider as we, Popconfirm as pt, DropdownButton as ft, Menu as Te, MenuItem as $e, Dropdown as Re, Checkbox as ea, List as ta, ListItem as aa, Card as la, Button as vt, Table as mt, Tree as ra, Cascader as oa, DatePicker as sa, Input as me, InputPassword as na, InputNumber as ia, RangePicker as ca, Textarea as ua, TimePicker as da, Transfer as pa, TreeSelect as fa, Upload as va, Image as ma, LayoutContent as ga } from "ant-design-vue";
 import { VueDraggableNext as ha } from "vue-draggable-next";
-import { d as ba } from "./assets/modules/uploadList-2nN7g3jv.js";
-import { C as zo, U as Oo, a as Ko, p as jo } from "./assets/modules/uploadList-2nN7g3jv.js";
-import { c as gt } from "./assets/modules/index-2FnjnZKE.js";
-import { _ as Yo, h as Go, b as Wo, a as Ho, d as qo, e as Qo, g as Jo, f as Xo, n as Zo, p as es, t as ts, v as as } from "./assets/modules/index-2FnjnZKE.js";
-import { _ as ee } from "./assets/modules/index-xBhZt3kd.js";
-import { _ as Y } from "./assets/modules/toolIcon-CQYHaCan.js";
-import { a as rs } from "./assets/modules/toolIcon-CQYHaCan.js";
-import { _ as ss, b as ns, c as is, d as cs, e as us, I as ds, f as ps, g as fs, a as vs } from "./assets/modules/menuTabs-DGBmIq_G.js";
-import { _ as gs } from "./assets/modules/index-Br13CsSY.js";
+import { d as ba } from "./assets/modules/uploadList-BVcO1MPp.js";
+import { C as zo, U as Oo, a as Ko, p as jo } from "./assets/modules/uploadList-BVcO1MPp.js";
+import { c as gt } from "./assets/modules/index-CnrS4kfC.js";
+import { _ as Yo, h as Go, b as Wo, a as Ho, d as qo, e as Qo, g as Jo, f as Xo, n as Zo, p as es, t as ts, v as as } from "./assets/modules/index-CnrS4kfC.js";
+import { _ as ee } from "./assets/modules/index-D62pvKsu.js";
+import { _ as Y } from "./assets/modules/toolIcon-BPUk821a.js";
+import { a as rs } from "./assets/modules/toolIcon-BPUk821a.js";
+import { _ as ss, b as ns, c as is, d as cs, e as us, I as ds, f as ps, g as fs, a as vs } from "./assets/modules/menuTabs-DA2V4Fdt.js";
+import { _ as gs } from "./assets/modules/index-BM6-4CHA.js";
 import { _ as ce } from "./assets/modules/_plugin-vue_export-helper-CHgC5LLL.js";
 const We = (r, a, e, t = "remove") => {
   if (!e)

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.5.21",
+   "version": "1.5.22",
    "description": "后台前端通用组件定义, 支持国际化",
    "type": "module",
    "keywords": [],

package/src/utils/data.ts

@@ -1,5 +1,5 @@
 import { AnyControl, ExecuteOptions, PostOptions } from '@/typings/data.d';
-import { ApiResponse, httpPost, IUrlInfo, ResStatus } from '@skyfox2000/fapi';
+import { ApiResponse, httpPost, httpGet, IUrlInfo, ResStatus } from '@skyfox2000/fapi';
 import message from 'vue-m-message';
 import { isEmpty } from './isEmpty';
 import { combineParams } from '@skyfox2000/microbase';
@@ -63,8 +63,9 @@ const doPost = <T>(control: AnyControl, options: PostOptions<T>): Promise<ApiRes
    if (options.hideErrorToast) {
       url.hideErrorToast = true;
    }
-   // 发起请求
-   return httpPost<T>(url, newParams)
+   // 发起请求，根据method选择合适的HTTP方法
+   const httpMethod = url.method === 'GET' ? httpGet : httpPost;
+   return httpMethod<T>(url, newParams)
       .then((result: ApiResponse<T> | null) => {
          // 更新加载状态
          if (options.loadingState) {

package/src/utils/options.ts

@@ -3,6 +3,7 @@ import {
    ApiResponse,
    fieldMapping,
    httpPost,
+   httpGet,
    IUrlInfo,
    parseFieldTemplate,
    ReqParams,
@@ -165,7 +166,9 @@ const queryOptions = <T>(
    if (!params.Query) params.Query = {};
    optionCtrl.optionQuery = params;
    optionCtrl.isOptionLoading.value = true;
-   return httpPost<T>(optionUrl, params)
+   // 根据method选择合适的HTTP方法，查询操作通常使用GET
+   const httpMethod = optionUrl.method === 'GET' ? httpGet : httpPost;
+   return httpMethod<T>(optionUrl, params)
       .then((result: ApiResponse<T> | null) => {
          if (result?.status === ResStatus.SUCCESS) {
             if (result.data) {

package/src/utils/table.ts

@@ -114,7 +114,11 @@ export const gridQueryFind = <T>(gridCtrl: GridControl<T>): Promise<FindResult>
 
    return doQuery<FindResult>(gridCtrl, {
       urlKey,
-      url: gridCtrl.gridUrl,
+      url: {
+         url: gridCtrl.gridUrl?.url || '',
+         ...gridCtrl.gridUrl,
+         loadingText: gridCtrl.gridUrl?.loadingText || $t('webui.common.dataLoading'),
+      },
       params: gridCtrl.gridQuery,
       loadingState: gridCtrl.isGridLoading,
       loadingText: gridCtrl.gridUrl?.loadingText === false ? false : (gridCtrl.gridUrl?.loadingText || $t('webui.common.dataLoading')),