From 0844cf7a0de1b38ff9649e7958adbfffe1b3532d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 12 九月 2023 10:09:48 +0800 Subject: [PATCH] Merge branch 'develop' --- src/tabviews/custom/components/form/step-form/index.jsx | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx index 6ce4ec2..895ff53 100644 --- a/src/tabviews/custom/components/form/step-form/index.jsx +++ b/src/tabviews/custom/components/form/step-form/index.jsx @@ -114,8 +114,7 @@ step: _group.sort - 1, BID: BID || '', BData: BData || '', - config: _config, - arr_field: _config.columns.map(col => col.field).join(',') + config: _config }) } @@ -269,7 +268,7 @@ if (btn.linkmenu && btn.linkmenu.length > 0) { let menu_id = btn.linkmenu[btn.linkmenu.length - 1] - let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || '' + let menu = window.GLOB.mkThdMenus.get(menu_id) || '' if (!menu) return @@ -283,7 +282,7 @@ } async loadData (type) { - const { config, arr_field, BID } = this.state + const { config, BID } = this.state if (config.wrap.datatype === 'static') { this.setState({ @@ -314,7 +313,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