合并代码

2025-02-14 09:19:54 +08:00
parent c918b00887 12c5677a84
commit b6df8c5d21
36 changed files with 2483 additions and 317 deletions
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -791,8 +791,10 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
        if (props.contentConfig.parseData) {
          data = props.contentConfig.parseData(data);
        }
-        pagination.total = data.total;
-        pageData.value = data.list;
+        pagination.total = !props.contentConfig.resultListKey ? data.length : data.totalRow * 1;
+        pageData.value = props.contentConfig.resultListKey
+          ? data[props.contentConfig.resultListKey]
+          : data;
      } else {
        pageData.value = data;
      }