From 6b699dc5a69457d76577d17903d54011a6561d97 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 八月 2023 11:48:47 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/prop-card/index.jsx | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index ed061cf..f8dcefe 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -47,7 +47,7 @@
if (BData) {
BID = BData.$BID || ''
}
-
+
if (_config.wrap.datatype === 'dynamic') {
_config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
@@ -118,8 +118,7 @@
data: _data,
BID: BID || '',
BData: BData || '',
- config: _config,
- arr_field: _config.columns.map(col => col.field).join(',')
+ config: _config
})
}
@@ -472,10 +471,8 @@
}
callback({
- arr_field: '',
orderBy: '',
- search: searches,
- menuName: config.name
+ search: searches
})
}
@@ -488,7 +485,7 @@
}
async loadData (type, btn) {
- const { config, arr_field, BID, BData, selected } = this.state
+ const { config, BID, BData, selected } = this.state
if (config.wrap.datatype === 'public') {
MKEmitter.emit('reloadData', config.wrap.publicId)
@@ -528,7 +525,7 @@
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
--
Gitblit v1.8.0