@zgfe/modules-dm 1.0.2-dm.14 → 1.0.2-dm.16

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) {
@@ -89,6 +93,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   };
 
   useEffect(function () {
+    // console.log('eventAttrsData', eventAttrsData);
     if (source == 'user') {
       queryUserPropMeta();
     } else {
@@ -101,7 +106,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       setUserAttrData(_temp);
       setLoading(false);
     }
-  }, [source]); // 复制属性名称
+  }, [source, eventAttrsData]); // 复制属性名称
 
   var copyAttrName = function copyAttrName(name) {
     navigator.clipboard.writeText(name);
@@ -133,6 +138,12 @@ 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.error('修改失败');
@@ -171,15 +182,36 @@ 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",
+          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",
+          defaultValue: record.alias_name,
+          onFocus: aliasFocus,
+          onBlur: function onBlur(e) {
+            attrChangeHandle(e.currentTarget.value, record, 'alias_name');
+          }
+        }));
+      }
     }
   }, {
     title: '属性值别名',

package/es/modules/dataCollection/collectionEventList.js

@@ -310,6 +310,7 @@ var CollectionEventList = function CollectionEventList(props) {
     isOpen: props.isOpen,
     queryPlanData: props.queryPlanData,
     eventAttrsData: eventAttrsData,
+    Refresh: queryList,
     source: "event",
     setEventAttrListShow: setEventAttrListShow
   }), /*#__PURE__*/React.createElement(Modal, {

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

@@ -89,6 +89,7 @@
         .alias_name {
           background: #fff !important;
           border: none;
+          cursor: pointer;
         }
         .ant-input:focus,
         .ant-input-focused {
@@ -168,6 +169,7 @@
         }
         .event_name {
           display: flex;
+          cursor: pointer;
           .event_name-text {
             display: -webkit-box;
             width: 120px;
@@ -179,7 +181,6 @@
             display: none;
             margin-left: 10px;
             font-size: 16px !important;
-            cursor: pointer;
           }
           .copy-text:hover {
             color: @primary-color;
@@ -188,7 +189,6 @@
           .collect-icon-active {
             margin: 0 4px;
             font-size: 16px !important;
-            cursor: pointer;
           }
           .collect-icon {
             color: #999;

package/es/modules/dataCollection/tablePlus.js

@@ -62,10 +62,10 @@ var TablePlus = function TablePlus(props) {
       }
     }).then(function (res) {
       if (res) {
-        message.success('修改成功'); // props.Refresh();
+        message.success('修改成功'); // console.log(state.updateEventMetas);
 
-        console.log(state.updateEventMetas);
-        state.updateEventMetas ? state.updateEventMetas() : props.Refresh(); // 更新store
+        props.Refresh();
+        state.updateEventMetas && state.updateEventMetas(); // 更新store
       }
     }).catch(function (err) {
       message.error('修改失败');
@@ -81,7 +81,7 @@ var TablePlus = function TablePlus(props) {
     } else {
       var _queryPlanData$unexpe;
 
-      return (queryPlanData === null || queryPlanData === void 0 ? void 0 : (_queryPlanData$unexpe = queryPlanData.unexpectedEventList) === null || _queryPlanData$unexpe === void 0 ? void 0 : _queryPlanData$unexpe.indexOf(record.event_name)) != -1 && isOpen == 1 ? 'error-row' : '';
+      return (queryPlanData === null || queryPlanData === void 0 ? void 0 : (_queryPlanData$unexpe = queryPlanData.unexpectedEventList) === null || _queryPlanData$unexpe === void 0 ? void 0 : _queryPlanData$unexpe.indexOf(record.event_name)) != -1 && isOpen == 1 && record.owner != 'zg_abp' ? 'error-row' : '';
     }
   }; // 控制修改分组名弹框 显示隐藏
 
@@ -215,7 +215,8 @@ var TablePlus = function TablePlus(props) {
       }, _temp)
     }).then(function (res) {
       message.success('修改成功');
-      state.updateEventMetas ? state.updateEventMetas() : props.Refresh(); // 更新store
+      props.Refresh();
+      state.updateEventMetas && state.updateEventMetas(); // 更新store
     }).catch(function (err) {
       message.error('修改失败');
     }).finally(function () {});
@@ -288,12 +289,14 @@ var TablePlus = function TablePlus(props) {
         eventIds: groupCheckedData[data.groupId].join(',')
       }, _temp)
     }).then(function (res) {
-      message.success('成功');
+      if (res.code == '00') {
+        message.success('成功');
 
-      var _groupCheckedData = _.cloneDeep(groupCheckedData);
+        var _groupCheckedData = _.cloneDeep(groupCheckedData);
 
-      delete _groupCheckedData[eventGroupId];
-      setGroupCheckedData({});
+        delete _groupCheckedData[eventGroupId];
+        setGroupCheckedData({});
+      }
     }).catch(function (err) {
       message.error('失败');
     }).finally(function () {
@@ -410,24 +413,36 @@ var TablePlus = function TablePlus(props) {
     key: 'alias_name',
     width: 167,
     render: function render(text, record, index) {
-      return /*#__PURE__*/React.createElement(Popover, {
-        content: /*#__PURE__*/React.createElement("div", {
-          style: {
-            width: '200px',
-            wordBreak: 'break-all'
+      if (!record.alias_name) {
+        return /*#__PURE__*/React.createElement(Input, {
+          className: "alias_name",
+          placeholder: "\u7F16\u8F91\u522B\u540D",
+          defaultValue: record.alias_name,
+          onFocus: aliasFocus,
+          onBlur: function onBlur(e) {
+            aliasNameBlur(e, record);
           }
-        }, record.alias_name),
-        trigger: "hover",
-        placement: "top"
-      }, /*#__PURE__*/React.createElement(Input, {
-        className: "alias_name",
-        placeholder: "\u7F16\u8F91\u522B\u540D",
-        defaultValue: record.alias_name,
-        onFocus: aliasFocus,
-        onBlur: function onBlur(e) {
-          aliasNameBlur(e, record);
-        }
-      }));
+        });
+      } 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",
+          defaultValue: record.alias_name,
+          onFocus: aliasFocus,
+          onBlur: function onBlur(e) {
+            aliasNameBlur(e, record);
+          }
+        }));
+      }
     }
   }, {
     title: '首次上报时间',
@@ -480,6 +495,7 @@ var TablePlus = function TablePlus(props) {
         style: {
           width: 150
         },
+        value: record.event_hidden,
         disabled: rowClassNameHandle(record) == 'error-row' ? true : false,
         onChange: function onChange(e) {
           return eventHiddenChange(e, 'event_hidden', record.event_id);

package/es/modules/dataPlan/addPlan.js

@@ -105,7 +105,6 @@ var AddPlan = function AddPlan(props) {
 
 
     if (listTab == '1') {
-      console.log('导出全部：', "".concat(apis.downloadPlanEvent, "?appId=").concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, "&planId=").concat(props.detailId, "&eventName").concat(e == '0' ? '' : '=' + _selectedRowKeys));
       window.open("".concat(apis.downloadPlanEvent, "?appId=").concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, "&planId=").concat(props.detailId, "&eventName").concat(e == '0' ? '' : '=' + _selectedRowKeys));
     } else {
       window.open("".concat(apis.downloadPlanProp, "?appId=").concat(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, "&planId=").concat(props.detailId, "&propName").concat(e == '0' ? '' : '=' + _selectedRowKeys));
@@ -159,17 +158,18 @@ var AddPlan = function AddPlan(props) {
     maxCount: 1,
     showUploadList: false,
     beforeUpload: function beforeUpload(file) {
-      console.log(file);
       setSpinning(true);
       var fileType = file.name.split('.');
 
       if (fileType[fileType.length - 1] != 'xlsx' && fileType[fileType.length - 1] != 'xsl') {
         message.error('仅支持excel(xsl、xlsx)格式文件，请检查后重新上传');
+        setSpinning(false);
         return;
       }
 
       if (file.size > 5 * 1024 * 1024) {
         message.error('文件大小支持5M以内，请检查后重新上传');
+        setSpinning(false);
         return;
       }
 
@@ -183,17 +183,17 @@ var AddPlan = function AddPlan(props) {
         method: 'post',
         data: data
       }).then(function (res) {
-        console.log('111', res);
-
         if (res == null) {
           // 接口处理表格异常处理
           message.error('上传失败');
+          setSpinning(false);
           return;
         }
 
         if (Object.keys(res.data).length <= 0) {
           // 破损表格，异常处理
           message.error('上传失败');
+          setSpinning(false);
           return;
         }
 
@@ -403,7 +403,24 @@ var AddPlan = function AddPlan(props) {
     } else {
       setSaveDisabled(false);
     }
-  }, [eventListData]); // 保存方案
+  }, [eventListData]);
+
+  var _useState25 = useState(0),
+      _useState26 = _slicedToArray(_useState25, 2),
+      eventCount = _useState26[0],
+      setEventCount = _useState26[1];
+
+  useEffect(function () {
+    var _eventCount = 0;
+    eventListDataCopy.map(function (_item, index) {
+      for (var key in _item) {
+        _item[key].map(function (item) {
+          _eventCount++;
+        });
+      }
+    });
+    setEventCount(_eventCount);
+  }, [eventListDataCopy]); // 保存方案
 
   var savePlanData = function savePlanData() {
     if (planName == '') {
@@ -443,8 +460,13 @@ var AddPlan = function AddPlan(props) {
         _loop2(key);
       }
     });
+    var _tempUserAttrFilter = [];
     userAttrDataCopy.map(function (item) {
-      userPropPlanList.push(item);
+      if (_tempUserAttrFilter.indexOf(item.propName) == -1) {
+        _tempUserAttrFilter.push(item.propName);
+
+        userPropPlanList.push(item);
+      }
     });
     var ManagementPlan = {
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
@@ -453,14 +475,6 @@ var AddPlan = function AddPlan(props) {
       eventPlanList: eventPlanList,
       userPropPlanList: userPropPlanList
     };
-    var eventCount = 0;
-    eventListDataCopy.map(function (_item, index) {
-      for (var key in _item) {
-        _item[key].map(function (item) {
-          eventCount++;
-        });
-      }
-    });
 
     if (eventCount > 500) {
       message.error('每个方案最多保存500条数据，请修改后重新保存');
@@ -481,10 +495,10 @@ var AddPlan = function AddPlan(props) {
   }; // 存储选中的keys
 
 
-  var _useState25 = useState([]),
-      _useState26 = _slicedToArray(_useState25, 2),
-      selectedRowKeys = _useState26[0],
-      setSelectedRowKeys = _useState26[1];
+  var _useState27 = useState([]),
+      _useState28 = _slicedToArray(_useState27, 2),
+      selectedRowKeys = _useState28[0],
+      setSelectedRowKeys = _useState28[1];
 
   var tableCheck = function tableCheck(e, record) {
     // console.log(e.target.checked, record.key);
@@ -497,8 +511,13 @@ var AddPlan = function AddPlan(props) {
   }; // 选中当前页面全部数据
 
 
-  var allCheck = function allCheck(e) {
-    if (e.target.checked) {
+  var _useState29 = useState(false),
+      _useState30 = _slicedToArray(_useState29, 2),
+      tableAllchecked = _useState30[0],
+      setTableAllchecked = _useState30[1];
+
+  useEffect(function () {
+    if (tableAllchecked) {
       var _tempData = [];
 
       if (listTab == '1') {
@@ -523,11 +542,29 @@ var AddPlan = function AddPlan(props) {
     } else {
       setSelectedRowKeys([]);
     }
-  }; // useEffect(() => {
-  //   console.log('最近selectedRowKeys', selectedRowKeys);
-  // }, [selectedRowKeys]);
-  // 批量删除
+  }, [tableAllchecked]);
 
+  var allCheck = function allCheck(e) {
+    setTableAllchecked(e.target.checked);
+  };
+
+  var _useState31 = useState(''),
+      _useState32 = _slicedToArray(_useState31, 2),
+      allCheckedClassName = _useState32[0],
+      setAllCheckedClassName = _useState32[1];
+
+  useEffect(function () {
+    if (selectedRowKeys.length == eventCount && eventCount != 0) {
+      setAllCheckedClassName('ant-checkbox-checked');
+      setTableAllchecked(true);
+    } else if (selectedRowKeys.length <= 0) {
+      setAllCheckedClassName('');
+      setTableAllchecked(false);
+    } else {
+      setAllCheckedClassName('ant-checkbox-indeterminate');
+    } // console.log('最近selectedRowKeys', selectedRowKeys, eventCount);
+
+  }, [selectedRowKeys]); // 批量删除
 
   var deteleDataHandle = function deteleDataHandle(data) {
     var _tempData = [];
@@ -587,16 +624,16 @@ var AddPlan = function AddPlan(props) {
   }; // 是否有编辑操作
 
 
-  var _useState27 = useState(false),
-      _useState28 = _slicedToArray(_useState27, 2),
-      editOperate = _useState28[0],
-      setEditOperate = _useState28[1]; // 保存时，方案名称若为空，Input显示校验提示
+  var _useState33 = useState(false),
+      _useState34 = _slicedToArray(_useState33, 2),
+      editOperate = _useState34[0],
+      setEditOperate = _useState34[1]; // 保存时，方案名称若为空，Input显示校验提示
 
 
-  var _useState29 = useState(''),
-      _useState30 = _slicedToArray(_useState29, 2),
-      planNameInputStatus = _useState30[0],
-      setplanNameInputStatus = _useState30[1]; // 检索条数
+  var _useState35 = useState(''),
+      _useState36 = _slicedToArray(_useState35, 2),
+      planNameInputStatus = _useState36[0],
+      setplanNameInputStatus = _useState36[1]; // 检索条数
 
 
   useEffect(function () {
@@ -615,10 +652,10 @@ var AddPlan = function AddPlan(props) {
     }
   }, [listTab, eventListData, userAttrData]);
 
-  var _useState31 = useState('导出'),
-      _useState32 = _slicedToArray(_useState31, 2),
-      exportValue = _useState32[0],
-      setExportValue = _useState32[1];
+  var _useState37 = useState('导出'),
+      _useState38 = _slicedToArray(_useState37, 2),
+      exportValue = _useState38[0],
+      setExportValue = _useState38[1];
 
   return /*#__PURE__*/React.createElement(Drawer, {
     width: '70%',
@@ -701,6 +738,8 @@ var AddPlan = function AddPlan(props) {
   }), 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'
     },

package/es/modules/dataPlan/userAttributeList.js

@@ -1,31 +1,11 @@
-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."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 import { Select, Table, Checkbox } from 'antd';
 var Option = Select.Option;
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import './styles/index.less';
 
 var UserAttributeList = function UserAttributeList(props) {
   var classPrefix = 'user-list'; // console.log('userAttrData', props.userAttrData);
-
-  var _useState = useState([]),
-      _useState2 = _slicedToArray(_useState, 2),
-      renderData = _useState2[0],
-      setRenderData = _useState2[1];
-
-  useEffect(function () {
-    setRenderData(props.userAttrData);
-  }, [props.userAttrData]); // 表格列
+  // 表格列
 
   var columns = [{
     title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Checkbox, {
@@ -68,7 +48,7 @@ var UserAttributeList = function UserAttributeList(props) {
   }, /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),
     columns: columns,
-    dataSource: renderData,
+    dataSource: props.userAttrData,
     bordered: true,
     pagination: false
   }));

package/es/store/index.js

@@ -15,8 +15,7 @@ import { initState } from './state';
 import { ActionType } from './action';
 
 var DmReducer = function DmReducer(prevState, action) {
-  console.log('DmReducer', prevState, action);
-
+  // console.log('DmReducer', prevState, action);
   switch (action.type) {
     case ActionType.SET_GLOBAL:
       return {

package/es/store/state.js

@@ -1,6 +1,4 @@
 export var initState = {
   // 更新主应用回调
-  updateEventMetas: function updateEventMetas() {
-    console.log('1更新主应用回调');
-  }
+  updateEventMetas: function updateEventMetas() {}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.14",
+  "version": "1.0.2-dm.16",
   "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": "92b2df999c88d9b40535ec116e0fec60affe197c",
+  "gitHead": "0fa9c6f10383ff544fb92fceec9980654b514d07",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }