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

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

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