From 95f2f60ba9eb343c2605e1ae68c221443d75f704 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 30 十一月 2019 00:55:07 +0800 Subject: [PATCH] commontable-update --- src/tabviews/commontable/index.jsx | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx index e99a0c4..c87be74 100644 --- a/src/tabviews/commontable/index.jsx +++ b/src/tabviews/commontable/index.jsx @@ -63,7 +63,7 @@ }) notification.warning({ top: 92, - message: result.message || '椤甸潰閰嶇疆閿欒', + message: this.state.dict['main.page.settingerror'], duration: 10 }) } @@ -83,7 +83,7 @@ }) notification.warning({ top: 92, - message: result.message || '椤甸潰閰嶇疆閿欒', + message: result.message, duration: 10 }) } @@ -101,7 +101,7 @@ item.options.unshift({ key: Utils.getuuid(), Value: '', - Text: '鍏ㄩ儴' + Text: this.state.dict['main.all'] }) } @@ -122,7 +122,7 @@ } else if (item.resourceType === '1' && !item.dataSource) { notification.warning({ top: 92, - message: item.label + '鏁版嵁婧愰厤缃敊璇�', + message: item.label + ': ' + this.state.dict['main.datasource.settingerror'], duration: 10 }) } @@ -214,13 +214,15 @@ // }) } - refreshbyaction = () => { + refreshbyaction = (btn, type) => { // 鎸夐挳鎿嶄綔鍚庡埛鏂拌〃鏍�,閲嶇疆椤电爜鍙婇�夋嫨椤� - this.refs.mainTable.resetTable() - this.loadmaindata(1, this.state.param.pageSize, this.state.param.orderColumn, this.state.param.orderType, this.state.param.search) - this.setState({ - loading: true - }) + console.log(btn) + console.log(type) + // this.refs.mainTable.resetTable() + // this.loadmaindata(1, this.state.param.pageSize, this.state.param.orderColumn, this.state.param.orderType, this.state.param.search) + // this.setState({ + // loading: true + // }) } gettableselected = () => { @@ -275,7 +277,7 @@ {actions && <MainAction MenuID={this.props.MenuID} - fixed={setting && setting.actionfixed} + setting={setting} refreshdata={this.refreshbyaction} gettableselected={this.gettableselected} actions={actions} -- Gitblit v1.8.0