@zgfe/modules-dm 1.0.2-dm.31 → 1.0.2-dm.32

package/es/modules/dataCollection/collectionEventList.js

@@ -19,7 +19,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
-import { Input, Button, Select, Modal, message, Drawer } from 'antd';
+import { Input, Button, Select, Modal, message, Drawer, Pagination } from 'antd';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
 import React, { useEffect, useState, useContext } from 'react';
@@ -345,6 +345,100 @@ var CollectionEventList = function CollectionEventList(props) {
     setEventAttrListShow(true);
   };
 
+  var _useState23 = useState(1),
+      _useState24 = _slicedToArray(_useState23, 2),
+      pageNumber = _useState24[0],
+      setPageNumber = _useState24[1];
+
+  var _useState25 = useState(0),
+      _useState26 = _slicedToArray(_useState25, 2),
+      pageNumberIng = _useState26[0],
+      setpageNumberIng = _useState26[1];
+
+  var _useState27 = useState(10),
+      _useState28 = _slicedToArray(_useState27, 2),
+      pageSize = _useState28[0],
+      setPageSize = _useState28[1];
+
+  var _useState29 = useState([]),
+      _useState30 = _slicedToArray(_useState29, 2),
+      tableRenderData = _useState30[0],
+      setTableRenderData = _useState30[1]; // useEffect(() => {
+  //   console.log('tableHandleData', tableHandleData);
+  //   if (tableHandleData.length <= 0) {
+  //     return;
+  //   }
+  //   if (pageNumber == pageNumberIng) {
+  //     return;
+  //   }
+  //   let paginationData: DataType[][] = [];
+  //   let arr: DataType[] = [];
+  //   let count = 0;
+  //   tableHandleData.map((item) => {
+  //     if (item._groupId != undefined) {
+  //       count++;
+  //     }
+  //     arr.push(item);
+  //     if (count == pageSize) {
+  //       paginationData.push(arr);
+  //       count = 0;
+  //       arr = [];
+  //     }
+  //   });
+  //   if (count != 0) {
+  //     paginationData.push(arr);
+  //     count = 0;
+  //     arr = [];
+  //   }
+  //   console.log('paginationData', tableRenderData, paginationData[pageNumber - 1]);
+  //   setTableRenderData([...tableRenderData, ...paginationData[pageNumber - 1]]);
+  //   setpageNumberIng(pageNumber);
+  // }, [pageNumber, pageNumberIng, tableHandleData]);
+
+
+  useEffect(function () {
+    setPageNumber(1);
+  }, [tableHandleData]);
+  useEffect(function () {
+    if (tableHandleData.length <= 0) {
+      return;
+    }
+
+    var paginationData = [];
+    var arr = [];
+    var count = 0;
+    tableHandleData.map(function (item) {
+      if (item._groupId != undefined) {
+        count++;
+      }
+
+      arr.push(item);
+
+      if (count == pageSize) {
+        paginationData.push(arr);
+        count = 0;
+        arr = [];
+      }
+    });
+
+    if (arr.length > 0) {
+      paginationData.push(arr);
+      count = 0;
+      arr = [];
+    }
+
+    setTableRenderData(paginationData[pageNumber - 1]);
+  }, [pageNumber, pageSize, tableHandleData]); // 分页处理
+
+  var onPaginationChange = function onPaginationChange(pageNumber, pageSize) {
+    setPageNumber(pageNumber);
+    setPageSize(pageSize);
+  }; // const pageSizeChange = (pageNumber: number) => {
+  //   console.log('---pageSize---', pageNumber);
+  //   setPageNumber(pageNumber);
+  // };
+
+
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -381,13 +475,24 @@ var CollectionEventList = function CollectionEventList(props) {
     }
   }, "\u521B\u5EFA\u4E8B\u4EF6\u5206\u7EC4")), /*#__PURE__*/React.createElement(TablePlus, {
     loading: loading,
-    tableHandleData: tableHandleData,
+    tableHandleData: tableRenderData,
     Refresh: refreshHandle,
     eventActiveFilter: eventActiveFilter,
     markTypeFilter: markTypeFilter,
     isOpen: props.isOpen,
     queryPlanData: props.queryPlanData,
-    eventAttrDataHandle: eventAttrDataHandle
+    eventAttrDataHandle: eventAttrDataHandle,
+    // pageSizeChange={pageSizeChange}
+    total: total
+  }), /*#__PURE__*/React.createElement(Pagination, {
+    style: {
+      textAlign: 'right'
+    },
+    showQuickJumper: true,
+    defaultCurrent: 1,
+    current: pageNumber,
+    total: total,
+    onChange: onPaginationChange
   })), /*#__PURE__*/React.createElement(Drawer, {
     className: "".concat(classPrefix, "-drawer"),
     width: '70%',

package/es/modules/dataCollection/tablePlus.d.ts

@@ -29,6 +29,8 @@ interface TablePlusType {
     queryPlanData: queryPlanType;
     eventAttrDataHandle: Function;
     loading: boolean;
+    pageSizeChange?: Function;
+    total: number;
 }
 declare const TablePlus: React.FC<TablePlusType>;
 export default TablePlus;

package/es/modules/dataCollection/tablePlus.js

@@ -619,11 +619,33 @@ var TablePlus = function TablePlus(props) {
         }, "\u5220\u9664");
       }
     }
-  }];
+  }]; // const [isMore, setIsMore] = useState(true); // 是否还有数据
+  // const [pageNumber, setPageNumber] = useState(1); // 页码
+  // let scrollRef: any;
+  // const onScrollCapture = (e:any) => {
+  //   // scrollTop会有小数点导致等式不成立，解决方案：四舍五入
+  //   if (
+  //     Math.round(scrollRef.scrollTop) + scrollRef.clientHeight == scrollRef.scrollHeight
+  //   ) {
+  //     if (Math.ceil(props.total / 10) == pageNumber) {
+  //       setIsMore(false);
+  //       return false;
+  //     }
+  //     // getList(page + 1);
+  //     setPageNumber(pageNumber + 1);
+  //   }
+  // };
+  // useEffect(() => {
+  //   pageNumber != 1 && props.pageSizeChange(pageNumber);
+  // }, [pageNumber]);
+
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),
+    style: {
+      minHeight: '640px'
+    },
     columns: columns,
     rowKey: "key",
     loading: props.loading,
@@ -635,7 +657,8 @@ var TablePlus = function TablePlus(props) {
       x: 1300,
       y: 550
     },
-    pagination: false
+    pagination: false,
+    sticky: true
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u4FEE\u6539\u5206\u7EC4\u540D",
     bodyStyle: {

package/es/store/index.js

@@ -21,8 +21,7 @@ import { initState } from './state';
 import { ActionType } from './action';
 
 var DmReducer = function DmReducer(prevState, action) {
-  console.log('DmReducer', prevState, action);
-
+  // console.log('DmReducer', prevState, action);
   switch (action.type) {
     case ActionType.SET_GLOBAL:
       return _objectSpread(_objectSpread({}, prevState), {}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.31",
+  "version": "1.0.2-dm.32",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "license": "ISC",
@@ -53,7 +53,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "32d73da9d71950ec7e16cb17876d152f83735894",
+  "gitHead": "11915ab68a51bf44cc8716916c571dd08955493a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }