From 131bc212f0cfe964c9a38bbe6178aca4f4a16677 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:50:30 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/base-table/index.jsx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index 7f975c1..7c86fca 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -137,7 +137,7 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
- let result = await Api.genericInterface(param)
+ let result = await Api.genericInterface(param, setting.js_script)
if (result.status) {
if (repage === 'false' && result.data && result.data.length === 0 && result.total > 0 && pageIndex > 1) {
let _pageIndex = Math.ceil(result.total / pageSize)
@@ -566,8 +566,10 @@
BID: id,
BData: data
}, () => {
- this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
+ if (!setting.checkBid) {
+ this.loadmaindata(true, 'true')
+ this.getStatFieldsValue()
+ }
})
}
}
--
Gitblit v1.8.0