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

package/es/modules/dataCollection/collectionAttributeList.d.ts

@@ -15,6 +15,7 @@ interface PropsType {
     isOpen: number;
     queryPlanData: queryPlanType;
     setEventAttrListShow?: Function;
+    Refresh?: Function;
 }
 declare const CollectionAttributeList: React.FC<PropsType>;
 export default CollectionAttributeList;

package/es/modules/dataCollection/collectionAttributeList.js

@@ -22,6 +22,7 @@ import React, { useEffect, useState, useContext } from 'react';
 import './styles/index.less';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
+import { DmContext } from '../../store';
 
 var CollectionAttributeList = function CollectionAttributeList(props) {
   var classPrefix = 'attr-list';
@@ -38,7 +39,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
-      setLoading = _useState2[1]; // 判断是否在方案中： 处理表格class添加异常样式 | 处理表格行异常信息展示,true异常
+      setLoading = _useState2[1];
+
+  var _useContext2 = useContext(DmContext),
+      state = _useContext2.state; // 判断是否在方案中： 处理表格class添加异常样式 | 处理表格行异常信息展示, true异常
 
 
   var rowRenderHandle = function rowRenderHandle(name) {
@@ -47,13 +51,17 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
 
       return (queryPlanData === null || queryPlanData === void 0 ? void 0 : (_queryPlanData$unexpe = queryPlanData.unexpectedPropList) === null || _queryPlanData$unexpe === void 0 ? void 0 : _queryPlanData$unexpe.indexOf(name)) != -1 && isOpen == 1 ? true : false;
     } else {
-      var _temp2, _temp2$attrList;
-
-      var _temp = {};
-      queryPlanData.eventPlanAndRealDataDiff.map(function (item) {
-        if (item.eventName == (eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_name)) _temp = item;
-      });
-      return Object.keys(_temp).length <= 0 ? true : ((_temp2 = _temp) === null || _temp2 === void 0 ? void 0 : (_temp2$attrList = _temp2.attrList) === null || _temp2$attrList === void 0 ? void 0 : _temp2$attrList.indexOf(name)) == -1 && isOpen == 1 ? true : false;
+      if (isOpen != 1) {
+        return false;
+      } else {
+        var _temp2, _temp2$attrList;
+
+        var _temp = {};
+        queryPlanData.eventPlanAndRealDataDiff.map(function (item) {
+          if (item.eventName == (eventAttrsData === null || eventAttrsData === void 0 ? void 0 : eventAttrsData.event_name)) _temp = item;
+        });
+        return Object.keys(_temp).length <= 0 ? true : ((_temp2 = _temp) === null || _temp2 === void 0 ? void 0 : (_temp2$attrList = _temp2.attrList) === null || _temp2$attrList === void 0 ? void 0 : _temp2$attrList.indexOf(name)) == -1 ? true : false;
+      }
     }
   }; // 用户属性列表
 
@@ -85,6 +93,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   };
 
   useEffect(function () {
+    // console.log('eventAttrsData', eventAttrsData);
     if (source == 'user') {
       queryUserPropMeta();
     } else {
@@ -97,17 +106,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       setUserAttrData(_temp);
       setLoading(false);
     }
-  }, [source]); // 方案名称
-
-  var _useState5 = useState(''),
-      _useState6 = _slicedToArray(_useState5, 2),
-      planName = _useState6[0],
-      setPlanName = _useState6[1];
-
-  var PlanNameChange = function PlanNameChange(e) {
-    setPlanName(e.currentTarget.value);
-  }; // 复制属性名称
-
+  }, [source, eventAttrsData]); // 复制属性名称
 
   var copyAttrName = function copyAttrName(name) {
     navigator.clipboard.writeText(name);
@@ -115,10 +114,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   }; // 别名foucs
 
 
-  var _useState7 = useState(''),
-      _useState8 = _slicedToArray(_useState7, 2),
-      aliasFocusData = _useState8[0],
-      setAliasFocusData = _useState8[1];
+  var _useState5 = useState(''),
+      _useState6 = _slicedToArray(_useState5, 2),
+      aliasFocusData = _useState6[0],
+      setAliasFocusData = _useState6[1];
 
   var aliasFocus = function aliasFocus(e) {
     setAliasFocusData(e.currentTarget.value);
@@ -139,9 +138,15 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }).then(function (res) {
       if (res) {
         message.success('修改成功');
+
+        if (source == 'user') {
+          queryUserPropMeta();
+        }
+
+        state.updateEventMetas && state.updateEventMetas(); // 更新store
       }
     }).catch(function (err) {
-      message.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 表格列
 
@@ -177,15 +182,38 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     dataIndex: 'alias_name',
     width: 180,
     render: function render(text, record, index) {
-      return /*#__PURE__*/React.createElement(Input, {
-        className: "alias_name",
-        placeholder: "\u7F16\u8F91\u522B\u540D",
-        defaultValue: record.alias_name,
-        onFocus: aliasFocus,
-        onBlur: function onBlur(e) {
-          attrChangeHandle(e.currentTarget.value, record, 'alias_name');
-        }
-      });
+      if (!record.alias_name) {
+        return /*#__PURE__*/React.createElement(Input, {
+          className: "alias_name",
+          placeholder: "\u7F16\u8F91\u522B\u540D",
+          disabled: isDemo,
+          defaultValue: record.alias_name,
+          onFocus: aliasFocus,
+          onBlur: function onBlur(e) {
+            attrChangeHandle(e.currentTarget.value, record, 'alias_name');
+          }
+        });
+      } else {
+        return /*#__PURE__*/React.createElement(Popover, {
+          content: /*#__PURE__*/React.createElement("div", {
+            style: {
+              width: '200px',
+              wordBreak: 'break-all'
+            }
+          }, record.alias_name),
+          trigger: "hover",
+          placement: "top"
+        }, /*#__PURE__*/React.createElement(Input, {
+          className: "alias_name",
+          placeholder: "\u7F16\u8F91\u522B\u540D",
+          disabled: isDemo,
+          defaultValue: record.alias_name,
+          onFocus: aliasFocus,
+          onBlur: function onBlur(e) {
+            attrChangeHandle(e.currentTarget.value, record, 'alias_name');
+          }
+        }));
+      }
     }
   }, {
     title: '属性值别名',
@@ -195,6 +223,11 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, !rowRenderHandle(record.name) && /*#__PURE__*/React.createElement("span", {
         className: "attr_alias_name",
         onClick: function onClick() {
+          if (isDemo) {
+            message.error('demo环境，无法编辑');
+            return;
+          }
+
           setattrId(source == 'event' ? record.attr_id : record.id);
           setAttrAliasNameShow(true);
         }
@@ -215,6 +248,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           width: '100%'
         },
+        disabled: isDemo,
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'type');
         },
@@ -240,6 +274,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           width: '100%'
         },
+        disabled: isDemo,
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'hidden');
         },
@@ -267,6 +302,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           width: '100%'
         },
+        disabled: isDemo,
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'encryption_type');
         },
@@ -292,25 +328,25 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     dataIndex: 'mapping_value'
   }];
 
-  var _useState9 = useState([]),
+  var _useState7 = useState([]),
+      _useState8 = _slicedToArray(_useState7, 2),
+      attrExcelData = _useState8[0],
+      setAttrExcelData = _useState8[1];
+
+  var _useState9 = useState(false),
       _useState10 = _slicedToArray(_useState9, 2),
-      attrExcelData = _useState10[0],
-      setAttrExcelData = _useState10[1];
+      attrAliasNameShow = _useState10[0],
+      setAttrAliasNameShow = _useState10[1];
 
-  var _useState11 = useState(false),
+  var _useState11 = useState(0),
       _useState12 = _slicedToArray(_useState11, 2),
-      attrAliasNameShow = _useState12[0],
-      setAttrAliasNameShow = _useState12[1];
+      attrId = _useState12[0],
+      setattrId = _useState12[1];
 
   var _useState13 = useState(0),
       _useState14 = _slicedToArray(_useState13, 2),
-      attrId = _useState14[0],
-      setattrId = _useState14[1];
-
-  var _useState15 = useState(0),
-      _useState16 = _slicedToArray(_useState15, 2),
-      batchId = _useState16[0],
-      setBatchId = _useState16[1];
+      batchId = _useState14[0],
+      setBatchId = _useState14[1];
 
   var uploadProps = {
     maxCount: 1,
@@ -333,15 +369,16 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           setAttrExcelData(res.values);
         }
       }).catch(function (err) {
-        message.success('上传失败');
+        message.error('上传失败');
       });
+      return false;
     }
   }; // 清空属性值别名excel数据
 
-  var _useState17 = useState(false),
-      _useState18 = _slicedToArray(_useState17, 2),
-      clearFlag = _useState18[0],
-      setClearFlag = _useState18[1];
+  var _useState15 = useState(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      clearFlag = _useState16[0],
+      setClearFlag = _useState16[1];
 
   var clearData = function clearData() {
     setAttrExcelData([]);
@@ -366,7 +403,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         setAttrAliasNameShow(false);
       }
     }).catch(function (err) {
-      message.success('操作失败');
+      message.error('操作失败');
     });
   }; // 获取已设置的属性值别名列表
 
@@ -412,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",
@@ -450,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) {
@@ -24,7 +33,8 @@ var CollectionEventList = function CollectionEventList(props) {
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
-      isDemo = _useContext.isDemo;
+      isDemo = _useContext.isDemo; // const { updateEventMetas } = props;
+
 
   var _useState = useState(0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -69,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,
@@ -112,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: {
@@ -127,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 () {});
@@ -174,8 +189,10 @@ var CollectionEventList = function CollectionEventList(props) {
         queryList();
       }
     }).catch(function (err) {
-      message.success('创建失败');
-    }).finally(function () {});
+      message.error('创建失败');
+    }).finally(function () {
+      setEventNameInput('');
+    });
   }; // 筛选：显示状态 | 采集状态
 
 
@@ -197,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;
+
+        case 'event_name':
+          return item.event_name.indexOf(filterItem.value) != -1;
 
-      var _judgeFun = function _judgeFun(item) {
-        switch (type) {
-          case 'mark_type':
-            return item.mark_type == 1;
+        case 'groupId':
+          return item._groupId == filterItem.value || item.groupId == filterItem.value;
 
-          case 'event_name':
-            return item.event_name.indexOf(value) != -1;
+        case 'event_hidden':
+          return item.event_hidden == filterItem.value || item.groupId != undefined;
 
-          case 'groupId':
-            return item._groupId == value || item.groupId == value;
+        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++;
+      }
+    });
 
-      tableHandleDataBasics.map(function (item) {
-        if (_judgeFun(item)) {
-          _tableHandleData.push(item);
+    setTotal(total); // 过滤空组
 
-          if (type == 'mark_type' || type == 'event_hidden' || type == 'is_stop') {
-            totalFlag = true;
-            item.groupId == undefined ? _total++ : null;
+    var clearEmptyGroup = function clearEmptyGroup(data) {
+      var _data = _.cloneDeep(data);
+
+      _.remove(_data, function (item) {
+        var flag = false;
+        data.map(function (item2) {
+          if (item.groupId && item.groupId == item2._groupId) {
+            flag = true;
+          }
+        }); // 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;
+  }; // 处理各种筛选数据
+
+
+  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;
           }
-        }
-      }); // 不同type的total设置
 
-      setTotal(totalFlag ? _total : type == 'groupId' ? _tableHandleData.length - 1 : _tableHandleData.length);
-      setTableHandleData(_tableHandleData);
+          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);
@@ -285,6 +362,7 @@ var CollectionEventList = function CollectionEventList(props) {
     className: "top-button",
     type: "primary",
     shape: "round",
+    disabled: isDemo,
     icon: /*#__PURE__*/React.createElement(IconFont, {
       style: {
         marginRight: '5px'
@@ -297,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,
@@ -307,17 +385,23 @@ var CollectionEventList = function CollectionEventList(props) {
     isOpen: props.isOpen,
     queryPlanData: props.queryPlanData,
     eventAttrsData: eventAttrsData,
+    // 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() {
-      return setEventNameShow(false);
+      setEventNameShow(false);
+      setEventNameInput('');
     }
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5206\u7EC4\u540D",
+    value: eventNameInput,
     onChange: function onChange(e) {
       return setEventNameInput(e.currentTarget.value);
     }

package/es/modules/dataCollection/index.d.ts

@@ -1,3 +1,5 @@
 import React from 'react';
-declare const DataCollection: React.FC;
+interface DataCollectionProps {
+}
+declare const DataCollection: React.FC<DataCollectionProps>;
 export default DataCollection;

package/es/modules/dataCollection/index.js

@@ -23,7 +23,8 @@ var DataCollection = function DataCollection(props) {
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
-      isDemo = _useContext.isDemo;
+      isDemo = _useContext.isDemo; // const { updateEventMetas } = props;
+
 
   var _useState = useState(1),
       _useState2 = _slicedToArray(_useState, 2),