@zgfe/modules-dm 1.0.35-zhongbang.0 → 1.0.35-zhongbang.2

package/es/modules/dataCollection/collectionEventList.js

@@ -375,15 +375,39 @@ var CollectionEventList = function CollectionEventList(props) {
       arr = [];
     }
     var _renderData = paginationData[pageNumber - 1];
+    var groupList = [];
+    var groupIdMap = {};
     // console.log('_renderData', pageNumber, pageSize, tableHandleData, _renderData);
     if (_renderData && _renderData.length > 0 && _renderData[0].groupId == undefined) {
       groupData.map(function (item) {
-        if (item.groupId == _renderData[0]._groupId) {
+        // 遍历_renderData中的数据，如果_renderData中的数据中有分组数据，将分组数据插入到_renderData中
+        var _flag = false;
+        _renderData.map(function (_item) {
+          if (_item._groupId == item.groupId) {
+            _flag = true;
+            if (!groupIdMap[item.groupId]) {
+              groupIdMap[item.groupId] = [];
+            }
+            groupIdMap[item.groupId].push(_item);
+          }
+        });
+        if (_flag) {
+          groupList.push(item);
           _renderData.unshift(item);
         }
       });
+    } else {
+      setTableRenderData(_renderData);
+      return;
     }
-    setTableRenderData(_renderData);
+    var resultList = [];
+    groupList.forEach(function (group) {
+      resultList.push(group);
+      groupIdMap[group.groupId].forEach(function (item) {
+        resultList.push(item);
+      });
+    });
+    setTableRenderData(resultList);
   }, [pageNumber, pageSize, tableHandleData]);
   // 分页处理
   var onPaginationChange = function onPaginationChange(pageNumber, pageSize) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.35-zhongbang.0",
+  "version": "1.0.35-zhongbang.2",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -49,7 +49,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "31b757dec75375568adbc8043d3db763980d96b7",
+  "gitHead": "c5769110ff319419b35617603b0fc38db9d2e0f9",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }