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/commontable/index.jsx | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx index f214488..d7eb0af 100644 --- a/src/tabviews/commontable/index.jsx +++ b/src/tabviews/commontable/index.jsx @@ -9,19 +9,21 @@ import zhCN from '@/locales/zh-CN/main.js' import enUS from '@/locales/en-US/main.js' import Utils from '@/utils/utils.js' -import asyncComponent from '@/utils/asyncLoadComponent' +import asyncComponent from '@/utils/asyncComponent' +import asyncLoadComponent from '@/utils/asyncLoadComponent' import {refreshTabView, modifyTabview} from '@/store/action' import MainTable from './mainTable' import VerifyCard from '@/tabviews/tableshare/verifycard' -import MainAction from '@/tabviews/tableshare/actionList' import MainSearch from '@/tabviews/tableshare/topSearch' -import SubTable from '@/tabviews/subtable' import NotFount from '@/components/404' import './index.scss' -const SubTabTable = asyncComponent(() => import('@/tabviews/subtabtable')) -const FormTab = asyncComponent(() => import('@/tabviews/formtab')) +const MainAction = asyncComponent(() => import('@/tabviews/tableshare/actionList')) +const SubTable = asyncLoadComponent(() => import('@/tabviews/subtable')) +const SubTabTable = asyncLoadComponent(() => import('@/tabviews/subtabtable')) +const FormTab = asyncLoadComponent(() => import('@/tabviews/formtab')) + const { TabPane } = Tabs const { TreeNode } = Tree const { Paragraph } = Typography @@ -941,22 +943,24 @@ /> : null } {actions && setting.onload !== 'false' ? - <MainAction - ref="mainButton" - BID="" - type="main" - menuType="main" - setting={setting} - actions={actions} - dict={this.state.dict} - MenuID={this.props.MenuID} - logcolumns={this.state.logcolumns} - ContainerId={this.state.ContainerId} - refreshdata={this.refreshbyaction} - triggerPopview={this.triggerPopview} - getexceloutparam={this.getexceloutparam} - gettableselected={this.gettableselected} - /> : null + <div style={{minHeight: '45px'}}> + <MainAction + ref="mainButton" + BID="" + type="main" + menuType="main" + setting={setting} + actions={actions} + dict={this.state.dict} + MenuID={this.props.MenuID} + logcolumns={this.state.logcolumns} + ContainerId={this.state.ContainerId} + refreshdata={this.refreshbyaction} + triggerPopview={this.triggerPopview} + getexceloutparam={this.getexceloutparam} + gettableselected={this.gettableselected} + /> + </div> : null } {columns && setting.onload !== 'false' ? <div className="main-table-box"> -- Gitblit v1.8.0