From 1d32b21f464a916695acc9fa7e7eeda6e44f830d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十月 2023 18:14:44 +0800
Subject: [PATCH] 2023-10-25

---
 src/tabviews/custom/components/card/double-data-card/index.jsx |   57 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index d803a09..bda5137 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -1,7 +1,7 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { Spin, Empty, notification, Row, Col, Pagination, Modal } from 'antd'
+import { Spin, Empty, notification, Row, Col, Pagination, Modal, Switch } from 'antd'
 import { DownOutlined, UpOutlined, PlusSquareOutlined, MinusSquareOutlined } from '@ant-design/icons'
 
 import Api from '@/api'
@@ -35,7 +35,7 @@
     selectedData: [],          // 閫変腑鏁版嵁锛岀敤浜庡伐鍏锋爮鎸夐挳
     loading: false,            // 鏁版嵁鍔犺浇鐘舵��
     card: null,                // 鍗$墖璁剧疆
-    data: null,                // 鏁版嵁
+    data: [],                // 鏁版嵁
     total: null,
     precards: [],
     nextcards: [],
@@ -43,7 +43,8 @@
     opens: [],
     wrapStyle: null,
     subcard: null,
-    subconfig: null
+    subconfig: null,
+    pickup: false
   }
 
   loaded = false
@@ -380,7 +381,7 @@
     const { config, data, selected, card } = this.state
     let _opens = [...this.state.opens]
 
-    if (!data || data.length === 0) {
+    if (data.length === 0) {
       this.setState({
         activeKey: '',
         selectKeys: [],
@@ -462,7 +463,7 @@
     const { config, data, selectedData } = this.state
 
     if (config.wrap.cardType !== 'checkbox') return
-    if (!data || data.length === 0) return
+    if (data.length === 0) return
     
     if (selectedData.length === 0 || selectedData.length < data.length) {
       let index = ''
@@ -723,6 +724,7 @@
         selectedData: [],
         data: data,
         total: total,
+        pickup: false,
         loading: false
       })
 
@@ -1083,17 +1085,25 @@
     })
   }
 
-  render() {
-    const { config, precards, nextcards, loading, data, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens } = this.state
+  pickupChange = () => {
+    this.setState({
+      pickup: !this.state.pickup
+    })
+  }
 
-    if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
+  render() {
+    const { config, precards, nextcards, loading, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens, pickup } = this.state
+
+    let data = this.state.data
+
+    if (config.wrap.empty === 'hidden' && data.length === 0) return null
 
     let extendData = null
 
     if (config.$extend) {
       extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
       
-      if (data && data[0]) {
+      if (data[0]) {
         if (selectedData[0]) {
           extendData = {...extendData, ...selectedData[0]}
         } else {
@@ -1115,11 +1125,15 @@
       mainBox = 'flex-card '
     }
 
+    if (pickup) {
+      data = data.filter(item => selectKeys.includes(item.key))
+    }
+
     return (
       <div className="double-data-card-box" id={'anchor' + config.uuid} style={config.style}>
         {loading ?
           <div className="loading-mask">
-            {data ? <div className="ant-spin-blur"></div> : null}
+            {data.length ? <div className="ant-spin-blur"></div> : null}
             <Spin />
           </div> : null
         }
@@ -1134,6 +1148,7 @@
             selectedData={selectedData}
           /> : null
         }
+        {config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /></div> : null}
         <div className={config.wrap.zoomStyle ? 'data-zoom-box' : ''} style={config.wrap.zoomStyle}>
           <div className={`data-zoom ${config.wrap.wrapClass}`} style={config.wrap.minWidth ? {minWidth: config.wrap.minWidth} : null}>
             <Row className={'card-row-list '}>
@@ -1146,16 +1161,16 @@
                   </CardItem>}
                 </Col>
               ))}
-              {data && data.map((item, index) => {
+              {data.map((item, index) => {
                 let className = 'card-item-wrap mk-card ' + mainBox
                 let subClass = 'mk-unfold'
                 let unfold = true
 
                 if (item.$disabled) {
                   className = 'card-item-wrap mk-disabled ' + mainBox
-                } else if (activeKey === index) {
+                } else if (activeKey === item.key) {
                   className += 'active'
-                } else if (selectKeys.indexOf(index) > -1) {
+                } else if (selectKeys.indexOf(item.key) > -1) {
                   className += 'selected'
                 }
 
@@ -1164,18 +1179,18 @@
                     subClass = 'mk-disabled'
                     unfold = false
                   } else {
-                    subClass = opens.indexOf(index) > -1 ? 'mk-unfold' : 'mk-collapse'
-                    unfold = opens.indexOf(index) > -1
+                    subClass = opens.indexOf(item.key) > -1 ? 'mk-unfold' : 'mk-collapse'
+                    unfold = opens.indexOf(item.key) > -1
                   }
                 }
 
                 return (
                   <Col key={index} span={card.setting.width} style={card.wStyle}>
                     <div className={className} style={wrapStyle}>
-                      <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(index, subClass)} onClick={() => {this.changeCard(index, item, subClass)}}>
+                      <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(item.key, subClass)} onClick={() => {this.changeCard(item.key, item, subClass)}}>
                         <span className="circle-select"></span>
-                        {card.setting.controlIcon === 'left' ? (!unfold ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : <MinusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/>) : null}
-                        {card.setting.controlIcon === 'right' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : null}
+                        {card.setting.controlIcon === 'left' ? (!unfold ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/> : <MinusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/>) : null}
+                        {card.setting.controlIcon === 'right' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/> : null}
                       </CardItem>
                       <div className={'sub-card-wrap ' + subClass + (config.wrap.parity === 'true' ? ' mk-parity-bg' : '')} onClick={() => this.changeSubCard(item)}>
                         {item.children.map((cell, index) => <Col key={'sub' + index} span={subcard.setting.width || 24}>
@@ -1197,10 +1212,10 @@
               ))}
             </Row>
           </div>
-          {config.$empty && (!data || data.length === 0) ? <Empty description={false}/> : null}
+          {config.$empty && data.length === 0 ? <Empty description={false}/> : null}
         </div>
-        {config.wrap.pagestyle === 'page' && data ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} 鍏� ${total} 鏉 : `鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
-        {config.wrap.pagestyle === 'more' && data && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
+        {config.wrap.pagestyle === 'page' ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} 鍏� ${total} 鏉 : `鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
+        {config.wrap.pagestyle === 'more' && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
       </div>
     )
   }

--
Gitblit v1.8.0