@zgfe/modules-dm 1.0.2-dm.22 → 1.0.2-dm.23

package/es/modules/dataCollection/collectionEventList.js

@@ -222,8 +222,8 @@ var CollectionEventList = function CollectionEventList(props) {
       setfilterTypeData = _useState18[1];
 
   useEffect(function () {
-    // console.log('filterTypeData', filterTypeData);
-    // 判断不同type的筛选条件
+    console.log('filterTypeData', filterTypeData); // 判断不同type的筛选条件
+
     var _judgeFun = function _judgeFun(item, filterItem) {
       switch (filterItem.type) {
         case 'mark_type':
@@ -241,8 +241,9 @@ var CollectionEventList = function CollectionEventList(props) {
         case 'is_stop':
           return item.is_stop == filterItem.value || item.groupId != undefined;
       }
-    }; // 多条件同时筛选
+    };
 
+    var clearEmptyGroupFlag = false; // 多条件同时筛选
 
     var _tableHandleData = [];
     tableHandleDataBasics.map(function (item) {
@@ -250,6 +251,7 @@ var CollectionEventList = function CollectionEventList(props) {
       filterTypeData.map(function (filterItem) {
         if (!_judgeFun(item, filterItem)) {
           falg = false;
+          if (filterItem.type == 'event_hidden' || filterItem.type == 'is_stop') clearEmptyGroupFlag = true;
         }
       });
       falg && _tableHandleData.push(item);
@@ -262,7 +264,7 @@ var CollectionEventList = function CollectionEventList(props) {
       }
     });
 
-    setTotal(total); // 过滤空组
+    setTotal(total); // 过滤空组 , event_hidden 和 is_stop，触发
 
     var clearEmptyGroup = function clearEmptyGroup(data) {
       var _data = _.cloneDeep(data);
@@ -281,7 +283,11 @@ var CollectionEventList = function CollectionEventList(props) {
       return _data;
     };
 
-    setTableHandleData(clearEmptyGroup(_tableHandleData));
+    if (!clearEmptyGroupFlag) {
+      setTableHandleData(_tableHandleData);
+    } else {
+      setTableHandleData(clearEmptyGroup(_tableHandleData));
+    }
   }, [filterTypeData, tableHandleDataBasics]); // 是否已包含筛选type
 
   var filterHas = function filterHas(type) {

package/es/modules/dataCollection/styles/index.less

@@ -173,6 +173,7 @@
           }
         }
         .select-style {
+          width: 126px;
           .ant-select-selection-item {
             color: #021429;
             font-weight: 500;

package/es/modules/dataPlan/index.js

@@ -125,8 +125,7 @@ var PlanList = function PlanList(props) {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
-      if (!res) throw new Error();
-      setListData(res.data.planList);
+      res.data && res.data.planList && setListData(res.data.planList);
     }).catch(function (err) {
       console.error('查询列表失败', err);
     }).finally(function () {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.22",
+  "version": "1.0.2-dm.23",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "license": "ISC",
@@ -41,7 +41,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.7-dmd2.7",
+    "@zgfe/business-lib": "1.1.7-dmd2.8",
     "antd": "4.22.6",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -53,7 +53,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "6da0e3c243ef034ae408f11086704cb814a802b4",
+  "gitHead": "04b81f0ef247ec3084e74d34b068327862525217",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }