From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/share/tabtransfer/index.jsx | 431 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 355 insertions(+), 76 deletions(-)
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index 0238c31..0a67c42 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -1,105 +1,387 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
-import { is, fromJS } from 'immutable'
-import { Row, Col, Empty } from 'antd'
+import { fromJS } from 'immutable'
+import { Row, Col, Empty, notification, Modal } from 'antd'
-import asyncSpinComponent from '@/utils/asyncSpinComponent'
-import Utils from '@/utils/utils.js'
+import Api from '@/api'
+import asyncComponent from '@/utils/asyncComponent'
+import {
+ getStructuredParams,
+ getStructDefaultParam
+} from '@/utils/utils-datamanage.js'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
// 閫氱敤缁勪欢
-const AntvBarAndLine = asyncSpinComponent(() => import('@/tabviews/custom/components/chart/antv-bar-line'))
-const MainSearch = asyncSpinComponent(() => import('@/tabviews/custom/components/search/main-search'))
-const AntvPie = asyncSpinComponent(() => import('@/tabviews/custom/components/chart/antv-pie'))
-const AntvTabs = asyncSpinComponent(() => import('@/tabviews/custom/components/tabs/antv-tabs'))
+const AntvBarAndLine = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-bar-line'))
+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 DoubleDataCard = asyncComponent(() => import('@/tabviews/custom/components/card/double-data-card'))
+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'))
+const MkBaseTable = asyncComponent(() => import('@/tabviews/custom/components/table/base-table'))
+const AntvG6 = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-G6'))
+const AntvX6 = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-X6'))
+const Calendar = asyncComponent(() => import('@/tabviews/custom/components/calendar'))
class TabTransfer extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 鍏ㄥ眬鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
- dataManager: PropTypes.any, // 鏁版嵁鏉冮檺
- }
-
- state = {
- mainSearch: [],
- self: false
}
UNSAFE_componentWillMount () {
- const { config, mainSearch } = this.props
- // 鑾峰彇涓绘悳绱㈡潯浠�
- let _mainSearch = []
- let self = false
- config.components.forEach(component => {
- if (component.type === 'search') {
- self = true
- component.search = component.search.map(item => {
- item.oriInitval = item.initval
+ let _config = fromJS(this.props.config).toJS()
- if (!item.blacklist || item.blacklist.length === 0) return item
+ let BID = ''
+ let BData = window.GLOB.CacheData.get(_config.$pageId)
- let _black = item.blacklist.filter(v => {
- return this.props.permRoles.indexOf(v) !== -1
- })
+ if (BData) {
+ BID = BData.$BID || ''
+ }
- if (_black.length > 0) {
- item.Hide = 'true'
- }
+ let params = []
+ if (_config.type !== 'group') {
+ _config.components = this.formatSetting(_config.components, params, BID)
+ } else {
+ let delay = 110
+ _config.components.forEach(item => {
+ if (!item.setting || item.setting.interType !== 'system') return
+ if (!item.format) return
+
+ item.setting.delay = delay
+ delay += 20
+ })
+ }
- return item
- })
-
- _mainSearch = Utils.initMainSearch(component.search)
+ this.setState({
+ config: _config
+ }, () => {
+ if (params.length > 0) {
+ this.loadmaindata(params, BID)
}
})
-
- this.setState({mainSearch: self ? _mainSearch : fromJS(mainSearch).toJS(), self})
}
- UNSAFE_componentWillReceiveProps(nextProps) {
- const { self } = this.state
-
- if (!self && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({mainSearch: fromJS(nextProps.mainSearch).toJS()})
+ formatSetting = (components, params, BID) => {
+ let delay = 110
+ return components.map(item => {
+ if (item.type === 'tabs') return item
+ if (item.type === 'group') {
+ item.components = this.formatSetting(item.components, params, BID)
+ return item
+ }
+
+ if (!item.setting || item.setting.interType !== 'system') return item
+ if (!item.format) return item
+
+ if (item.setting.sync === 'true') {
+ let searchlist = item.$searches || []
+
+ if (item.setting.useMSearch) {
+ let mainSearch = window.GLOB.SearchBox.get(item.$searchId)
+ let keys = item.$s_keys || []
+ mainSearch.forEach(item => {
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searchlist.push(item)
+ })
+ }
+
+ if (item.$s_req && searchlist.filter(item => item.required && item.value === '').length > 0) {
+ item.setting.sync = 'false'
+ item.setting.onload = 'false'
+ } else {
+ let backend = false
+ if (window.backend && params.length === 0 && window.GLOB.CacheData.has('sql_' + item.uuid)) {
+ backend = true
+ } else if (window.backend && params[0] && params[0].exps) {
+ backend = true
+ }
+
+ if (backend && !window.GLOB.CacheData.has('sql_' + item.uuid)) {
+ item.setting.sync = 'false'
+ } else {
+ params.push(getStructDefaultParam(item, searchlist, params.length === 0, BID))
+ }
+ }
+ }
+
+ item.setting.delay = delay
+ delay += 20
+
+ return item
+ })
+ }
+
+ /**
+ * @description 涓昏〃鏁版嵁鍔犺浇
+ */
+ loadmaindata = (params, BID) => {
+ const { config } = this.state
+
+ let param = getStructuredParams(params, config, BID)
+
+ if (config.$cache && config.$time) {
+ let uuid = params[0].uuid || ''
+ if (params[0].id) {
+ uuid = window.GLOB.CacheData.get('first_' + params[0].id) || ''
+ }
+ Api.getLCacheConfig(uuid, config.$time, BID).then(res => {
+ if (!res.valid) {
+ this.getMainData(param, params, config.uuid)
+ }
+ })
+ } else {
+ this.getMainData(param, params, config.uuid)
}
}
- resetSearch = (search) => {
- this.setState({mainSearch: search})
+ getMainData = (param, params, tabId) => {
+ Api.genericInterface(param).then(result => {
+ if (result.status) {
+ if (result.message) {
+ if (result.ErrCode === 'Y') {
+ Modal.success({
+ title: result.message
+ })
+ } else if (result.ErrCode === 'S') {
+ notification.success({
+ top: 92,
+ message: result.message,
+ duration: 2
+ })
+ }
+ }
+
+ params.forEach((item) => {
+ let _data = result[item.dataName] || ''
+ if (_data && !Array.isArray(_data)) {
+ _data = [_data]
+ }
+ window.GLOB.SyncData.set(item.dataName, _data)
+ })
+
+ MKEmitter.emit('transferSyncData', tabId)
+ } else {
+ MKEmitter.emit('transferSyncData', tabId)
+
+ if (!result.message) return
+
+ if (/灏嗘埅鏂瓧绗︿覆鎴栦簩杩涘埗鏁版嵁/ig.test(result.message)) {
+ result.message = result.message + '璇锋鏌ュ瓧娈甸泦'
+ }
+ if (result.ErrCode === 'N') {
+ Modal.error({
+ title: result.message,
+ })
+ } else if (result.ErrCode !== '-2') {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
+ }
+ })
}
- getComponents = () => {
- const { menuType, dataManager, BID, config } = this.props
- const { mainSearch } = this.state
+ getComponents = (components) => {
+ return components.map(item => {
+ let style = null
- if (!config || !config.components || config.components.length === 0) return (<Empty description={false} />)
+ if (item.style && item.style.clear === 'left') {
+ style = {clear: 'left'}
+ } else if (item.style && item.style.clear === 'right') {
+ style = {float: 'right'}
+ }
- return config.components.map(item => {
- if (item.type === 'bar' || item.type === 'line') {
+ if (item.type === 'card' && item.subtype === 'datacard') {
return (
- <Col span={item.width} key={item.uuid}>
- <AntvBarAndLine config={item} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} />
+ <Col span={item.width} style={style} key={item.uuid}>
+ <DataCard config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'card' && item.subtype === 'propcard') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <PropCard config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'table' && item.subtype === 'normaltable') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <NormalTable config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'card' && item.subtype === 'dualdatacard') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <DoubleDataCard config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'bar' || item.type === 'line') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvBarAndLine config={item}/>
</Col>
)
} else if (item.type === 'pie') {
return (
- <Col span={item.width} key={item.uuid}>
- <AntvPie config={item} BID={BID} mainSearch={mainSearch} menuType={menuType} dataManager={dataManager} />
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvPie config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'dashboard') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvDashboard config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'scatter') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvScatter config={item}/>
</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} />
+ <Col span={item.width} style={style} key={item.uuid}>
+ <MainSearch config={item} BID={BID}/>
</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} />
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvTabs config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'carousel' && item.subtype === 'datacard') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <CarouselDataCard config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'carousel' && item.subtype === 'propcard') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <CarouselPropCard config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'card' && item.subtype === 'tablecard') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <TableCard config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'table' && item.subtype === 'basetable') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <MkBaseTable config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'table' && item.subtype === 'editable') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <EditTable config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'group' && item.subtype === 'normalgroup') {
+ return (
+ <NormalGroup config={item} style={style} key={item.uuid}/>
+ )
+ } else if (item.type === 'form' && item.subtype === 'simpleform') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <SimpleForm config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'form' && item.subtype === 'stepform') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <StepForm config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'form' && item.subtype === 'tabform') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <TabForm config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'tree') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <NormalTree config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'calendar') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <Calendar config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'editor') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <BraftEditor config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'code') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <SandBox config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'balcony') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <Balcony config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'timeline') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <TimeLine config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'chart') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <CustomChart config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'antvG6') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvG6 config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'antvX6') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvX6 config={item}/>
</Col>
)
} else {
@@ -109,23 +391,20 @@
}
render() {
+ const { config } = this.state
+
+ if (!config || !config.components || config.components.length === 0) return (<Empty description={false} />)
+
+ if (config.type === 'group') {
+ return (
+ <Row className="component-wrap">{this.getComponents(config.components)}</Row>
+ )
+ }
+
return (
- <Row gutter={8}>{this.getComponents()}</Row>
+ <Row className="component-wrap" id={'anchor' + config.uuid}>{this.getComponents(config.components)}</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