From 0227c25e4ed573d3095ada3f9c9a4ba5f18b0de5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 一月 2021 10:53:01 +0800
Subject: [PATCH] 2021-01-20
---
src/tabviews/custom/components/share/tabtransfer/index.jsx | 82 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index fd9c277..884813b 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -14,20 +14,21 @@
// 閫氱敤缁勪欢
const AntvBarAndLine = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-bar-line'))
-const MainSearch = asyncComponent(() => import('@/tabviews/custom/components/search/main-search'))
+const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
const AntvPie = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-pie'))
const AntvTabs = asyncComponent(() => import('@/tabviews/custom/components/tabs/antv-tabs'))
const DataCard = asyncComponent(() => import('@/tabviews/custom/components/card/data-card'))
const TableCard = asyncComponent(() => import('@/tabviews/custom/components/card/table-card'))
const PropCard = asyncComponent(() => import('@/tabviews/custom/components/card/prop-card'))
+const NormalGroup = asyncComponent(() => import('@/tabviews/custom/components/group/normal-group'))
+const BraftEditor = asyncComponent(() => import('@/tabviews/custom/components/editor/braft-editor'))
class TabTransfer extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
+ bids: PropTypes.any, // 鐖剁骇Id闆�
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 鍏ㄥ眬鎼滅储鏉′欢
menuType: PropTypes.any, // 鑿滃崟绫诲瀷
- dataManager: PropTypes.any, // 鏁版嵁鏉冮檺
}
state = {
@@ -45,22 +46,6 @@
config.components.forEach(component => {
if (component.type === 'search') {
self = true
- component.search = component.search.map(item => {
- item.oriInitval = item.initval
-
- if (!item.blacklist || item.blacklist.length === 0) return item
-
- let _black = item.blacklist.filter(v => {
- return this.props.permRoles.indexOf(v) !== -1
- })
-
- if (_black.length > 0) {
- item.Hide = 'true'
- }
-
- return item
- })
-
_mainSearch = Utils.initMainSearch(component.search)
}
})
@@ -71,10 +56,10 @@
let params = []
config.components.forEach(item => {
- if (item.type === 'tabs') return
+ if (item.type === 'tabs' || item.type === 'group') return
if (!item.setting || item.setting.interType !== 'system') return
- if (!item.format || (item.subtype === 'propcard' && item.wrap.datatype === 'static')) return
+ if (!item.format) return
if (item.dataName && (!item.pageable || (item.pageable && !item.setting.laypage)) && item.setting.onload === 'true' && item.setting.sync === 'true') {
let param = this.getDefaultParam(item, _mainSearch)
@@ -94,7 +79,7 @@
UNSAFE_componentWillReceiveProps(nextProps) {
const { self } = this.state
- if (!self && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ if (!self && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({mainSearch: fromJS(nextProps.mainSearch).toJS()})
}
}
@@ -179,11 +164,20 @@
const { config } = this.props
let LText_field = []
let diffUser = false
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
+
let _LText = params.map((item, index) => {
let _script = item.script
if (index === 0) {
- _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
+ _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50)
+ select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}'
${_script}
`
}
@@ -246,56 +240,75 @@
}
resetSearch = (search) => {
- this.setState({mainSearch: search})
+ this.setState({mainSearch: null}, () => {
+ this.setState({mainSearch: search})
+ })
}
getComponents = () => {
- const { menuType, dataManager, BID, config } = this.props
+ const { menuType, bids, config } = this.props
const { mainSearch, data } = this.state
if (!config || !config.components || config.components.length === 0) return (<Empty description={false} />)
return config.components.map(item => {
+ let BID = ''
+ if (item.setting && item.setting.supModule) {
+ BID = bids[item.setting.supModule] || ''
+ }
+
if (item.type === 'bar' || item.type === 'line') {
return (
<Col span={item.width} key={item.uuid}>
- <AntvBarAndLine data={data} config={item} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} />
+ <AntvBarAndLine data={data} config={item} BID={BID} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'pie') {
return (
<Col span={item.width} key={item.uuid}>
- <AntvPie data={data} config={item} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} />
+ <AntvPie data={data} config={item} BID={BID} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'search') {
return (
<Col span={item.width} key={item.uuid}>
- <MainSearch config={item} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} refreshdata={this.resetSearch} />
+ <MainSearch config={item} mainSearch={mainSearch} menuType={menuType} refreshdata={this.resetSearch} />
</Col>
)
} else if (item.type === 'tabs') {
return (
<Col span={item.width} key={item.uuid}>
- <AntvTabs config={item} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} />
+ <AntvTabs config={item} bids={bids} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'card' && item.subtype === 'datacard') {
return (
<Col span={item.width} key={item.uuid}>
- <DataCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} />
+ <DataCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'card' && item.subtype === 'propcard') {
return (
<Col span={item.width} key={item.uuid}>
- <PropCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} />
+ <PropCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'table' && item.subtype === 'tablecard') {
return (
<Col span={item.width} key={item.uuid}>
- <TableCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} />
+ <TableCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
+ } else if (item.type === 'group' && item.subtype === 'normalgroup') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <NormalGroup config={item} bids={bids} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
+ } else if (item.type === 'editor') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <BraftEditor config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else {
@@ -313,10 +326,7 @@
const mapStateToProps = (state) => {
return {
- menuType: state.editLevel,
- permAction: state.permAction,
- permRoles: state.permRoles,
- dataManager: state.dataManager
+ menuType: state.editLevel
}
}
--
Gitblit v1.8.0