@skyfox2000/webui 1.4.11 → 1.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.4.11",
+   "version": "1.4.13",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],

package/src/components/content/table/index.vue

@@ -180,6 +180,14 @@ onMounted(async () => {
          pagination.value.total = gridCtrl.total.value ?? 0;
       }
    } else if (gridCtrl.autoload !== false) {
+      if (gridCtrl.page) {
+         if (gridCtrl.gridUrl?.url === gridCtrl.page.urls.list) {
+            gridCtrl.remotePage = false;
+         }
+         if (gridCtrl.gridUrl?.url === gridCtrl.page.urls.find) {
+            gridCtrl.remotePage = true;
+         }
+      }
       if (gridCtrl.remotePage) {
          dataList.value = (await gridQueryFind(gridCtrl)).rows;
       } else {

package/src/utils/micro-openapis.ts

@@ -25,6 +25,7 @@ interface ApiResponseData {
 class MicroAppSDK {
    private static messageId = 0;
    private static callbacks = new Map<number, { resolve: Function; reject: Function }>();
+   private static pendingRequests = new Map<string, Promise<any>>();
 
    /**
     * 检查是否在微前端环境中运行
@@ -46,6 +47,15 @@ class MicroAppSDK {
          throw new Error(`未配置${method}接口！`);
       }
 
+      // 生成请求标识符（方法名+参数JSON字符串）
+      const requestKey = `${method}_${JSON.stringify(params)}`;
+      
+      // 检查是否已有相同请求正在进行
+      if (this.pendingRequests.has(requestKey)) {
+         // 返回正在进行的请求的Promise
+         return this.pendingRequests.get(requestKey);
+      }
+
       // 生成唯一消息ID
       const id = ++this.messageId;
 
@@ -57,11 +67,15 @@ class MicroAppSDK {
          setTimeout(() => {
             if (this.callbacks.has(id)) {
                this.callbacks.delete(id);
+               this.pendingRequests.delete(requestKey);
                reject(new Error(`API调用超时: ${method}`));
             }
          }, 10000); // 10秒超时
       });
 
+      // 保存正在进行的请求
+      this.pendingRequests.set(requestKey, promise);
+
       // 构造请求数据
       const requestData: ApiRequestData = {
          type: 'API_REQUEST',
@@ -74,7 +88,14 @@ class MicroAppSDK {
       (window as any).microApp.dispatch(requestData);
 
       // 等待结果
-      return promise;
+      try {
+         const result = await promise;
+         this.pendingRequests.delete(requestKey);
+         return result;
+      } catch (error) {
+         this.pendingRequests.delete(requestKey);
+         throw error;
+      }
    }
 
    /**
@@ -165,4 +186,4 @@ export const MicroOpenApis = {
    userLogout: MicroAppSDK.userLogout.bind(MicroAppSDK),
    mainAppPush: MicroAppSDK.mainAppPush.bind(MicroAppSDK),
    isInMicroApp: MicroAppSDK.isInMicroApp.bind(MicroAppSDK),
-};
+};

package/src/utils/table.ts

@@ -96,7 +96,6 @@ export const mergeColumns = (newColumns: TableColumn[], oldColumns?: TableColumn
  * @returns
  */
 export const gridQueryList = <T>(gridCtrl: GridControl<T>): Promise<T[]> => {
-   gridCtrl.remotePage = false;
    return gridQueryFind(gridCtrl).then((result) => {
       return result.rows as T[];
    });