From cb4c8706eb48183ac8875d92d4a950ad6b6675a2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 三月 2020 11:01:11 +0800
Subject: [PATCH] 2020-03-18
---
src/tabviews/managetable/index.jsx | 50 ++++++++------------------------------------------
1 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/src/tabviews/managetable/index.jsx b/src/tabviews/managetable/index.jsx
index 4b5087f..4616ada 100644
--- a/src/tabviews/managetable/index.jsx
+++ b/src/tabviews/managetable/index.jsx
@@ -14,12 +14,12 @@
import asyncLoadComponent from '@/utils/asyncLoadComponent'
import {refreshTabView, modifyTabview} from '@/store/action'
-import MainTable from '@/tabviews/commontable/mainTable'
+import MainTable from '@/tabviews/tableshare/normalTable'
+import MainAction from '@/tabviews/tableshare/actionList'
import MainSearch from '@/tabviews/tableshare/topSearch'
import NotFount from '@/components/404'
import './index.scss'
-const MainAction = asyncComponent(() => import('@/tabviews/tableshare/actionList'))
const SubTable = asyncLoadComponent(() => import('@/tabviews/subtable'))
const SubTabTable = asyncComponent(() => import('@/tabviews/subtabtable'))
const FormTab = asyncComponent(() => import('@/tabviews/formtab'))
@@ -57,9 +57,7 @@
orderBy: '', // 鎺掑簭
search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
BIDs: {}, // 涓婄骇琛╥d
- setsingle: false, // 涓昏〃鍗曢�夊閫夊垏鎹�
pickup: false, // 涓昏〃鏁版嵁闅愯棌鏄剧ず鍒囨崲
- isLinkMain: false, // 鏄惁瀛樺湪涓庝富琛ㄥ叧鑱旂殑瀛愯〃
popAction: false, // 寮规椤甸潰锛屾寜閽俊鎭�
popData: false, // 寮规椤甸潰锛屾墍閫夌殑琛ㄦ牸鏁版嵁
visible: false, // 寮规鏄剧ず闅愯棌鎺у埗
@@ -161,18 +159,6 @@
})
}
-
- let _isLinkMain = false // 妫�鏌ユ槸鍚︽湁涓庝富琛ㄥ叧鑱旂殑瀛愯〃
- config.tabgroups.forEach(groupId => {
- if (!config[groupId] || config[groupId].length === 0) return
-
- config[groupId].forEach(tab => {
- if (tab.supMenu === 'mainTable') {
- _isLinkMain = true
- }
- })
- })
-
this.setState({
loadingview: false,
config: config,
@@ -181,7 +167,6 @@
actions: _actions,
columns: _columns,
logcolumns: _logcolumns,
- isLinkMain: _isLinkMain,
arr_field: _arrField.join(','),
search: Utils.initMainSearch(config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
}, () => {
@@ -533,9 +518,7 @@
orderBy: '',
search: '',
BIDs: {},
- setsingle: false,
- pickup: false,
- isLinkMain: false
+ pickup: false
}, () => {
this.loadconfig()
})
@@ -647,22 +630,6 @@
[type]: id,
[type + 'data']: data
}
- })
- }
-
- /**
- * @description 琛ㄦ牸鍗曢�夊閫夊垏鎹�
- */
- checkChange = () => {
- const { setsingle, BIDs } = this.state
-
- let _BIDs = JSON.parse(JSON.stringify(BIDs))
- _BIDs.mainTable = ''
-
- this.setState({
- setsingle: !setsingle,
- pickup: false,
- BIDs: _BIDs
})
}
@@ -843,11 +810,11 @@
}
render() {
- const { view, setting, searchlist, actions, columns, loadingview, viewlost, setsingle, pickup, isLinkMain, config } = this.state
+ const { view, setting, searchlist, actions, columns, loadingview, viewlost, pickup, config } = this.state
return (
<div>
- {view === 'commontable' ? <div className={'commontable ' + (isLinkMain ? 'pick-control' : '')} id={this.state.ContainerId}>
+ {view === 'commontable' ? <div className="commontable pick-control" id={this.state.ContainerId}>
{loadingview && <Spin size="large" />}
{searchlist && searchlist.length > 0 ?
<MainSearch
@@ -876,18 +843,17 @@
}
{columns && setting.onload !== 'false' ?
<div className="main-table-box">
- {isLinkMain ?
+ {this.state.data && this.state.data.length > 0 ?
<div className="pickchange">
- {setting.tableType === 'checkbox' ? <Switch title="鍗曢�夊垏鎹�" checkedChildren="鍗�" unCheckedChildren="澶�" defaultChecked={setsingle} onChange={this.checkChange} /> : null}
- {this.state.BIDs.mainTable && (setting.tableType === 'radio' || setsingle) ? <Switch title="鏀惰捣" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={pickup} onChange={this.pickupChange} /> : null}
+ <Switch title="鏀惰捣" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={pickup} onChange={this.pickupChange} />
</div> : null
}
<MainTable
ref="mainTable"
+ tableId="mainTable"
pickup={pickup}
setting={setting}
columns={columns}
- setsingle={setsingle}
dict={this.state.dict}
data={this.state.data}
total={this.state.total}
--
Gitblit v1.8.0