@zgfe/modules-dm 1.0.39 → 1.0.41

package/es/components/demo.js

@@ -13,6 +13,7 @@ var DemoWrapper2 = function DemoWrapper2(props) {
     1700559695: true,
     100021: true
   };
+  // <DemoWrapper needMeta defaultApp={501313} contextProps={{ authority }}>
   return /*#__PURE__*/React.createElement(ConfigProvider, {
     locale: zhCN
   }, /*#__PURE__*/React.createElement("div", {
@@ -23,10 +24,7 @@ var DemoWrapper2 = function DemoWrapper2(props) {
     }
   }, /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 323,
-    contextProps: {
-      authority: authority
-    }
+    defaultApp: 501313
   }, props.children)));
 };
 export default DemoWrapper2;

package/es/modules/dataCollection/collectionEventList.js

@@ -337,16 +337,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/es/modules/dataCollection/styles/index.less

@@ -38,7 +38,6 @@
 .virtual-event-list,
 .event-list {
   position: relative;
-  min-height: 550px;
   &-back {
     margin-bottom: 10px;
     cursor: pointer;

package/es/modules/dataManage/demo/index.js

@@ -23,7 +23,6 @@ export default (function () {
     //     children: <div>aaa</div>,
     //   },
     // ]}
-    extraSubTabs: subTabs,
-    activeSubTab: "session"
+    extraSubTabs: subTabs
   }));
 });

package/es/modules/dataPlan/addPlan.js

@@ -517,7 +517,7 @@ var AddPlan = function AddPlan(props) {
 
     setEditOperate(true);
     setSelectedRowKeys([]);
-    message.error('删除成功');
+    message.success('删除成功');
   };
   // 是否有编辑操作
   var _useState35 = useState(false),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "245120a22bf5e6bb052e06235648b9f1be558c2a",
+  "gitHead": "ee301ccae532f40ea489db03cfadf1f14d6aef8e",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }