From ba9e189dd33c8d48f7f4ac36bcefeef9afb426f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 七月 2023 23:40:49 +0800
Subject: [PATCH] 2023-07-17

---
 src/tabviews/custom/components/share/tabtransfer/index.jsx |   51 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index 75ee5c2..2e26fb1 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -22,6 +22,7 @@
 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'))
@@ -38,6 +39,8 @@
 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 = {
@@ -124,14 +127,15 @@
    * @description 涓昏〃鏁版嵁鍔犺浇
    */ 
   loadmaindata = (params) => {
+    const { config } = this.props
     let BID = ''
-    let BData = window.GLOB.CacheData.get(this.props.config.$pageId)
+    let BData = window.GLOB.CacheData.get(config.$pageId)
 
     if (BData) {
       BID = BData.$BID || ''
     }
 
-    let param = getStructuredParams(params, this.props.config, BID)
+    let param = getStructuredParams(params, config, BID)
 
     Api.genericInterface(param).then(result => {
       if (result.status) {
@@ -139,6 +143,16 @@
         delete result.message
         delete result.ErrMesg
         delete result.ErrCode
+
+        if (config.$cache) {
+          params.forEach((item) => {
+            let _data = result[item.name] || ''
+            if (_data && !Array.isArray(_data)) {
+              _data = [_data]
+            }
+            Api.writeCacheConfig(item.uuid, _data)
+          })
+        }
 
         this.setState({
           data: result
@@ -162,17 +176,16 @@
     })
   }
 
-  getComponents = () => {
-    const { config } = this.props
+  getComponents = (components) => {
     const { mainSearch, data } = this.state
 
-    if (!config || !config.components || config.components.length === 0) return (<Empty description={false} />)
-
-    return config.components.map(item => {
+    return components.map(item => {
       let style = null
 
       if (item.style && item.style.clear === 'left') {
         style = {clear: 'left'}
+      } else if (item.style && item.style.clear === 'right') {
+        style = {float: 'right'}
       }
 
       if (item.type === 'card' && item.subtype === 'datacard') {
@@ -191,6 +204,12 @@
         return (
           <Col span={item.width} style={style} key={item.uuid}>
             <NormalTable config={item} data={data} mainSearch={mainSearch}/>
+          </Col>
+        )
+      } else if (item.type === 'card' && item.subtype === 'dualdatacard') {
+        return (
+          <Col span={item.width} style={style} key={item.uuid}>
+            <DoubleDataCard config={item} mainSearch={mainSearch}/>
           </Col>
         )
       } else if (item.type === 'bar' || item.type === 'line') {
@@ -294,6 +313,12 @@
             <NormalTree config={item} data={data} mainSearch={mainSearch}/>
           </Col>
         )
+      } else if (item.type === 'calendar') {
+        return (
+          <Col span={item.width} style={style} key={item.uuid}>
+            <Calendar config={item} mainSearch={mainSearch}/>
+          </Col>
+        )
       } else if (item.type === 'editor') {
         return (
           <Col span={item.width} style={style} key={item.uuid}>
@@ -330,6 +355,12 @@
             <AntvG6 config={item} data={data} mainSearch={mainSearch}/>
           </Col>
         )
+      } else if (item.type === 'antvX6') {
+        return (
+          <Col span={item.width} style={style} key={item.uuid}>
+            <AntvX6 config={item}/>
+          </Col>
+        )
       } else {
         return null
       }
@@ -337,8 +368,12 @@
   }
 
   render() {
+    const { config } = this.props
+
+    if (!config || !config.components || config.components.length === 0) return (<Empty description={false} />)
+
     return (
-      <Row className="component-wrap" gutter={8}>{this.getComponents()}</Row>
+      <Row className="component-wrap" id={'anchor' + config.uuid} gutter={8}>{this.getComponents(config.components)}</Row>
     )
   }
 }

--
Gitblit v1.8.0