From 547e5fe219ee7bee309ecd67db74bc8df66b5433 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 八月 2023 11:47:45 +0800
Subject: [PATCH] 2023-08-23
---
src/tabviews/commontable/index.jsx | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 43da736..ab15b41 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -45,7 +45,6 @@
shortcuts: null, // 蹇嵎閿�
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- arr_field: '', // 鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
@@ -301,6 +300,16 @@
item.$old = true
item.ContainerId = this.state.ContainerId
+ if (item.OpenType === 'excelOut') { // 瀵煎嚭
+ item.$menuName = MenuName
+
+ if (!item.verify || !item.verify.columns || item.verify.columns.length === 0) {
+ item.errorType = 'error1'
+ } else if (item.intertype === 'system' && item.verify.dataType !== 'custom' && config.setting.interType !== 'system') {
+ item.errorType = 'error2'
+ }
+ }
+
if (item.OpenType === 'funcbutton' && item.funcType === 'print' && item.verify) { // 鎵撳嵃鏈鸿缃�
let _item = window.GLOB.UserCacheMap.get(this.props.MenuID + item.uuid)
@@ -441,6 +450,8 @@
resetContrl: config.setting.resetContrl,
}
+ config.setting.arr_field = _arrField.join(',')
+
this.setState({
pageSize: config.setting.pageSize || 10,
loadingview: false,
@@ -453,7 +464,6 @@
setting: config.setting,
actions: _actions,
columns: _columns,
- arr_field: _arrField.join(','),
BID: param && param.$BID ? param.$BID : '',
search: Utils.initMainSearch(config.search)
}, () => {
@@ -556,14 +566,14 @@
* @description 涓昏〃鏁版嵁鍔犺浇
*/
async loadmaindata (id) {
- const { setting, arr_field, search, orderBy, BID, pageIndex, pageSize, absFields, autoMatic } = this.state
+ const { setting, search, orderBy, BID, pageIndex, pageSize, absFields, autoMatic } = this.state
this.setState({
loading: true
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID)
+ let param = UtilsDM.getQueryDataParams(setting, search, _orderBy, pageIndex, pageSize, BID)
let result = await Api.genericInterface(param)
@@ -647,14 +657,14 @@
* @description 鑾峰彇鍗曡鏁版嵁
*/
async loadmainLinedata (id) {
- const { setting, arr_field, search, orderBy, BID, pageIndex, pageSize, absFields } = this.state
+ const { setting, search, orderBy, BID, pageIndex, pageSize, absFields } = this.state
this.setState({
loading: true
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, id)
+ let param = UtilsDM.getQueryDataParams(setting, search, _orderBy, pageIndex, pageSize, BID, id)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -846,16 +856,14 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { MenuName, MenuID } = this.props
- const { arr_field, orderBy, search, setting} = this.state
+ const { MenuID } = this.props
+ const { orderBy, search, setting } = this.state
if (MenuID !== menuId) return
callback({
- arr_field: arr_field,
orderBy: orderBy || setting.order,
- search: search,
- menuName: MenuName
+ search: search
})
}
--
Gitblit v1.8.0