From 113ff1aa0d62549730f1413fe5ffcadcf3a14f11 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 23 八月 2022 11:37:24 +0800 Subject: [PATCH] 2022-08-23 --- src/tabviews/custom/components/share/tabtransfer/index.jsx | 113 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 69 insertions(+), 44 deletions(-) diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx index cf7fe9d..1ce33c9 100644 --- a/src/tabviews/custom/components/share/tabtransfer/index.jsx +++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx @@ -1,6 +1,5 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' -import { connect } from 'react-redux' import { is, fromJS } from 'immutable' import { Row, Col, Empty, notification } from 'antd' @@ -23,23 +22,25 @@ const AntvScatter = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-scatter')) const TableCard = asyncComponent(() => import('@/tabviews/custom/components/card/table-card')) const NormalTable = asyncComponent(() => import('@/tabviews/custom/components/table/normal-table')) +const EditTable = asyncComponent(() => import('@/tabviews/custom/components/table/edit-table')) 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')) const SandBox = asyncComponent(() => import('@/tabviews/custom/components/code/sand-box')) -const NormalForm = asyncComponent(() => import('@/tabviews/custom/components/form/normal-form')) +const SimpleForm = asyncComponent(() => import('@/tabviews/custom/components/form/simple-form')) +const StepForm = asyncComponent(() => import('@/tabviews/custom/components/form/step-form')) const TabForm = asyncComponent(() => import('@/tabviews/custom/components/form/tab-form')) const NormalTree = asyncComponent(() => import('@/tabviews/custom/components/tree/antd-tree')) const CarouselDataCard = asyncComponent(() => import('@/tabviews/custom/components/carousel/data-card')) const CarouselPropCard = asyncComponent(() => import('@/tabviews/custom/components/carousel/prop-card')) const Balcony = asyncComponent(() => import('@/tabviews/custom/components/card/balcony')) +const TimeLine = asyncComponent(() => import('@/tabviews/custom/components/timeline/normal-timeline')) +const CustomChart = asyncComponent(() => import('@/tabviews/custom/components/chart/custom-chart')) class TabTransfer extends Component { static propTpyes = { - bids: PropTypes.any, // 鐖剁骇Id闆� config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅 mainSearch: PropTypes.any, // 鍏ㄥ眬鎼滅储鏉′欢 - menuType: PropTypes.any, // 鑿滃崟绫诲瀷 } state = { @@ -66,6 +67,7 @@ } let params = [] + let delay = 20 config.components.forEach(item => { if (item.type === 'tabs' || item.type === 'group') return @@ -90,10 +92,12 @@ item.setting.sync = 'false' item.setting.onload = 'false' } else { - params.push(getStructDefaultParam(item, searchlist)) + params.push(getStructDefaultParam(item, searchlist, params.length === 0)) } } else { item.setting.sync = 'false' + item.setting.delay = delay + delay += 20 } }) @@ -118,9 +122,16 @@ * @description 涓昏〃鏁版嵁鍔犺浇 */ loadmaindata = (params) => { - let param = getStructuredParams(params, this.props.config, this.props.BID || '') + let BID = '' + let BData = window.GLOB.CacheData.get(this.props.config.$pageId) - Api.getLocalConfig(param).then(result => { + if (BData) { + BID = BData.$BID || '' + } + + let param = getStructuredParams(params, this.props.config, BID) + + Api.genericInterface(param).then(result => { if (result.status) { delete result.status delete result.message @@ -150,129 +161,153 @@ } getComponents = () => { - const { menuType, bids, config } = this.props + const { 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 = this.props.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} /> + <AntvBarAndLine data={data} config={item} mainSearch={mainSearch}/> </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} /> + <AntvPie data={data} config={item} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'dashboard') { return ( <Col span={item.width} key={item.uuid}> - <AntvDashboard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} /> + <AntvDashboard config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'scatter') { return ( <Col span={item.width} key={item.uuid}> - <AntvScatter config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} /> + <AntvScatter config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'search') { + let BID = '' + let BData = window.GLOB.CacheData.get(item.$pageId) + if (BData) { + BID = BData.$BID || '' + } return ( <Col span={item.width} key={item.uuid}> - <MainSearch config={item} BID={BID} menuType={menuType} refreshdata={this.resetSearch} /> + <MainSearch config={item} BID={BID} refreshdata={this.resetSearch} /> </Col> ) } else if (item.type === 'tabs') { return ( <Col span={item.width} key={item.uuid}> - <AntvTabs config={item} BID={BID} bids={bids} mainSearch={mainSearch} menuType={menuType} /> + <AntvTabs config={item} mainSearch={mainSearch}/> </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} /> + <DataCard config={item} data={data} mainSearch={mainSearch}/> </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} /> + <PropCard config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'carousel' && item.subtype === 'datacard') { return ( <Col span={item.width} key={item.uuid}> - <CarouselDataCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} /> + <CarouselDataCard config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'carousel' && item.subtype === 'propcard') { return ( <Col span={item.width} key={item.uuid}> - <CarouselPropCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} /> + <CarouselPropCard config={item} data={data} mainSearch={mainSearch}/> </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} /> + <TableCard config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'table' && item.subtype === 'normaltable') { return ( <Col span={item.width} key={item.uuid}> - <NormalTable config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} /> + <NormalTable config={item} data={data} mainSearch={mainSearch}/> + </Col> + ) + } else if (item.type === 'table' && item.subtype === 'editable') { + return ( + <Col span={item.width} key={item.uuid}> + <EditTable config={item} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'group' && item.subtype === 'normalgroup') { return ( <Col span={item.width} key={item.uuid}> - <NormalGroup config={item} BID={BID} bids={bids} mainSearch={mainSearch} menuType={menuType} /> + <NormalGroup config={item} mainSearch={mainSearch}/> + </Col> + ) + } else if (item.type === 'form' && item.subtype === 'simpleform') { + return ( + <Col span={item.width} key={item.uuid}> + <SimpleForm config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'form' && item.subtype === 'stepform') { return ( <Col span={item.width} key={item.uuid}> - <NormalForm config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} /> + <StepForm config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'form' && item.subtype === 'tabform') { return ( <Col span={item.width} key={item.uuid}> - <TabForm config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} /> + <TabForm config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'tree') { return ( <Col span={item.width} key={item.uuid}> - <NormalTree config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} /> + <NormalTree config={item} data={data} mainSearch={mainSearch}/> </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} /> + <BraftEditor config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'code') { return ( <Col span={item.width} key={item.uuid}> - <SandBox config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} /> + <SandBox config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else if (item.type === 'balcony') { return ( <Col span={item.width} key={item.uuid}> - <Balcony config={item} data={data} BID={BID} menuType={menuType} /> + <Balcony config={item} data={data}/> + </Col> + ) + } else if (item.type === 'timeline') { + return ( + <Col span={item.width} key={item.uuid}> + <TimeLine config={item} data={data} mainSearch={mainSearch}/> + </Col> + ) + } else if (item.type === 'chart') { + return ( + <Col span={item.width} key={item.uuid}> + <CustomChart config={item} data={data} mainSearch={mainSearch}/> </Col> ) } else { @@ -283,19 +318,9 @@ render() { return ( - <Row gutter={8}>{this.getComponents()}</Row> + <Row className="component-wrap" gutter={8}>{this.getComponents()}</Row> ) } } -const mapStateToProps = (state) => { - return { - menuType: state.editLevel - } -} - -const mapDispatchToProps = () => { - return {} -} - -export default connect(mapStateToProps, mapDispatchToProps)(TabTransfer) \ No newline at end of file +export default TabTransfer \ No newline at end of file -- Gitblit v1.8.0