From b26252d4e842e2561b5295b0d07ae98a4eaa3fe6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 三月 2023 14:17:57 +0800
Subject: [PATCH] 2023-03-16

---
 src/tabviews/custom/components/card/double-data-card/index.jsx |   78 ++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 46 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 fc363c8..c866b32 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -7,8 +7,6 @@
 import Api from '@/api'
 import Utils from '@/utils/utils.js'
 import UtilsDM from '@/utils/utils-datamanage.js'
-import preImg from '@/assets/img/prev.png'
-import nextImg from '@/assets/img/next.png'
 import MKEmitter from '@/utils/events.js'
 import TimerTask from '@/utils/timer-task.js'
 import asyncComponent from '@/utils/asyncComponent'
@@ -30,6 +28,8 @@
     config: null,              // 鍥捐〃閰嶇疆淇℃伅
     search: null,              // 鎼滅储鏉′欢
     pageIndex: 1,              // 椤电爜
+    pageSize: 10,
+    pageOptions: [],
     activeKey: '',             // 閫変腑鍗�
     selectKeys: [],            // 澶氶�夋椂閫変腑鍗$墖
     selectedData: [],          // 閫変腑鏁版嵁锛岀敤浜庡伐鍏锋爮鎸夐挳
@@ -136,8 +136,19 @@
     }
 
     _config.setting.sub_field = subconfig.columns.map(col => col.field).join(',')
+    let pageOptions = ['10', '25', '50', '100', '500', '1000']
+
+    if (_config.wrap.pagestyle === 'page') {
+      let size = (_config.setting.pageSize || 10) + ''
+      if (!pageOptions.includes(size)) {
+        pageOptions.push(size)
+        pageOptions = pageOptions.sort((a, b) => a - b)
+      }
+    }
 
     this.setState({
+      pageSize: _config.setting.pageSize || 10,
+      pageOptions,
       selected,
       precards,
       nextcards,
@@ -457,7 +468,7 @@
 
   async loadData (id, type) {
     const { mainSearch } = this.props
-    const { config, arr_field, pageIndex, search, BID, BData, selected, card } = this.state
+    const { config, arr_field, pageIndex, pageSize, search, BID, BData, selected, card } = this.state
 
     if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
       this.loaded = true
@@ -508,13 +519,13 @@
     }
 
     let _orderBy = config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID)
+    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
       let start = 1
       if (config.setting.laypage) {
-        start = config.setting.pageSize * (pageIndex - 1) + 1
+        start = pageSize * (pageIndex - 1) + 1
       }
 
       this.loaded = true
@@ -653,7 +664,7 @@
    */ 
   async loadLinedata (id) {
     const { mainSearch } = this.props
-    const { config, arr_field, pageIndex, search, BID, BData } = this.state
+    const { config, arr_field, pageIndex, pageSize, search, BID, BData } = this.state
 
     let searches = fromJS(search).toJS()
     if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
@@ -670,7 +681,7 @@
     })
 
     let _orderBy = config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, id)
+    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
@@ -737,9 +748,9 @@
   }
 
   loadMore = () => {
-    const { total, pageIndex, loading, config } = this.state
+    const { total, pageIndex, pageSize, loading } = this.state
 
-    if (loading || config.setting.pageSize * pageIndex >= total) {
+    if (loading || pageSize * pageIndex >= total) {
       return
     }
 
@@ -747,31 +758,6 @@
       pageIndex: pageIndex + 1
     }, () => {
       this.loadData('', 'plus')
-    })
-  }
-
-  prevPage = () => {
-    const { pageIndex } = this.state
-
-    if (pageIndex === 1) return
-
-    this.setState({
-      pageIndex: pageIndex - 1
-    }, () => {
-      this.loadData()
-    })
-  }
-
-  nextPage = () => {
-    const { config, pageIndex, total } = this.state
-    let _total = config.setting.pageSize * pageIndex
-
-    if (_total >= total) return
-
-    this.setState({
-      pageIndex: pageIndex + 1
-    }, () => {
-      this.loadData()
     })
   }
 
@@ -787,6 +773,15 @@
     this.setState({
       search: list,
       pageIndex: 1
+    }, () => {
+      this.loadData()
+    })
+  }
+
+  pageSizeChange = (current, size) => {
+    this.setState({
+      pageIndex: current,
+      pageSize: size
     }, () => {
       this.loadData()
     })
@@ -869,16 +864,9 @@
   }
 
   render() {
-    const { config, precards, nextcards, loading, data, pageIndex, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens } = this.state
+    const { config, precards, nextcards, loading, data, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens } = this.state
 
     if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
-
-    let _total = 0
-    let switchable = false
-    if (config.wrap.pagestyle === 'switch' && config.pageable && config.setting.laypage && total > config.setting.pageSize && data) {
-      _total = config.setting.pageSize * pageIndex
-      switchable = true
-    }
 
     let extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
 
@@ -919,7 +907,6 @@
           /> : null
         }
         <div className={`data-zoom ${config.wrap.wrapClass}`}>
-          {switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
           <Row className={'card-row-list '}>
             {precards.map((item, index) => (
               <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
@@ -976,11 +963,10 @@
               </Col>
             ))}
           </Row>
-          {switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
           {precards.length === 0 && nextcards.length === 0 && (!data || data.length === 0) ? <Empty description={false}/> : null}
         </div>
-        {config.wrap.pagestyle === 'page' && config.setting.laypage && data ? <Pagination size="small" total={total} showTotal={t => `鍏� ${t} 鏉} pageSize={config.setting.pageSize} onChange={this.changePageIndex} current={pageIndex}/> : null}
-        {config.wrap.pagestyle === 'more' && config.setting.laypage && data && data.length > 0 ? <div className={'mk-more' + (config.setting.pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
+        {config.wrap.pagestyle === 'page' && config.setting.laypage && data ? <Pagination size="small" total={total} showTotal={(t, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
+        {config.wrap.pagestyle === 'more' && config.setting.laypage && data && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
       </div>
     )
   }

--
Gitblit v1.8.0