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 | 353 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 188 insertions(+), 165 deletions(-) diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx index ffa91e7..1ce33c9 100644 --- a/src/tabviews/custom/components/share/tabtransfer/index.jsx +++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx @@ -1,31 +1,46 @@ 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' -import moment from 'moment' import Api from '@/api' -import options from '@/store/options.js' import asyncComponent from '@/utils/asyncComponent' +import { + getStructuredParams, + getStructDefaultParam +} from '@/utils/utils-datamanage.js' import Utils from '@/utils/utils.js' import './index.scss' // 閫氱敤缁勪欢 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 AntvDashboard = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-dashboard')) const AntvTabs = asyncComponent(() => import('@/tabviews/custom/components/tabs/antv-tabs')) const DataCard = asyncComponent(() => import('@/tabviews/custom/components/card/data-card')) +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 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 = { - BID: PropTypes.any, // 鐖剁骇Id config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅 mainSearch: PropTypes.any, // 鍏ㄥ眬鎼滅储鏉′欢 - menuType: PropTypes.any, // 鑿滃崟绫诲瀷 - dataManager: PropTypes.any, // 鏁版嵁鏉冮檺 } state = { @@ -43,22 +58,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) } }) @@ -68,102 +67,54 @@ } let params = [] + let delay = 20 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) - params.push(param) + let searchlist = [] + if (item.search && item.search.length > 0) { + searchlist = Utils.initMainSearch(item.search) + } + if (item.setting.useMSearch) { + let keys = searchlist.map(item => item.key) + _mainSearch.forEach(item => { + if (!keys.includes(item.key)) { + searchlist.push(item) + } + }) + } + + if (searchlist.filter(cell => cell.required && cell.value === '').length > 0) { + item.setting.sync = 'false' + item.setting.onload = 'false' + } else { + params.push(getStructDefaultParam(item, searchlist, params.length === 0)) + } } else { item.setting.sync = 'false' + item.setting.delay = delay + delay += 20 } }) this.setState({mainSearch: _mainSearch, self}) - this.loadmaindata(params) + + if (params.length > 0) { + this.loadmaindata(params) + } } UNSAFE_componentWillReceiveProps(nextProps) { const { self } = this.state - if (!self && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) { - this.setState({mainSearch: fromJS(nextProps.mainSearch).toJS()}) - } - } - - /** - * @description 鑾峰彇绯荤粺瀛樺偍杩囩▼ sPC_Get_TableData 鐨勫弬鏁� - */ - getDefaultParam = (component, mainSearch) => { - const { columns, search, setting, dataName, format } = component - - let searchlist = [] - if (search && search.length > 0) { - searchlist = Utils.initMainSearch(search) - } - - if (setting.useMSearch === 'true') { - let keys = searchlist.map(item => item.key) - mainSearch.forEach(item => { - if (!keys.includes(item.key)) { - searchlist.push(item) - } + if (!self && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) { + this.setState({mainSearch: null}, () => { + this.setState({mainSearch: fromJS(nextProps.mainSearch).toJS()}) }) - } - - let arr_field = columns.map(col => col.field) - let _dataresource = setting.dataresource - let _customScript = setting.customScript - - if (setting.queryType === 'statistics' || _customScript) { - let allSearch = Utils.getAllSearchOptions(searchlist) - let regoptions = allSearch.map(item => { - return { - reg: new RegExp('@' + item.key + '@', 'ig'), - value: `'${item.value}'` - } - }) - - regoptions.forEach(item => { - if (_dataresource && setting.queryType === 'statistics') { - _dataresource = _dataresource.replace(item.reg, item.value) - } - if (_customScript) { - _customScript = _customScript.replace(item.reg, item.value) - } - }) - } - - let _search = '' - if (setting.queryType !== 'statistics' && _dataresource) { - _search = Utils.joinMainSearchkey(searchlist) - _search = _search ? 'where ' + _search : '' - } - - if (setting.order && _dataresource) { - _dataresource = `select top 1000 ${arr_field.join(',')} from (select ${arr_field.join(',')} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows ` - } else if (_dataresource) { - _dataresource = `select top 1000 ${arr_field.join(',')} from ${_dataresource} ${_search} ` - } - - // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞 - if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) { - _customScript && console.log(`${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`) - _dataresource && console.log(_dataresource) - } - - return { - name: dataName, - columns: columns, - par_tablename: '', - type: format === 'array' ? format : '', - primaryKey: setting.primaryKey || '', - foreign_key: '', - sql: _dataresource, - script: _customScript } } @@ -171,36 +122,16 @@ * @description 涓昏〃鏁版嵁鍔犺浇 */ loadmaindata = (params) => { - if (!params || params.length === 0) return - let LText_field = [] - let LText = params.map((item, index) => { - let _sql = item.sql - let _script = item.script + let BID = '' + let BData = window.GLOB.CacheData.get(this.props.config.$pageId) - if (index === 0) { - _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg ='' - ${_script} - ` - } - - item.columns.forEach(cell => { - LText_field.push(`Select '${item.name}' as tablename,'${cell.field}' as fieldname,'${cell.datatype}' as field_type`) - }) - return `Select '${item.name}' as tablename,'${window.btoa(window.encodeURIComponent(_sql))}' as LText,'${window.btoa(window.encodeURIComponent(_script))}' as Lcustomize,'${item.type}' as table_type,'${item.primaryKey}' as primary_key,'${item.par_tablename}' as par_tablename,'${item.foreign_key}' as foreign_key,'${index}' as Sort` - }) - - let param = { - func: 'sPC_Get_structured_data', - LText: LText.join(' union all '), - LText_field: LText_field.join(' union all ') + if (BData) { + BID = BData.$BID || '' } - param.LText = Utils.formatOptions(param.LText) - param.LText_field = Utils.formatOptions(param.LText_field) - param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') - param.secretkey = Utils.encrypt(param.LText, param.timestamp) + let param = getStructuredParams(params, this.props.config, BID) - Api.getLocalConfig(param).then(result => { + Api.genericInterface(param).then(result => { if (result.status) { delete result.status delete result.message @@ -224,11 +155,13 @@ } resetSearch = (search) => { - this.setState({mainSearch: search}) + this.setState({mainSearch: null}, () => { + this.setState({mainSearch: search}) + }) } getComponents = () => { - const { menuType, dataManager, BID, config } = this.props + const { config } = this.props const { mainSearch, data } = this.state if (!config || !config.components || config.components.length === 0) return (<Empty description={false} />) @@ -237,43 +170,146 @@ 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} 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} dataManager={dataManager} /> + <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} mainSearch={mainSearch}/> + </Col> + ) + } else if (item.type === 'scatter') { + return ( + <Col span={item.width} key={item.uuid}> + <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} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} 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} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} /> + <AntvTabs config={item} mainSearch={mainSearch}/> </Col> ) - } else if (item.type === 'card') { - if (item.subtype === 'datacard') { - return ( - <Col span={item.width} key={item.uuid}> - <DataCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} /> - </Col> - ) - } else if (item.subtype === 'propcard') { - return ( - <Col span={item.width} key={item.uuid}> - <PropCard config={item} data={data} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} /> - </Col> - ) - } else { - return null - } + } else if (item.type === 'card' && item.subtype === 'datacard') { + return ( + <Col span={item.width} key={item.uuid}> + <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} mainSearch={mainSearch}/> + </Col> + ) + } else if (item.type === 'carousel' && item.subtype === 'datacard') { + return ( + <Col span={item.width} key={item.uuid}> + <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} mainSearch={mainSearch}/> + </Col> + ) + } else if (item.type === 'table' && item.subtype === 'tablecard') { + return ( + <Col span={item.width} key={item.uuid}> + <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} 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} 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}> + <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} mainSearch={mainSearch}/> + </Col> + ) + } else if (item.type === 'tree') { + return ( + <Col span={item.width} key={item.uuid}> + <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} mainSearch={mainSearch}/> + </Col> + ) + } else if (item.type === 'code') { + return ( + <Col span={item.width} key={item.uuid}> + <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}/> + </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 { return null } @@ -282,22 +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, - permAction: state.permAction, - permRoles: state.permRoles, - dataManager: state.dataManager - } -} - -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