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

package/es/modules/dataCollection/collectionAttributeList.js

@@ -449,7 +449,6 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       return rowRenderHandle(record.name) ? 'error-row' : '';
     },
     dataSource: userAttrData,
-    bordered: true,
     pagination: false
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u5C5E\u6027\u503C\u522B\u540D",
@@ -487,7 +486,6 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     },
     columns: attrColumns,
     dataSource: attrExcelData,
-    bordered: true,
     pagination: false
   })));
 };

package/es/modules/dataCollection/collectionEventList.js

@@ -1,3 +1,11 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -17,6 +25,7 @@ import apis from '../../constants/api';
 import React, { useEffect, useState, useContext } from 'react';
 import './styles/index.less';
 import TablePlus from './tablePlus';
+import _ from 'lodash';
 import CollectionAttributeList from './collectionAttributeList';
 
 var CollectionEventList = function CollectionEventList(props) {
@@ -70,7 +79,7 @@ var CollectionEventList = function CollectionEventList(props) {
     return _markTypeFlag;
   };
 
-  var dataFinish = function dataFinish(data) {
+  var dataFinish = function dataFinish(data, refreshFlag) {
     var _tempArr = [];
     var _tempGroupOptions = [{
       value: -999,
@@ -113,12 +122,17 @@ var CollectionEventList = function CollectionEventList(props) {
     setTotal(_tempTotal);
     setTotalBasics(_tempTotal);
     setgroupOptions(_tempGroupOptions);
-    setTableHandleData(_tempArr);
+    !refreshFlag && setTableHandleData(_tempArr);
     setTableHandleDataBasics(_tempArr);
     setLoading(false);
+  }; // 刷新数据
+
+
+  var refreshHandle = function refreshHandle() {
+    queryList(true);
   };
 
-  var queryList = function queryList() {
+  var queryList = function queryList(refreshFlag) {
     request(apis.queryCollectionEventList, {
       method: 'post',
       params: {
@@ -128,7 +142,7 @@ var CollectionEventList = function CollectionEventList(props) {
       }
     }).then(function (res) {
       if (!res) throw new Error();
-      dataFinish(res.data);
+      dataFinish(res.data, refreshFlag);
     }).catch(function (err) {
       console.error('查询列表失败', err);
     }).finally(function () {});
@@ -200,64 +214,124 @@ var CollectionEventList = function CollectionEventList(props) {
 
   var markTypeFilter = function markTypeFilter(markActive) {
     filterHandlePublic(!markActive, 'mark_type');
-  }; // 处理各种筛选数据
+  };
 
+  var _useState17 = useState([]),
+      _useState18 = _slicedToArray(_useState17, 2),
+      filterTypeData = _useState18[0],
+      setfilterTypeData = _useState18[1];
 
-  var filterHandlePublic = function filterHandlePublic(filterFlag, type, value) {
-    if (filterFlag) {
-      // 取消筛选
-      setTotal(totalBasics);
-      setTableHandleData(tableHandleDataBasics);
-    } else {
-      // 执行筛选
-      var _tableHandleData = [];
-      var _total = 0,
-          totalFlag = false; // 判断不同type的筛选条件
+  useEffect(function () {
+    console.log('filterTypeData', filterTypeData); // 判断不同type的筛选条件
+
+    var _judgeFun = function _judgeFun(item, filterItem) {
+      switch (filterItem.type) {
+        case 'mark_type':
+          return item.mark_type == 1;
 
-      var _judgeFun = function _judgeFun(item) {
-        switch (type) {
-          case 'mark_type':
-            return item.mark_type == 1;
+        case 'event_name':
+          return item.event_name.indexOf(filterItem.value) != -1;
 
-          case 'event_name':
-            return item.event_name.indexOf(value) != -1;
+        case 'groupId':
+          return item._groupId == filterItem.value || item.groupId == filterItem.value;
 
-          case 'groupId':
-            return item._groupId == value || item.groupId == value;
+        case 'event_hidden':
+          return item.event_hidden == filterItem.value || item.groupId != undefined;
+
+        case 'is_stop':
+          return item.is_stop == filterItem.value || item.groupId != undefined;
+      }
+    }; // 多条件同时筛选
 
-          case 'event_hidden':
-            return item.event_hidden == value || item.groupId != undefined;
 
-          case 'is_stop':
-            return item.is_stop == value || item.groupId != undefined;
+    var _tableHandleData = [];
+    tableHandleDataBasics.map(function (item) {
+      var falg = true;
+      filterTypeData.map(function (filterItem) {
+        if (!_judgeFun(item, filterItem)) {
+          falg = false;
         }
-      };
+      });
+      falg && _tableHandleData.push(item);
+    });
+    var total = 0;
+
+    _tableHandleData.map(function (item) {
+      if (item._groupId != undefined) {
+        total++;
+      }
+    });
+
+    setTotal(total); // 过滤空组
 
-      tableHandleDataBasics.map(function (item) {
-        if (_judgeFun(item)) {
-          _tableHandleData.push(item);
+    var clearEmptyGroup = function clearEmptyGroup(data) {
+      var _data = _.cloneDeep(data);
 
-          if (type == 'mark_type' || type == 'event_hidden' || type == 'is_stop') {
-            totalFlag = true;
-            item.groupId == undefined ? _total++ : null;
+      _.remove(_data, function (item) {
+        var flag = false;
+        data.map(function (item2) {
+          if (item.groupId && item.groupId == item2._groupId) {
+            flag = true;
           }
-        }
-      }); // 不同type的total设置
+        }); // console.log(item, flag);
+
+        return item.groupId != undefined && !flag;
+      });
+
+      return _data;
+    };
+
+    setTableHandleData(clearEmptyGroup(_tableHandleData));
+  }, [filterTypeData, tableHandleDataBasics]); // 是否已包含筛选type
+
+  var filterHas = function filterHas(type) {
+    var flag = false;
+    filterTypeData.map(function (item) {
+      if (item.type == type) {
+        flag = true;
+      }
+    });
+    return flag;
+  }; // 处理各种筛选数据
 
-      setTotal(totalFlag ? _total : type == 'groupId' ? _tableHandleData.length - 1 : _tableHandleData.length);
-      setTableHandleData(_tableHandleData);
+
+  var filterHandlePublic = function filterHandlePublic(filterFlag, type, value) {
+    if (filterFlag) {
+      // 取消筛选
+      var data = _.cloneDeep(filterTypeData);
+
+      _.remove(data, function (x) {
+        return x.type == type;
+      });
+
+      setfilterTypeData(data);
+    } else {
+      if (!filterHas(type)) {
+        setfilterTypeData([].concat(_toConsumableArray(filterTypeData), [{
+          type: type,
+          value: value
+        }]));
+      } else {
+        setfilterTypeData(filterTypeData.map(function (item) {
+          if (item.type == type) {
+            item.value = value;
+          }
+
+          return item;
+        }));
+      }
     }
   };
 
-  var _useState17 = useState(false),
-      _useState18 = _slicedToArray(_useState17, 2),
-      eventAttrListShow = _useState18[0],
-      setEventAttrListShow = _useState18[1];
-
-  var _useState19 = useState(),
+  var _useState19 = useState(false),
       _useState20 = _slicedToArray(_useState19, 2),
-      eventAttrsData = _useState20[0],
-      setEventAttrsData = _useState20[1];
+      eventAttrListShow = _useState20[0],
+      setEventAttrListShow = _useState20[1];
+
+  var _useState21 = useState(),
+      _useState22 = _slicedToArray(_useState21, 2),
+      eventAttrsData = _useState22[0],
+      setEventAttrsData = _useState22[1];
 
   var eventAttrDataHandle = function eventAttrDataHandle(data) {
     setEventAttrsData(data);
@@ -301,7 +375,7 @@ var CollectionEventList = function CollectionEventList(props) {
   }, "\u521B\u5EFA\u4E8B\u4EF6\u5206\u7EC4")), /*#__PURE__*/React.createElement(TablePlus, {
     loading: loading,
     tableHandleData: tableHandleData,
-    Refresh: queryList,
+    Refresh: refreshHandle,
     eventActiveFilter: eventActiveFilter,
     markTypeFilter: markTypeFilter,
     isOpen: props.isOpen,
@@ -311,12 +385,14 @@ var CollectionEventList = function CollectionEventList(props) {
     isOpen: props.isOpen,
     queryPlanData: props.queryPlanData,
     eventAttrsData: eventAttrsData,
-    Refresh: queryList,
+    // Refresh={refreshHandle}
     source: "event",
     setEventAttrListShow: setEventAttrListShow
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u521B\u5EFA\u5206\u7EC4",
+    className: "creact-group",
     destroyOnClose: true,
+    getContainer: false,
     visible: eventNameShow,
     onOk: createEventGroup,
     onCancel: function onCancel() {

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

@@ -4,13 +4,25 @@
   width: calc(100% - 264px);
   height: 100%;
   margin-top: 16px;
+  margin-right: 24px;
+  margin-bottom: 24px;
   padding: 24px;
+  padding-top: 10px;
   background: #fff;
+  border-radius: 8px;
   .loading {
     position: fixed;
     top: 70%;
     left: 55%;
   }
+  .ant-tabs-tab + .ant-tabs-tab {
+    margin: 0 0 0 24px;
+  }
+  .creact-group {
+    .ant-modal-body {
+      padding: 3px 20px 20px 20px;
+    }
+  }
   .attr-list,
   .event-list {
     position: relative;
@@ -56,7 +68,9 @@
       .top-total {
         line-height: 32px;
         span {
+          margin: 0 4px;
           color: @primary-color;
+          font-weight: bold;
         }
       }
       .top-button {
@@ -158,6 +172,12 @@
             color: red;
           }
         }
+        .select-style {
+          .ant-select-selection-item {
+            color: #021429;
+            font-weight: 500;
+          }
+        }
         .event_attrs {
           .bsicon {
             margin-left: 12px;

package/es/modules/dataCollection/tablePlus.js

@@ -51,19 +51,19 @@ var TablePlus = function TablePlus(props) {
 
 
   var aliasNameBlur = function aliasNameBlur(e, record) {
-    if (aliasFocusData == e.currentTarget.value) return; // 失焦判断，内容无修改不请求接口
+    var value = e.currentTarget.value;
+    if (aliasFocusData == value) return; // 失焦判断，内容无修改不请求接口
 
     request(apis.updateEventInfo, {
       method: 'post',
       params: {
         app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        alias_name: e.currentTarget.value,
+        alias_name: value,
         event_id: record.event_id
       }
     }).then(function (res) {
       if (res) {
-        message.success('修改成功'); // console.log(state.updateEventMetas);
-
+        message.success('修改成功');
         props.Refresh();
         state.updateEventMetas && state.updateEventMetas(); // 更新store
       }
@@ -184,11 +184,11 @@ var TablePlus = function TablePlus(props) {
   }; // 修改：显示状态 | 采集状态 | 收藏&取消收藏
 
 
-  var eventHiddenChange = function eventHiddenChange(e, type, event_id) {
+  var eventHiddenChange = function eventHiddenChange(e, type, record) {
     var _temp;
 
     switch (type) {
-      case 'event_hidden':
+      case 'hidden':
         _temp = {
           hidden: e
         };
@@ -211,7 +211,7 @@ var TablePlus = function TablePlus(props) {
       method: 'post',
       params: _objectSpread({
         app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        event_id: event_id
+        event_id: record.event_id
       }, _temp)
     }).then(function (res) {
       message.success('修改成功');
@@ -391,7 +391,7 @@ var TablePlus = function TablePlus(props) {
         }), /*#__PURE__*/React.createElement(IconFont, {
           className: record.mark_type == 1 ? 'collect-icon-active' : 'collect-icon',
           onClick: function onClick() {
-            return eventHiddenChange(record.mark_type, 'mark_type', record.event_id);
+            return eventHiddenChange(record.mark_type, 'mark_type', record);
           },
           type: record.mark_type == 1 ? 'shoucang' : 'shoucang-kong'
         }), /*#__PURE__*/React.createElement(Popover, {
@@ -467,9 +467,7 @@ var TablePlus = function TablePlus(props) {
     title: /*#__PURE__*/React.createElement(Select, {
       defaultValue: -1,
       bordered: false,
-      style: {
-        width: 150
-      },
+      className: "select-style",
       suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
         type: "paixu"
       }),
@@ -499,7 +497,7 @@ var TablePlus = function TablePlus(props) {
         value: record.event_hidden,
         disabled: rowClassNameHandle(record) == 'error-row' || isDemo ? true : false,
         onChange: function onChange(e) {
-          return eventHiddenChange(e, 'event_hidden', record.event_id);
+          return eventHiddenChange(e, 'hidden', record);
         },
         options: [{
           value: 1,
@@ -514,9 +512,7 @@ var TablePlus = function TablePlus(props) {
     title: /*#__PURE__*/React.createElement(Select, {
       defaultValue: -1,
       bordered: false,
-      style: {
-        width: 150
-      },
+      className: "select-style",
       suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
         type: "paixu"
       }),
@@ -545,7 +541,7 @@ var TablePlus = function TablePlus(props) {
         },
         disabled: rowClassNameHandle(record) == 'error-row' || isDemo ? true : false,
         onChange: function onChange(e) {
-          return eventHiddenChange(e, 'is_stop', record.event_id);
+          return eventHiddenChange(e, 'is_stop', record);
         },
         options: [{
           value: 1,

package/es/modules/dataManage/index.js

@@ -11,11 +11,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { IconFont } from '@zgfe/business-lib';
-import { Menu } from 'antd';
+import { Tabs } from 'antd';
 import React, { useState, useEffect } from 'react';
-import './styles/index.less'; // import EventList from './eventList';
-// import UserAttributeList from './userAttributeList';
-
+import './styles/index.less';
 import { DmContext, upDatedDmFun } from '../../store';
 import { ActionType } from '../../store/action';
 import PlanList from '../dataPlan';
@@ -59,6 +57,16 @@ var DataManage = function DataManage(props) {
       type: "maidianfanganguanli"
     })
   }];
+
+  var _useState3 = useState('0'),
+      _useState4 = _slicedToArray(_useState3, 2),
+      listTab = _useState4[0],
+      setListTab = _useState4[1];
+
+  var tabsChange = function tabsChange(activeKey) {
+    setListTab(activeKey);
+  };
+
   return /*#__PURE__*/React.createElement(DmContext.Provider, {
     value: {
       state: state,
@@ -66,17 +74,26 @@ var DataManage = function DataManage(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-menu")
-  }, /*#__PURE__*/React.createElement(Menu, {
-    defaultSelectedKeys: ['0'],
-    onSelect: onSelect,
-    items: items
-  })), menuTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), menuTab == '1' && /*#__PURE__*/React.createElement(PlanList, null)));
+  }, /*#__PURE__*/React.createElement(Tabs, {
+    className: "tabs",
+    defaultActiveKey: "0",
+    tabPosition: "left",
+    onChange: tabsChange
+  }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
+    tab: /*#__PURE__*/React.createElement("div", {
+      className: "tab"
+    }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "maidianguanli"
+    }), "\u57CB\u70B9\u7BA1\u7406"),
+    key: "0"
+  }), /*#__PURE__*/React.createElement(Tabs.TabPane, {
+    tab: /*#__PURE__*/React.createElement("div", {
+      className: "tab"
+    }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "maidianfanganguanli"
+    }), "\u57CB\u70B9\u65B9\u6848\u7BA1\u7406"),
+    key: "1"
+  })), listTab == '0' && /*#__PURE__*/React.createElement(DataCollection, null), listTab == '1' && /*#__PURE__*/React.createElement(PlanList, null)));
 };
 
-export default DataManage; // export default forwardRef<{}, DataManageProps>((props, ref) => (
-//   <DmProvider>
-//     <DataManage {...props} />
-//   </DmProvider>
-// ));
+export default DataManage;

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

@@ -11,16 +11,37 @@
 }
 
 .data-manage {
+  position: relative;
   display: flex;
   height: 100%;
   background: #f5f5f5;
-  &-menu {
+  .tabs {
+    box-sizing: border-box;
     width: 240px;
     margin-right: 24px;
-    // height: 100%;
+    padding-top: 16px;
     background: #fff;
-    .ant-menu-item {
-      margin: 0;
+    .ant-tabs-nav {
+      width: 100%;
+      .ant-tabs-tab {
+        padding-left: 0;
+      }
+      .ant-tabs-tab-active {
+        background: #e8efff;
+      }
+      .ant-tabs-tab-btn {
+        width: 100%;
+        font-size: 16px;
+        text-align: left;
+        .bsicon {
+          margin-right: 15px;
+          margin-left: 19px;
+          font-size: 20px !important;
+        }
+      }
+    }
+    .ant-tabs-content-holder {
+      display: none;
     }
   }
 }

package/es/modules/dataPlan/addPlan.js

@@ -39,9 +39,8 @@ var AddPlan = function AddPlan(props) {
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
-      isDemo = _useContext.isDemo;
+      isDemo = _useContext.isDemo; // console.log('isDemo', isDemo);
 
-  console.log('isDemo', isDemo);
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),

package/es/modules/dataPlan/index.js

@@ -223,7 +223,7 @@ var PlanList = function PlanList(props) {
     type: "tianjia",
     style: {
       marginRight: '5px',
-      verticalAlign: '-2px'
+      verticalAlign: '-1px'
     }
   }), "\u65B0\u589E\u57CB\u70B9\u65B9\u6848")), /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),

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

@@ -4,8 +4,11 @@
   width: calc(100% - 264px);
   height: 100%;
   margin-top: 16px;
+  margin-right: 24px;
+  margin-bottom: 24px;
   padding: 24px;
   background: #fff;
+  border-radius: 8px;
   .clearfix:after {
     display: block;
     clear: both;
@@ -42,12 +45,16 @@
     // border-top: 1px solid #e8efff;
     .switch-div {
       float: left;
+      .ant-switch {
+        width: 24px;
+      }
       span {
         margin-right: 20px;
       }
     }
     .add {
       float: right;
+      line-height: 20px;
     }
   }
   &-table-see {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.20",
+  "version": "1.0.2-dm.21",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "license": "ISC",
@@ -53,7 +53,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "d0bf84e8a1b86247fd042fcca3c497f0e065e0a9",
+  "gitHead": "428e45251462fb8f5135e28630fa7e4fde4e20c8",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }