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

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 {
@@ -81,9 +95,15 @@
             display: inline-block !important;
           }
         }
+        .alias_name_popover {
+          width: 200px;
+          word-break: break-all;
+          background: red;
+        }
         .alias_name {
           background: #fff !important;
           border: none;
+          cursor: pointer;
         }
         .ant-input:focus,
         .ant-input-focused {
@@ -94,6 +114,16 @@
         }
         .group-row {
           border-top: 12px solid #f5f5f5;
+          .ant-table-cell-fix-left {
+            left: 0px;
+            display: block;
+            width: 500px;
+            background: #fff;
+          }
+          .ant-table-cell-fix-left-first::after,
+          .ant-table-cell-fix-left-last::after {
+            box-shadow: none;
+          }
           td {
             padding: 6px 16px;
           }
@@ -106,7 +136,7 @@
         }
         .group-box {
           display: flex;
-          width: 500px;
+          width: 800px;
           line-height: 30px;
           .ant-input {
             width: 150px;
@@ -116,13 +146,13 @@
             margin-right: 4px;
             font-size: 18px !important;
           }
-          .group-text {
-            display: -webkit-box;
-            width: 120px;
-            overflow: hidden;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 1;
-          }
+          // .group-text {
+          //   display: -webkit-box;
+          //   width: 120px;
+          //   overflow: hidden;
+          //   -webkit-box-orient: vertical;
+          //   -webkit-line-clamp: 1;
+          // }
           .group-handle {
             margin-left: 30px;
             cursor: pointer;
@@ -142,6 +172,12 @@
             color: red;
           }
         }
+        .select-style {
+          .ant-select-selection-item {
+            color: #021429;
+            font-weight: 500;
+          }
+        }
         .event_attrs {
           .bsicon {
             margin-left: 12px;
@@ -153,6 +189,7 @@
         }
         .event_name {
           display: flex;
+          cursor: pointer;
           .event_name-text {
             display: -webkit-box;
             width: 120px;
@@ -164,7 +201,6 @@
             display: none;
             margin-left: 10px;
             font-size: 16px !important;
-            cursor: pointer;
           }
           .copy-text:hover {
             color: @primary-color;
@@ -173,7 +209,6 @@
           .collect-icon-active {
             margin: 0 4px;
             font-size: 16px !important;
-            cursor: pointer;
           }
           .collect-icon {
             color: #999;
@@ -204,6 +239,9 @@
           cursor: pointer;
           user-select: none;
         }
+        .set-error {
+          color: #86909c;
+        }
       }
     }
   }

package/es/modules/dataCollection/tablePlus.js

@@ -24,6 +24,7 @@ var Option = Select.Option;
 import React, { useState, useContext } from 'react';
 import './styles/index.less';
 import _ from 'lodash';
+import { DmContext } from '../../store';
 
 var TablePlus = function TablePlus(props) {
   var classPrefix = 'table-plus';
@@ -33,7 +34,10 @@ var TablePlus = function TablePlus(props) {
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
-      isDemo = _useContext.isDemo; // 别名foucs
+      isDemo = _useContext.isDemo;
+
+  var _useContext2 = useContext(DmContext),
+      state = _useContext2.state; // 别名foucs
 
 
   var _useState = useState(''),
@@ -47,22 +51,27 @@ 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('修改成功');
+        props.Refresh();
+        state.updateEventMetas && state.updateEventMetas(); // 更新store
       }
     }).catch(function (err) {
-      message.success('修改失败');
-    }).finally(function () {});
+      message.error('修改失败');
+    }).finally(function () {
+      setAliasFocusData('');
+    });
   }; // 表格class处理
 
 
@@ -72,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' : '';
     }
   }; // 控制修改分组名弹框 显示隐藏
 
@@ -110,7 +119,7 @@ var TablePlus = function TablePlus(props) {
         props.Refresh();
       }
     }).catch(function (err) {
-      message.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 删除分组
 
@@ -140,7 +149,7 @@ var TablePlus = function TablePlus(props) {
             props.Refresh();
           }
         }).catch(function (err) {
-          message.success('删除失败');
+          message.error('删除失败');
         }).finally(function () {});
       }
     });
@@ -168,18 +177,18 @@ var TablePlus = function TablePlus(props) {
             props.Refresh();
           }
         }).catch(function (err) {
-          message.success('删除失败');
+          message.error('删除失败');
         }).finally(function () {});
       }
     });
   }; // 修改：显示状态 | 采集状态 | 收藏&取消收藏
 
 
-  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
         };
@@ -202,15 +211,14 @@ 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) {
-      if (res) {
-        message.success('修改成功');
-        props.Refresh();
-      }
+      message.success('修改成功');
+      props.Refresh();
+      state.updateEventMetas && state.updateEventMetas(); // 更新store
     }).catch(function (err) {
-      message.success('修改失败');
+      message.error('修改失败');
     }).finally(function () {});
   }; // 复制事件名称
 
@@ -269,24 +277,28 @@ var TablePlus = function TablePlus(props) {
     if (eventGroupId != undefined) _temp = {
       eventGroupId: eventGroupId
     };
+    if (type != 'copy') _temp = _objectSpread(_objectSpread({}, _temp), {}, {
+      oldEventGroupId: data.groupId
+    });
     request(apis.operateGroupRelations, {
       method: 'post',
       data: _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 0,
         hasPublicAttrView: true,
-        eventIds: groupCheckedData[data.groupId].join(','),
-        oldEventGroupId: data.groupId
+        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.success('失败');
+      message.error('失败');
     }).finally(function () {
       props.Refresh();
     });
@@ -379,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, {
@@ -401,15 +413,37 @@ var TablePlus = function TablePlus(props) {
     key: 'alias_name',
     width: 167,
     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) {
-          aliasNameBlur(e, record);
-        }
-      });
+      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);
+          }
+        });
+      } 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) {
+            aliasNameBlur(e, record);
+          }
+        }));
+      }
     }
   }, {
     title: '首次上报时间',
@@ -433,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"
       }),
@@ -462,9 +494,10 @@ var TablePlus = function TablePlus(props) {
         style: {
           width: 150
         },
-        disabled: rowClassNameHandle(record) == 'error-row' ? true : false,
+        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,
@@ -479,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"
       }),
@@ -508,9 +539,9 @@ var TablePlus = function TablePlus(props) {
         style: {
           width: 150
         },
-        disabled: rowClassNameHandle(record) == 'error-row' ? true : false,
+        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,
@@ -549,24 +580,40 @@ var TablePlus = function TablePlus(props) {
           className: "edit-del"
         }, /*#__PURE__*/React.createElement(IconFont, {
           onClick: function onClick() {
+            if (isDemo) {
+              message.error('demo环境无法修改');
+              return;
+            }
+
             setEventNameData({
               groupName: record.groupName,
               groupId: record.groupId
             });
+            setEventNameInput(record.groupName);
             setEventNameShow(true);
           },
           type: "bianji"
         }), /*#__PURE__*/React.createElement(IconFont, {
           onClick: function onClick() {
-            return eventNameDel(record.groupId);
+            if (isDemo) {
+              message.error('demo环境无法删除');
+              return;
+            }
+
+            eventNameDel(record.groupId);
           },
           type: "shanchu"
         }));
       } else {
         return /*#__PURE__*/React.createElement("div", {
-          className: "set",
+          className: "set ".concat(record.owner == 'zg_abp' ? 'set-error' : ''),
           onClick: function onClick() {
-            return eventItemDel(record.event_id);
+            if (isDemo) {
+              message.error('demo环境无法删除');
+              return;
+            }
+
+            record.owner != 'zg_abp' ? eventItemDel(record.event_id) : message.error('内置事件无法删除');
           }
         }, "\u5220\u9664");
       }
@@ -590,6 +637,7 @@ var TablePlus = function TablePlus(props) {
     pagination: false
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u4FEE\u6539\u5206\u7EC4\u540D",
+    destroyOnClose: true,
     visible: eventNameShow,
     onOk: eventNameEdit,
     onCancel: function onCancel() {
@@ -597,6 +645,7 @@ var TablePlus = function TablePlus(props) {
     }
   }, /*#__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/dataManage/index.d.ts

@@ -1,4 +1,7 @@
 import React from 'react';
 import './styles/index.less';
-declare const DataManage: React.FC;
+interface DataManageProps {
+    updateEventMetas: Function;
+}
+declare const DataManage: React.FC<DataManageProps>;
 export default DataManage;

package/es/modules/dataManage/index.js

@@ -11,16 +11,29 @@ 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 React, { useState } from 'react';
-import './styles/index.less'; // import EventList from './eventList';
-// import UserAttributeList from './userAttributeList';
-
+import { Tabs } from 'antd';
+import React, { useState, useEffect } from 'react';
+import './styles/index.less';
+import { DmContext, upDatedDmFun } from '../../store';
+import { ActionType } from '../../store/action';
 import PlanList from '../dataPlan';
 import DataCollection from '../dataCollection';
 
 var DataManage = function DataManage(props) {
   var classPrefix = 'data-manage';
+  var updateEventMetas = props.updateEventMetas; // const { state, dispatch } = useContext(DmContext);
+
+  var _upDatedDmFun = upDatedDmFun(),
+      _upDatedDmFun2 = _slicedToArray(_upDatedDmFun, 2),
+      state = _upDatedDmFun2[0],
+      dispatch = _upDatedDmFun2[1];
+
+  useEffect(function () {
+    dispatch({
+      type: ActionType.SET_GLOBAL,
+      payload: updateEventMetas
+    });
+  }, []);
 
   var _useState = useState('0'),
       _useState2 = _slicedToArray(_useState, 2),
@@ -44,15 +57,43 @@ var DataManage = function DataManage(props) {
       type: "maidianfanganguanli"
     })
   }];
-  return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+
+  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,
+      dispatch: dispatch
+    }
   }, /*#__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));
+    className: classPrefix
+  }, /*#__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;

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/addEventOrUser.js

@@ -212,17 +212,19 @@ var addEventOrUser = function addEventOrUser(props) {
     dataIndex: 'propName',
     key: 'propName',
     align: 'center'
-  }, {
-    title: '值',
-    dataIndex: 'value',
-    key: 'value',
-    align: 'center'
-  }, {
-    title: '调用identify接口的时机',
-    dataIndex: 'callTime',
-    key: 'callTime',
-    align: 'center'
-  }, {
+  }, // {
+  //   title: '值',
+  //   dataIndex: 'value',
+  //   key: 'value',
+  //   align: 'center',
+  // },
+  // {
+  //   title: '调用identify接口的时机',
+  //   dataIndex: 'callTime',
+  //   key: 'callTime',
+  //   align: 'center',
+  // },
+  {
     title: '操作',
     dataIndex: 'set',
     align: 'center'

package/es/modules/dataPlan/addPlan.d.ts

@@ -5,6 +5,7 @@ interface PropsType {
     detailId: number;
     detailName: string;
     drawerShow: boolean;
+    listData: [];
 }
 declare const AddPlan: React.FC<PropsType>;
 export default AddPlan;