@juzhenfe/page-model 3.17.6 → 3.17.7

package/dist/components/page-model/constructor.d.ts

@@ -65,6 +65,10 @@ export default class PageModelManager extends Reflections {
     updatedChildrenConfig(): void;
     registerChildManager(managerName: any, manager: TableManager | SearchFormManager | TopTabsManager | FormManager): void;
     handleSubmit(): Promise<boolean>;
+    /**
+     * 上次请求数据
+     */
+    lastReqData: any;
     doGetDataRequest(): Promise<boolean>;
     /**
      * 处理表格数据

package/dist/components/table/constructor.d.ts

@@ -302,14 +302,6 @@ export default class TableManager extends IManager {
      * 更新当前渲染的列元素
      */
     updateCurrentRenderTableEls(els: PageModel.TableBaseItem[]): void;
-    /**
-     * 当前elTable渲染的column
-     */
-    currentTableColumns: any[];
-    /**
-     * 更新当前elTable渲染的column
-     */
-    updateCurrentTableColumns(columns: any[]): void;
     /**
      * 当前列元素更新
      */

package/dist/components/table/type.d.ts

@@ -114,6 +114,9 @@ declare global {
       }
       lazy?: boolean
       load?: AnyFunction
+      /**
+       * pageModel定义合计函数
+       */
       _customSummary?: boolean
     }
 

package/dist/components/table/utils/use-static-summary.d.ts

@@ -2,12 +2,6 @@
  * 使用用户配置的汇总
  */
 import TableManager from '../constructor';
-import EventEmitter from '../../../utils/event-emitter';
-/**
- * 用户汇总配置修改事件
- */
-declare const userSummaryConfigEmiter: EventEmitter<"change">;
-export { userSummaryConfigEmiter };
 export declare enum SummaryTypeEnum {
     不展示 = 0,
     求和 = 1,
@@ -18,4 +12,4 @@ export declare enum SummaryTypeEnum {
  * @param tableManager
  * @returns
  */
-export declare function useUserSummary(tableManager: TableManager): boolean;
+export declare function useUserSummary(tableManager: TableManager): () => boolean;

package/dist/index.es.js

@@ -3746,6 +3746,7 @@ const _PageModelManager = class extends Reflections {
     __publicField(this, "staticData");
     __publicField(this, "id", 0);
     __publicField(this, "isTableFullscreen", false);
+    __publicField(this, "lastReqData");
     __publicField(this, "isTableSelecting", false);
     __publicField(this, "loadingInstance");
     __publicField(this, "authButtons", []);
@@ -3893,6 +3894,7 @@ const _PageModelManager = class extends Reflections {
       if (typeof config.beforeGetRequest === "function") {
         config.beforeGetRequest.call(this, reqData);
       }
+      this.lastReqData = reqData;
       let reqResult = await _PageModelManager.request[method](
         config.getUrl,
         reqData
@@ -4698,7 +4700,6 @@ class TableManager extends IManager {
     __publicField(this, "radioData", null);
     __publicField(this, "currentFilterTableEls", []);
     __publicField(this, "currentRenderTableEls");
-    __publicField(this, "currentTableColumns", []);
     __publicField(this, "innerFilters", null);
     __publicField(this, "saveContentScope");
     __publicField(this, "saveContent");
@@ -5444,9 +5445,6 @@ class TableManager extends IManager {
     this.currentRenderTableEls = els;
     this.onCurrentRenderTableElsChange();
   }
-  updateCurrentTableColumns(columns) {
-    this.currentTableColumns = columns;
-  }
   onCurrentRenderTableElsChange() {
     const propList = this.currentRenderTableEls.map((a) => a.prop).filter((a) => a);
     this.columnParamsList = this.columnParamsList.filter((a) => {
@@ -9038,42 +9036,46 @@ function useTableEls(originTableEls, tableManager) {
     renderEls
   };
 }
-const userSummaryConfigEmiter = new EventEmitter();
 var SummaryTypeEnum = /* @__PURE__ */ ((SummaryTypeEnum2) => {
   SummaryTypeEnum2[SummaryTypeEnum2["\u4E0D\u5C55\u793A"] = 0] = "\u4E0D\u5C55\u793A";
   SummaryTypeEnum2[SummaryTypeEnum2["\u6C42\u548C"] = 1] = "\u6C42\u548C";
   SummaryTypeEnum2[SummaryTypeEnum2["\u603B\u6570"] = 2] = "\u603B\u6570";
   return SummaryTypeEnum2;
 })(SummaryTypeEnum || {});
-let isHijacked = false;
-let summaryResult = reactive([]);
 function useUserSummary(tableManager) {
-  var _a, _b;
-  if (((_a = tableManager.tableProps) == null ? void 0 : _a.summaryMethod) && !((_b = tableManager.tableProps) == null ? void 0 : _b._customSummary)) {
-    return false;
-  }
-  const currentRenderTableEls = tableManager.currentRenderTableEls;
-  const isUsingSummary = tableManager.table.showSummary || currentRenderTableEls.filter((a) => a.prop).some((a) => a.showSummary != null);
-  if (isUsingSummary) {
-    const summaryEls = currentRenderTableEls.filter((a) => a.showSummary != null && a.showSummary !== "").filter((a) => a.prop);
-    const isServerSummary = tableManager.table.useServerSummary && typeof tableManager.table.serverSummaryFn === "function";
-    tableManager.tableProps = tableManager.tableProps || {};
+  let isHijacked = false;
+  let summaryResult = reactive([]);
+  let currentTableColumns = [];
+  let lastSummaryColumns = [];
+  return function initSummary() {
+    if (tableManager.tableProps.summaryMethod && !tableManager.tableProps._customSummary) {
+      return false;
+    }
+    const currentRenderTableEls = tableManager.currentRenderTableEls;
+    const isUsingSummary = tableManager.table.showSummary || currentRenderTableEls.filter((a) => a.prop).some((a) => a.showSummary != null);
+    if (!isUsingSummary) {
+      tableManager.tableProps.showSummary = false;
+      tableManager.tableProps.summaryMethod = null;
+      return false;
+    }
     tableManager.tableProps.showSummary = true;
     tableManager.tableProps._customSummary = true;
-    let currentTableColumns = [];
-    const config = tableManager.manager.config;
-    let lastSummaryColumns = {};
-    const getSummaryData = debounce(async () => {
-      const summaryColumns = tableManager.currentRenderTableEls.filter((a) => a.showSummary != null && a.showSummary !== "").filter((a) => a.prop).map((a) => {
+    const getSummaryEls = () => {
+      return tableManager.currentRenderTableEls.filter((a) => a.showSummary != null && a.showSummary !== "").filter((a) => a.prop).map((a) => {
         return {
           prop: a.prop,
           showSummary: a.showSummary
         };
       });
+    };
+    const summaryEls = getSummaryEls();
+    const isServerSummary = tableManager.table.useServerSummary && typeof tableManager.table.serverSummaryFn === "function";
+    const getSummaryData = debounce(async () => {
+      const summaryColumns = lastSummaryColumns = getSummaryEls();
       const reqResult = tableManager.table.serverSummaryFn.call(
         tableManager,
         summaryColumns,
-        cloneDeep(lastSummaryColumns),
+        cloneDeep(tableManager.manager.lastReqData),
         currentTableColumns
       );
       const _result = await reqResult;
@@ -9083,17 +9085,14 @@ function useUserSummary(tableManager) {
     }, 300);
     if (isServerSummary) {
       if (!isHijacked) {
+        const config = tableManager.manager.config;
         let _beforeGetRequest = config.beforeGetRequest;
         config.beforeGetRequest = async function(reqParams) {
           if (typeof _beforeGetRequest === "function") {
             _beforeGetRequest.call(tableManager.manager, reqParams);
           }
-          lastSummaryColumns = reqParams;
           getSummaryData();
         };
-        userSummaryConfigEmiter.on("change", () => {
-          getSummaryData();
-        });
         isHijacked = true;
       }
     }
@@ -9102,11 +9101,10 @@ function useUserSummary(tableManager) {
       data
     }) {
       if (!columns.length) {
-        return summaryResult;
+        return [];
       }
-      tableManager.updateCurrentTableColumns(columns);
       if (isServerSummary) {
-        if (columns.length !== currentTableColumns.length) {
+        if (currentTableColumns.length !== columns.length || currentTableColumns.map((a) => a.property).join(",") !== columns.map((a) => a.property).join(",") || getSummaryEls().map((a) => a.showSummary).join(",") !== lastSummaryColumns.map((a) => a.showSummary).join(",")) {
           getSummaryData();
         }
         currentTableColumns = columns;
@@ -9179,13 +9177,7 @@ function useUserSummary(tableManager) {
         );
       });
     };
-    setTimeout(() => {
-      tableManager.context.$refs.tableRef.doLayout();
-    }, 20);
-  } else {
-    tableManager.tableProps.showSummary = false;
-    tableManager.tableProps.summaryMethod = null;
-  }
+  };
 }
 const useExportForm = () => {
   const exportFormRef = ref();
@@ -9487,13 +9479,14 @@ const _sfc_main$n = defineComponent({
     });
     const filteredUserEls = ref([]);
     const renderedTableEls = ref();
+    const initSummary = useUserSummary(tableManager);
     function setTableEls() {
       const result = useTableEls(table.value.els, tableManager);
       filteredUserEls.value = result.filteredUserEls;
       renderedTableEls.value = result.renderEls;
       tableManager.updateCurrentFilterTableEls(cloneDeep(result.filteredUserEls));
       tableManager.updateCurrentRenderTableEls(cloneDeep(result.renderEls));
-      useUserSummary(tableManager);
+      initSummary();
     }
     tableUserConfigChangeEmiter.on("change", () => {
       setTableEls();
@@ -9524,7 +9517,6 @@ const _sfc_main$n = defineComponent({
     };
     const onSaveColumns = async (columns) => {
       const originColumns = table.value.els;
-      let isSummaryChange = false;
       const contents = columns.map((column) => {
         const originColumnIndex = originColumns.findIndex((a) => a.label === column.label);
         const item = {
@@ -9539,9 +9531,8 @@ const _sfc_main$n = defineComponent({
           item.sum = Number(column.showSummary);
         }
         const renderColumn = filteredUserEls.value.find((a) => a.prop === column.prop);
-        if (column.showSummary !== (renderColumn == null ? void 0 : renderColumn.showSummary)) {
-          isSummaryChange = true;
-        }
+        if (column.showSummary !== (renderColumn == null ? void 0 : renderColumn.showSummary))
+          ;
         return item;
       });
       const userSetting = PageModelManager.userSetting;
@@ -9557,9 +9548,6 @@ const _sfc_main$n = defineComponent({
       } catch (error) {
       }
       setTableEls();
-      if (isSummaryChange) {
-        userSummaryConfigEmiter.emit("change");
-      }
     };
     const clearSelection = () => {
       tableManager.clearSelection();
@@ -14903,7 +14891,7 @@ const defineEditableTable = function(config) {
 };
 var iconfont = "";
 const name = "@juzhenfe/page-model";
-const version = "3.17.6";
+const version = "3.17.7";
 const types = "dist/main.d.ts";
 const main = "dist/index.umd.js";
 const keywords = [