From 5c8860f3cd8921e7eb0da7749628e9dc669b3203 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 17 三月 2020 10:19:16 +0800 Subject: [PATCH] 2020-03-17 --- src/templates/comtableconfig/index.jsx | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx index 305ebaf..e63a3fa 100644 --- a/src/templates/comtableconfig/index.jsx +++ b/src/templates/comtableconfig/index.jsx @@ -385,10 +385,12 @@ * @description 鎼滅储鏉′欢缂栬緫锛岃幏鍙栨悳绱㈡潯浠惰〃鍗曚俊鎭� */ handleSearch = (card) => { + const { menu } = this.props + this.setState({ modaltype: 'search', card: card, - formlist: getSearchForm(card) + formlist: getSearchForm(card, menu.roleList) }) } @@ -413,11 +415,13 @@ * @description 鏄剧ず鍒椾笌鍚堝苟鍒楃紪杈戯紝鑾峰彇琛ㄥ崟淇℃伅 */ handleColumn = (card) => { + const { menu } = this.props + if (card.type !== 'colspan') { this.setState({ modaltype: 'columns', card: card, - formlist: getColumnForm(card) + formlist: getColumnForm(card, menu.roleList) }) } else { this.setState({ -- Gitblit v1.8.0