From 590a8198e9fcb503aaeb04f6d550c65bf30c0566 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 11 三月 2020 18:01:06 +0800
Subject: [PATCH] 2020-03-11
---
src/tabviews/subtable/index.jsx | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 310af7f..5a14bc9 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -6,9 +6,9 @@
import moment from 'moment'
import Api from '@/api'
import SubTable from './subTable'
-import SubAction from '@/tabviews/tableshare/actionList'
import SubSearch from '@/tabviews/tableshare/topSearch'
-import asyncComponent from '@/utils/asyncLoadComponent'
+import asyncLoadComponent from '@/utils/asyncLoadComponent'
+import asyncComponent from '@/utils/asyncComponent'
import NotFount from '@/components/404'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
@@ -16,7 +16,8 @@
import options from '@/store/options.js'
import './index.scss'
-const SubTabTable = asyncComponent(() => import('@/tabviews/subtabtable'))
+const SubTabTable = asyncLoadComponent(() => import('@/tabviews/subtabtable'))
+const SubAction = asyncComponent(() => import('@/tabviews/tableshare/actionList'))
class SubTabViewTable extends Component {
static propTpyes = {
@@ -662,25 +663,27 @@
dict={this.state.dict}
/> : null
}
- {actions &&
- <SubAction
- ref="subButton"
- type="sub"
- menuType={this.props.menuType}
- setting={setting}
- actions={actions}
- Tab={this.props.Tab}
- BID={this.props.BID}
- BData={this.props.BData}
- dict={this.state.dict}
- MenuID={this.props.SupMenuID}
- logcolumns={this.state.logcolumns}
- ContainerId={this.props.ContainerId}
- refreshdata={this.refreshbyaction}
- triggerPopview={this.triggerPopview}
- getexceloutparam={this.getexceloutparam}
- gettableselected={this.gettableselected}
- />
+ {actions ?
+ <div style={{minHeight: '45px'}}>
+ <SubAction
+ ref="subButton"
+ type="sub"
+ menuType={this.props.menuType}
+ setting={setting}
+ actions={actions}
+ Tab={this.props.Tab}
+ BID={this.props.BID}
+ BData={this.props.BData}
+ dict={this.state.dict}
+ MenuID={this.props.SupMenuID}
+ logcolumns={this.state.logcolumns}
+ ContainerId={this.props.ContainerId}
+ refreshdata={this.refreshbyaction}
+ triggerPopview={this.triggerPopview}
+ getexceloutparam={this.getexceloutparam}
+ gettableselected={this.gettableselected}
+ />
+ </div> : null
}
{columns ?
<div className="subtable-box">
--
Gitblit v1.8.0