@zgfe/modules-dm 1.0.2-dm.13 → 1.0.2-dm.15

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

@@ -89,6 +89,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
   };
 
   useEffect(function () {
+    // console.log('eventAttrsData', eventAttrsData);
     if (source == 'user') {
       queryUserPropMeta();
     } else {
@@ -101,7 +102,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       setUserAttrData(_temp);
       setLoading(false);
     }
-  }, [source]); // 复制属性名称
+  }, [source, eventAttrsData]); // 复制属性名称
 
   var copyAttrName = function copyAttrName(name) {
     navigator.clipboard.writeText(name);
@@ -133,6 +134,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     }).then(function (res) {
       if (res) {
         message.success('修改成功');
+
+        if (source == 'user') {
+          queryUserPropMeta();
+        }
       }
     }).catch(function (err) {
       message.error('修改失败');
@@ -171,15 +176,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

@@ -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' : '';
     }
   }; // 控制修改分组名弹框 显示隐藏
 
@@ -288,12 +288,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 +412,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 +494,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,7 +158,6 @@ var AddPlan = function AddPlan(props) {
     maxCount: 1,
     showUploadList: false,
     beforeUpload: function beforeUpload(file) {
-      console.log(file);
       setSpinning(true);
       var fileType = file.name.split('.');
 
@@ -183,8 +181,6 @@ var AddPlan = function AddPlan(props) {
         method: 'post',
         data: data
       }).then(function (res) {
-        console.log('111', res);
-
         if (res == null) {
           // 接口处理表格异常处理
           message.error('上传失败');
@@ -443,8 +439,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,

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.13",
+  "version": "1.0.2-dm.15",
   "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-dmd.1",
+    "@zgfe/business-lib": "1.1.7-dmd.3",
     "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": "b4efbb96a7ecbd8cde65847c9fffddb6ea488560",
+  "gitHead": "902963ef4406214d81eac7e4529a96b7806797c7",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }