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

package/es/modules/dataCollection/collectionEventList.js

@@ -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/dataManage/index.js

@@ -74,6 +74,8 @@ var DataManage = function DataManage(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "tabs-box"
   }, /*#__PURE__*/React.createElement(Tabs, {
     className: "tabs",
     defaultActiveKey: "0",
@@ -93,7 +95,7 @@ var DataManage = function DataManage(props) {
       type: "maidianfanganguanli"
     }), "\u57CB\u70B9\u65B9\u6848\u7BA1\u7406"),
     key: "1"
-  })), listTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), listTab == '1' && /*#__PURE__*/React.createElement(PlanList, null)));
+  }))), listTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), listTab == '1' && /*#__PURE__*/React.createElement(PlanList, null)));
 };
 
 export default DataManage;

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

@@ -5,6 +5,10 @@
   top: 0;
   left: 0;
   width: 100%;
+  .tabs {
+    position: absolute !important;
+    top: 0 !important;
+  }
 }
 .__dumi-default-menu {
   width: 0;
@@ -15,9 +19,17 @@
   display: flex;
   height: 100%;
   background: #f5f5f5;
+  .tabs-box {
+    position: relative;
+    min-width: 240px;
+    margin-right: 24px;
+    background: #fff;
+  }
   .tabs {
-    box-sizing: border-box;
-    width: 240px;
+    position: fixed;
+    top: 48px;
+    left: 0;
+    min-width: 240px;
     margin-right: 24px;
     padding-top: 16px;
     background: #fff;

package/es/modules/dataPlan/addEventOrUser.js

@@ -152,15 +152,14 @@ var addEventOrUser = function addEventOrUser(props) {
 
     var tableColumnsPropsRender = function tableColumnsPropsRender(item) {
       var render = function render(text, record, index) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, item.dataIndex == 'set' ? /*#__PURE__*/React.createElement(Button, {
-          type: "text",
-          className: "".concat(classPrefix, "-table-del"),
+        return /*#__PURE__*/React.createElement(React.Fragment, null, item.dataIndex == 'set' ? /*#__PURE__*/React.createElement(IconFont, {
+          className: "set-del ".concat(tableRowData.length <= 1 ? 'set-del-err' : ''),
+          disabled: true,
+          type: "shanchu1",
           onClick: function onClick() {
             handleRow('del', record);
           }
-        }, /*#__PURE__*/React.createElement(IconFont, {
-          type: "shanchu1"
-        })) : /*#__PURE__*/React.createElement(Form.Item, {
+        }) : /*#__PURE__*/React.createElement(Form.Item, {
           name: "".concat(item.dataIndex, "-").concat(record.key),
           rules: rulesData(item)
         }, /*#__PURE__*/React.createElement(Input, null)));
@@ -187,12 +186,20 @@ var addEventOrUser = function addEventOrUser(props) {
 
 
   var _columns_event = [{
-    title: '*事件名称',
+    title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: 'red'
+      }
+    }, "*"), " \u4E8B\u4EF6\u540D\u79F0"),
     dataIndex: 'eventName',
     key: 'eventName',
     align: 'center'
   }, {
-    title: '*事件属性',
+    title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: 'red'
+      }
+    }, "*"), " \u4E8B\u4EF6\u5C5E\u6027"),
     dataIndex: 'attrName',
     key: 'attrName',
     align: 'center'
@@ -203,12 +210,20 @@ var addEventOrUser = function addEventOrUser(props) {
   }]; // 表格列 - user
 
   var _columns_user = [{
-    title: '*唯一标识',
+    title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: 'red'
+      }
+    }, "*"), " \u552F\u4E00\u6807\u8BC6"),
     dataIndex: 'identify',
     key: 'identify',
     align: 'center'
   }, {
-    title: '*属性名称',
+    title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: 'red'
+      }
+    }, "*"), " \u5C5E\u6027\u540D\u79F0"),
     dataIndex: 'propName',
     key: 'propName',
     align: 'center'

package/es/modules/dataPlan/addPlan.js

@@ -17,7 +17,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
-import { Input, Button, Select, Tabs, Drawer, Upload, message, Checkbox, Empty, Spin } from 'antd';
+import { Input, Button, Select, Tabs, Drawer, Upload, message, Checkbox, Spin, Table } from 'antd';
 var Option = Select.Option;
 import React, { useEffect, useState, useContext } from 'react';
 import './styles/index.less';
@@ -425,6 +425,7 @@ var AddPlan = function AddPlan(props) {
 
   var savePlanData = function savePlanData() {
     if (planName == '') {
+      message.error('请输入方案名称');
       setplanNameInputStatus('warning');
       return;
     }
@@ -651,8 +652,36 @@ var AddPlan = function AddPlan(props) {
     } else {
       setSearchTotal(userAttrData.length);
     }
-  }, [listTab, eventListData, userAttrData]);
+  }, [listTab, eventListData, userAttrData]); // 表格列
+
+  var columns = [{
+    title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
+      className: allCheckedClassName,
+      checked: tableAllchecked,
+      style: {
+        marginRight: '10px'
+      },
+      onChange: function onChange(e) {
+        allCheck(e);
+      }
+    }), "\u4E8B\u4EF6\u540D\u79F0"),
+    dataIndex: 'eventName',
+    width: '25%'
+  }, {
+    title: '采集状态',
+    dataIndex: 'eventActive',
+    width: '25%'
+  }, {
+    title: '事件属性',
+    dataIndex: 'attributeName',
+    width: '25%'
+  }, {
+    title: '采集状态',
+    dataIndex: 'attributeActive',
+    width: '25%'
+  }];
   return /*#__PURE__*/React.createElement(Drawer, {
+    className: "".concat(classPrefix, "-drawer"),
     width: '70%',
     placement: "right",
     destroyOnClose: true,
@@ -679,9 +708,7 @@ var AddPlan = function AddPlan(props) {
     value: planName,
     status: planNameInputStatus,
     onChange: PlanNameChange
-  }), planNameInputStatus != '' && /*#__PURE__*/React.createElement("div", {
-    className: "input-waring"
-  }, "\u8BF7\u8F93\u5165\u65B9\u6848\u540D\u79F0"), (props.detailId == -1 || editOperate) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
+  }), (props.detailId == -1 || editOperate) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     className: "cancel",
     onClick: function onClick() {
       return closeDrawer('close');
@@ -735,18 +762,12 @@ var AddPlan = function AddPlan(props) {
     setSearchData: setSearchData,
     setVisible: setVisible,
     isDemo: isDemo
-  }), listTab == '1' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("ul", {
-    className: "".concat(classPrefix, "-table-header")
-  }, /*#__PURE__*/React.createElement("li", null, /*#__PURE__*/React.createElement(Checkbox, {
-    className: allCheckedClassName,
-    checked: tableAllchecked,
-    style: {
-      marginRight: '10px'
-    },
-    onChange: function onChange(e) {
-      allCheck(e);
-    }
-  }), "\u4E8B\u4EF6\u540D\u79F0"), /*#__PURE__*/React.createElement("li", null, "\u91C7\u96C6\u72B6\u6001"), /*#__PURE__*/React.createElement("li", null, "\u4E8B\u4EF6\u5C5E\u6027"), /*#__PURE__*/React.createElement("li", null, "\u91C7\u96C6\u72B6\u6001")), eventListData.map(function (item, index) {
+  }), listTab == '1' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Table, {
+    className: "".concat(classPrefix, "-table-header ").concat(JSON.stringify(eventListData).indexOf('eventName') == -1 ? 'empty' : ''),
+    columns: columns,
+    dataSource: [],
+    pagination: false
+  }), eventListData.map(function (item, index) {
     return /*#__PURE__*/React.createElement(EventList, {
       key: index,
       selectedRowKeys: selectedRowKeys,
@@ -756,8 +777,6 @@ var AddPlan = function AddPlan(props) {
       tableClick: tableClick,
       eventListDataIndex: index
     });
-  }), JSON.stringify(eventListData).indexOf('eventName') == -1 && /*#__PURE__*/React.createElement(Empty, {
-    image: Empty.PRESENTED_IMAGE_SIMPLE
   })), listTab == '2' && /*#__PURE__*/React.createElement(UserAttributeList, {
     tableCheck: tableCheck,
     allCheck: allCheck,

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 () {});
@@ -199,7 +198,7 @@ var PlanList = function PlanList(props) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, !drawerShow && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-switchbox clearfix")
   }, /*#__PURE__*/React.createElement("div", {
     className: "switch-div"
@@ -232,7 +231,7 @@ var PlanList = function PlanList(props) {
     dataSource: listData,
     // onChange={onChange}
     pagination: false
-  })), /*#__PURE__*/React.createElement(AddPlan, {
+  }), /*#__PURE__*/React.createElement(AddPlan, {
     listData: listData,
     detailName: detailName,
     drawerShow: drawerShow,

package/es/modules/dataPlan/search.js

@@ -23,7 +23,7 @@ var Search = function Search(props) {
     })
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-text")
-  }, "\u5171", /*#__PURE__*/React.createElement("span", null, props.total), "\u6761 / \u4E0A\u9650500\u6761"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u5171 ", /*#__PURE__*/React.createElement("span", null, props.total), " \u6761 / \u4E0A\u9650500\u6761"), /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(IconFont, {
       type: "tianjia",
       style: {

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

@@ -83,6 +83,18 @@
 .add-plan {
   position: relative;
   height: 100%;
+  &-drawer {
+    .ant-drawer-header-title {
+      height: 20px;
+      .ant-drawer-close {
+        position: absolute;
+        right: 24px;
+      }
+    }
+    .ant-drawer-mask {
+      background: rgba(0, 0, 0, 0.8);
+    }
+  }
   .spin {
     position: absolute;
     top: 50%;
@@ -106,7 +118,8 @@
   &-top {
     position: relative;
     display: flex;
-    margin-bottom: 30px;
+    margin-top: -8px;
+    margin-bottom: 8px;
     .input-waring {
       position: absolute;
       bottom: -30px;
@@ -143,7 +156,7 @@
   }
   &-tabs {
     position: relative;
-    display: flex;
+    // display: flex;
     margin-bottom: 15px;
     > :nth-child(1) {
       border-radius: 4px 0 0 4px !important;
@@ -153,7 +166,7 @@
     }
     .handle-box {
       position: absolute;
-      top: 14px;
+      top: 5px;
       right: 20px;
       .bsicon {
         margin-right: 10px;
@@ -170,15 +183,26 @@
     }
   }
   &-table-header {
-    display: flex;
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-    background: #fff;
-    li {
-      width: 25%;
-      padding: 16px;
-      border: 1px solid #e8efff;
+    .ant-table-tbody {
+      display: none;
+    }
+    .ant-table {
+      border-radius: 8px 8px 0 0 !important;
+    }
+    // display: flex;
+    // margin: 0;
+    // padding: 0;
+    // list-style-type: none;
+    // background: #fff;
+    // li {
+    //   width: 25%;
+    //   padding: 16px;
+    //   border: 1px solid #e8efff;
+    // }
+  }
+  &-table-header.empty {
+    .ant-table-tbody {
+      display: contents;
     }
   }
   .user-list,
@@ -221,6 +245,10 @@
       .ant-table-thead {
         display: none;
       }
+      .ant-table {
+        border: none;
+        border-radius: 0;
+      }
     }
     // &-table-header {
     //   display: flex;
@@ -247,6 +275,16 @@
     }
   }
   .add-event {
+    .set-del {
+      margin-left: 15px;
+      color: #021429;
+    }
+    .set-del-err {
+      color: #cacdd4;
+    }
+    .ant-modal-body {
+      padding: 5px 24px 24px 24px;
+    }
     .ant-form-item {
       margin: 0;
     }
@@ -271,6 +309,7 @@
     &-text {
       span {
         color: @primary-color;
+        font-weight: bold;
       }
     }
     &-add-button {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.21",
+  "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": "428e45251462fb8f5135e28630fa7e4fde4e20c8",
+  "gitHead": "04b81f0ef247ec3084e74d34b068327862525217",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }