@zgfe/modules-dm 1.0.35-dadi.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/es/modules/dataCollection/tablePlus.js

@@ -573,23 +573,16 @@ var TablePlus = function TablePlus(props) {
           type: "shanchu"
         }));
       } else {
-        return /*#__PURE__*/React.createElement(React.Fragment, null);
-        // return (
-        //   <div
-        //     className={`set ${record.owner == 'zg_abp' ? 'set-error' : ''}`}
-        //     onClick={() => {
-        //       if (!authority[1000005]) {
-        //         message.error('无修改权限');
-        //         return;
-        //       }
-        //       record.owner != 'zg_abp'
-        //         ? eventItemDel(record.event_id)
-        //         : message.error('内置事件无法删除');
-        //     }}
-        //   >
-        //     删除
-        //   </div>
-        // );
+        return /*#__PURE__*/React.createElement("div", {
+          className: "set ".concat(record.owner == 'zg_abp' ? 'set-error' : ''),
+          onClick: function onClick() {
+            if (!authority[1000005]) {
+              message.error('无修改权限');
+              return;
+            }
+            record.owner != 'zg_abp' ? eventItemDel(record.event_id) : message.error('内置事件无法删除');
+          }
+        }, "\u5220\u9664");
       }
     }
   }];

package/es/modules/dataPlan/addPlan.js

@@ -418,10 +418,9 @@ var AddPlan = function AddPlan(props) {
       method: 'post',
       data: _objectSpread({}, ManagementPlan)
     }).then(function (res) {
-      if (res.code == '00') {
-        message.success('保存成功');
-        closeDrawer('save');
-      }
+      if (!res) return;
+      message.success('保存成功');
+      closeDrawer('save');
     }).catch(function (err) {});
   };
   // 存储选中的keys

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.35-dadi.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": "3dd750e5783aa6854ac8dafe30fbca2065935949",
+  "gitHead": "c5769110ff319419b35617603b0fc38db9d2e0f9",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }