提交 92b7c78c authored 作者: 钟是志's avatar 钟是志

一站式bug修改. this.initExcel 方法

可能存在其他问题 要喊欢哥确认
上级 d2568fef
...@@ -63,7 +63,7 @@ class StandardTable extends Component { ...@@ -63,7 +63,7 @@ class StandardTable extends Component {
render() { render() {
const { selectedRowKeys, needTotalList } = this.state; const { selectedRowKeys, needTotalList } = this.state;
const { const {
data: { list, pagination }, data: { list, pagination },
loading, loading,
...@@ -81,7 +81,9 @@ class StandardTable extends Component { ...@@ -81,7 +81,9 @@ class StandardTable extends Component {
showQuickJumper: true, showQuickJumper: true,
...pagination, ...pagination,
}; };
if(typeof paginationProps.total === 'string'){
paginationProps.total = Number(paginationProps.total) || 0;
}
const rowSelection = { const rowSelection = {
selectedRowKeys, selectedRowKeys,
onChange: this.handleRowSelectChange, onChange: this.handleRowSelectChange,
...@@ -116,7 +118,13 @@ class StandardTable extends Component { ...@@ -116,7 +118,13 @@ class StandardTable extends Component {
loading={loading} loading={loading}
rowKey={rowKey || 'key'} rowKey={rowKey || 'key'}
rowSelection={typeof noSelectRow !== 'undefined' && noSelectRow ? null : rowSelection} rowSelection={typeof noSelectRow !== 'undefined' && noSelectRow ? null : rowSelection}
dataSource={list} dataSource={list.map((x) => {
return {
id: Math.random() * 10000 + '',
...x,
}
})}
bordered={bordered} bordered={bordered}
columns={columns} columns={columns}
size="small" size="small"
......
...@@ -3,13 +3,7 @@ import {Button, Form, Input, InputNumber, Modal, Select} from "antd"; ...@@ -3,13 +3,7 @@ import {Button, Form, Input, InputNumber, Modal, Select} from "antd";
export default class FormModal extends React.Component { export default class FormModal extends React.Component {
render() { render() {
return ( return (
<Modal <Modal
destroyOnClose destroyOnClose
...@@ -26,4 +20,3 @@ export default class FormModal extends React.Component { ...@@ -26,4 +20,3 @@ export default class FormModal extends React.Component {
); );
} }
} }
\ No newline at end of file
...@@ -851,7 +851,7 @@ export default class tableCom extends Component { ...@@ -851,7 +851,7 @@ export default class tableCom extends Component {
delete params[i]; delete params[i];
} }
} }
if (getToken() != null) { if (getToken() != null) {
params.token = getToken(); params.token = getToken();
} }
...@@ -1471,7 +1471,6 @@ export default class tableCom extends Component { ...@@ -1471,7 +1471,6 @@ export default class tableCom extends Component {
return <></>; return <></>;
return <QRCode {...this.state.option} key={this.props.uuid} />; return <QRCode {...this.state.option} key={this.props.uuid} />;
} }
if (json.comName == 'Echart') { if (json.comName == 'Echart') {
return ( return (
<ReactEcharts <ReactEcharts
...@@ -1503,7 +1502,6 @@ export default class tableCom extends Component { ...@@ -1503,7 +1502,6 @@ export default class tableCom extends Component {
if (formKey == fk) { if (formKey == fk) {
return <>片段表单key不能和自身相同</>; return <>片段表单key不能和自身相同</>;
} }
return ( return (
<> <>
{this.props.form.getFieldDecorator(this.props.uuid, { {this.props.form.getFieldDecorator(this.props.uuid, {
...@@ -3124,6 +3122,7 @@ export default class tableCom extends Component { ...@@ -3124,6 +3122,7 @@ export default class tableCom extends Component {
); );
} }
if (get === 'web') { if (get === 'web') {
if (!isEdit) { if (!isEdit) {
return ( return (
<Row <Row
...@@ -3200,6 +3199,7 @@ export default class tableCom extends Component { ...@@ -3200,6 +3199,7 @@ export default class tableCom extends Component {
</Row> </Row>
); );
} else { } else {
return ( return (
<> <>
{modalCode ? ( {modalCode ? (
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论