@zgfe/modules-dm 1.0.31-parameter.0 → 1.0.31-xinao.2

package/es/modules/dataCollection/collectionAttributeList.js

@@ -353,8 +353,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       source == 'event' ? data.append('event_id', eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_id) : null;
       request(apis.propUpload, {
         method: 'post',
-        data: data,
-        isTransform: false
+        data: data
       }).then(function (res) {
         if (res.code == 10001) {
           message.success('上传成功');

package/es/modules/dataCollection/collectionEventList.js

@@ -374,16 +374,25 @@ var CollectionEventList = function CollectionEventList(props) {
       count = 0;
       arr = [];
     }
+    // 当前页需要展示的数据
     var _renderData = paginationData[pageNumber - 1];
-    // console.log('_renderData', pageNumber, pageSize, tableHandleData, _renderData);
+    // 临时数组，存储已添加的分组id
+    var _tempGroupIdList = [];
+    // 临时渲染数据，搜索时使用，存放处理后的数据（含分组信息）
+    var _tempRenderData = [];
+    // console.log('_renderData', tableHandleData, _renderData, groupData);
     if (_renderData && _renderData.length > 0 && _renderData[0].groupId == undefined) {
-      groupData.map(function (item) {
-        if (item.groupId == _renderData[0]._groupId) {
-          _renderData.unshift(item);
-        }
+      _renderData.map(function (item) {
+        groupData.map(function (_item) {
+          if (_item.groupId === item._groupId && _tempGroupIdList.indexOf(item._groupId) === -1) {
+            _tempGroupIdList.push(item._groupId);
+            _tempRenderData.push(_item);
+          }
+        });
+        _tempRenderData.push(item);
       });
     }
-    setTableRenderData(_renderData);
+    setTableRenderData(_tempRenderData.length > 0 ? _tempRenderData : _renderData);
   }, [pageNumber, pageSize, tableHandleData]);
   // 分页处理
   var onPaginationChange = function onPaginationChange(pageNumber, pageSize) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.31-parameter.0",
+  "version": "1.0.31-xinao.2",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -37,7 +37,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.74",
+    "@zgfe/business-lib": "^1.1.57",
     "antd": "4.24.10",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -49,7 +49,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "cb9b9aeae4808dc3365eeb036f3af7928e6397fa",
+  "gitHead": "9946c9d4ac13d31bfa3be622e1b5eae0a9447402",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }