From 76a4300654a18d228838c3f27455dc8e7a8cd616 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 一月 2021 17:04:42 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/tabviews/verupmanage/subtabtable/index.jsx | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/verupmanage/subtabtable/index.jsx b/src/tabviews/verupmanage/subtabtable/index.jsx
index 181a65c..553cb4a 100644
--- a/src/tabviews/verupmanage/subtabtable/index.jsx
+++ b/src/tabviews/verupmanage/subtabtable/index.jsx
@@ -12,12 +12,13 @@
import { buttonConfig, tabConfig } from '../config'
import MKEmitter from '@/utils/events.js'
+import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import SubAction from '../actionList'
-import SubSearch from '../topSearch'
import './index.scss'
+const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
const SubTable = asyncSpinComponent(() => import('@/tabviews/zshare/normalTable'))
class VerupSubTabViewTable extends Component {
@@ -112,8 +113,10 @@
subcols.push(colMap.get(sub))
}
})
- _col.subcols = subcols
- _columns.push(_col)
+ if (subcols.length > 0) {
+ _col.subcols = subcols
+ _columns.push(_col)
+ }
} else {
_columns.push(col)
}
@@ -180,6 +183,7 @@
this.setState({
data: result.data.map((item, index) => {
item.key = index
+ item.$$BID = _BID || ''
return item
}),
total: result.total,
@@ -439,12 +443,8 @@
return (
<div className="verup-subtable" id={'subtable' + this.props.MenuID}>
- {searchlist && searchlist.length > 0 ?
- <SubSearch
- dict={this.state.dict}
- searchlist={searchlist}
- refreshdata={this.refreshbysearch}
- /> : null
+ {searchlist && searchlist.length ?
+ <MainSearch searchlist={searchlist} menuType="HS" refreshdata={this.refreshbysearch}/> : null
}
{actions ?
<div className="sub-action">
--
Gitblit v1.8.0