From 839d9e1d6481ec2ca1a5979f24256ef3b2e741b1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 七月 2023 19:28:44 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/edit-table/index.jsx | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 6450750..fc305fe 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -252,10 +252,15 @@
return item
})
+ let total = result.total || 0
+ if (config.setting.custompage && data.length) {
+ total = data[data.length - 1].mk_total || 0
+ }
+
this.setState({
data: data,
selectedData: [],
- total: result.total,
+ total: total,
loading: false
})
--
Gitblit v1.8.0