Commit de0f741b authored by 满振华's avatar 满振华

修改数据传递

parent e09c80d6
......@@ -309,13 +309,13 @@ export default class DataView extends React.Component {
const newPage =
page.total > 0
? {
current: page.pageNum,
total: page.total,
}
current: page.pageNum,
total: page.total,
}
: {
current: PAGINATION.current,
total: PAGINATION.total,
};
current: PAGINATION.current,
total: PAGINATION.total,
};
const newData = _.assign({}, data, { origin: list });
this.setState({
pagination: _.assign({}, pagination, newPage),
......@@ -639,10 +639,10 @@ export default class DataView extends React.Component {
// 渲染顶部tips
_renderTips() {
const { tips } = this.props;
const { tips, tipsClassName } = this.props;
if (tips) {
return (
<div className={styles.tips}>
<div className={`${styles.tips} ${tipsClassName}`}>
{tips}
{this._renderBtns()}
</div>
......@@ -674,21 +674,21 @@ export default class DataView extends React.Component {
{type === 'download' ? (
download()
) : (
<BIButton
style={style}
key={i}
className={styles.btn}
onClick={item.type === 'del' ? this.del.bind(this, label, onClick) : onClick}
{...antiAssign(item, 'label,onClick,type,iconBtnSrc')}
>
{iconBtnSrc && iconBtnSrc !== '' ? (
<IconFont className={styles.iconCls} type={iconBtnSrc} />
) : (
<IconFont className={styles.iconCls} type="iconxinzeng" />
)}
<span className={styles.titleCls}>{label}</span>
</BIButton>
)}
<BIButton
style={style}
key={i}
className={styles.btn}
onClick={item.type === 'del' ? this.del.bind(this, label, onClick) : onClick}
{...antiAssign(item, 'label,onClick,type,iconBtnSrc')}
>
{iconBtnSrc && iconBtnSrc !== '' ? (
<IconFont className={styles.iconCls} type={iconBtnSrc} />
) : (
<IconFont className={styles.iconCls} type="iconxinzeng" />
)}
<span className={styles.titleCls}>{label}</span>
</BIButton>
)}
</ButtonAuth>
);
})}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment