@zgfe/modules-event 1.0.29-zhongyuan.2 → 1.0.29-zhongyuan.20

package/es/components/eventFilter/index.js

@@ -115,7 +115,7 @@ var EventFilter = function EventFilter(props) {
         queryRelationConfig();
       }
     });
-  }, []);
+  }, [isCascadeShow]);
   var queryRelationConfig = function queryRelationConfig() {
     ajax(Apis.queryRelationConfig, {
       method: 'post',
@@ -201,7 +201,8 @@ var EventFilter = function EventFilter(props) {
         propCategory: attr.propCategory,
         category: attr.category,
         value: _value,
-        id: attr.id
+        id: attr.id,
+        encryptionType: attr.encryptionType
       });
     }
   };

package/es/components/eventFilter/types.d.ts

@@ -9,6 +9,7 @@ export interface ConditionsnProps {
     attrName?: string | undefined;
     label?: string | undefined;
     dimensionSub?: string | undefined;
+    encryptionType?: number;
 }
 export interface EventFilterProps {
     value?: eventProps | number[];

package/es/components/searchPanel/index.js

@@ -12,6 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizSelect, BizTargetDimension, useChanged, IconFont, BizDatePickerV2 } from '@zgfe/business-lib';
 import { Button } from 'antd';
+import { DatePickerTypes } from '@zgfe/business-lib/es/datePickerV2/types';
 import React, { useContext, useEffect, useState } from 'react';
 import { chartTypeOptions, getInitDate } from '../../constants';
 import { EventContext } from '../../types';
@@ -95,7 +96,8 @@ var SearchPanel = function SearchPanel(props) {
   }, /*#__PURE__*/React.createElement(BizDatePickerV2, {
     defaultValue: time,
     onChange: onChangeTime,
-    selectRange: 365,
+    selectRange: 6000,
+    dateTypeList: [DatePickerTypes.Unit.minute, DatePickerTypes.Unit.hour, DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month],
     selectRangeUnit: "days"
   }), /*#__PURE__*/React.createElement(BizTargetDimension, {
     normalOptions: currentNormalOptions,

package/es/components/table/index.js

@@ -21,13 +21,15 @@ import { CopyToClipboard } from 'react-copy-to-clipboard';
 import 'highlight.js/styles/vs.css';
 import base64 from '../../utils/base64';
 import { Apis } from '../../constants';
-import { Modal, message, Table, ConfigProvider, Empty, Tooltip } from 'antd';
+import { Modal, message, Table, ConfigProvider, Empty, Tooltip, Typography } from 'antd';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { formTableData, getColumns } from '../../utils/formData';
 import './styles/index.less';
 import { getValue } from '../../modules/content/utils';
 import { EventContext } from '../../types';
 import { getEventAliasName } from '../../utils/formData';
 var classPrefix = 'event-mi-table';
+var Text = Typography.Text;
 var EventTable = function EventTable(props) {
   var dataSource = props.dataSource,
     searchData = props.searchData,
@@ -43,7 +45,8 @@ var EventTable = function EventTable(props) {
     eventEnvList = _useContext.eventEnvList,
     userPropList = _useContext.userPropList,
     userGroupList = _useContext.userGroupList,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var _useContext2 = useContext(EventContext),
     onUserDrill = _useContext2.onUserDrill,
     _useContext2$defaultS = _useContext2.defaultSearch,
@@ -91,9 +94,12 @@ var EventTable = function EventTable(props) {
           originalName: '总计',
           userGroup: Object.keys(item)[0]
         };
+        var sum = 0;
         Object.values(item)[0].forEach(function (item, index) {
           data["field".concat(index)] = item;
+          sum += item;
         });
+        data.attrSum = sum;
         dataAll.push(data);
       });
       setPvTitle(dataSource.eventPvTitle.split(';').map(function (item) {
@@ -109,7 +115,7 @@ var EventTable = function EventTable(props) {
       props.changeShowByName(nameGroup);
     };
     var onClickToDetail = function onClickToDetail(item, time, count) {
-      var _searchData$filters;
+      var _searchData$dimension, _searchData$filters;
       var userGroupData = userGroup[0] == null ? [] : [userGroup[0]];
       if ((userGroup === null || userGroup === void 0 ? void 0 : userGroup.length) > 1) {
         userGroupList && userGroupList.forEach(function (user) {
@@ -121,7 +127,7 @@ var EventTable = function EventTable(props) {
       var _time = time.split('|');
       var groupValue = '';
       if (searchData.dimension && item.dimension) {
-        groupValue = item.dimension;
+        groupValue = item.originalName;
       } else {
         eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
           group.eventList.forEach(function (event) {
@@ -138,6 +144,7 @@ var EventTable = function EventTable(props) {
         module: 'event',
         params: {
           groupValue: groupValue,
+          groupValueEncry: (((_searchData$dimension = searchData.dimension) === null || _searchData$dimension === void 0 ? void 0 : _searchData$dimension.encryptionType) || 0) > 0,
           id: searchData.id,
           userGroup: userGroupData,
           chartType: searchData.chartType,
@@ -168,7 +175,7 @@ var EventTable = function EventTable(props) {
       data: _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: (searchData === null || searchData === void 0 ? void 0 : searchData.platform) || 0,
-        service: !searchData.dimension ? 'event/overview_sql' : 'event_sql'
+        service: searchData.id ? 'event_sql' : 'event/overview_sql'
       }, searchData)
     }).then(function (res) {
       if (res === null || res === void 0 ? void 0 : res.data) {
@@ -235,7 +242,7 @@ var EventTable = function EventTable(props) {
     }, /*#__PURE__*/React.createElement("span", null, item[0], "\uFF1A"), /*#__PURE__*/React.createElement("span", null, item[1], index === pvTitle.length - 1 ? '' : ' ｜ '));
   }), "\uFF09")) : null), /*#__PURE__*/React.createElement("div", null, authority[100051] && /*#__PURE__*/React.createElement("div", {
     onClick: seeSql
-  }, "\u67E5\u770BSQL"), authority[100050] && /*#__PURE__*/React.createElement("div", {
+  }, "\u67E5\u770BSQL"), authority[100050] && showProdDownload && /*#__PURE__*/React.createElement("div", {
     onClick: download
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "xiazai1"
@@ -294,6 +301,19 @@ var EventTable = function EventTable(props) {
     className: "copy-box"
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "fuzhi1"
-  }), "\u590D\u5236\u4EE3\u7801"))));
+  }), "\u590D\u5236\u4EE3\u7801")), /*#__PURE__*/React.createElement("div", {
+    style: {
+      margin: '10px 0px 0px'
+    },
+    className: "sql-tip"
+  }, /*#__PURE__*/React.createElement(Text, {
+    type: "warning"
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u771F\u5B9E\u4E1A\u52A1\u573A\u666F\u4E0B\u7684\u67E5\u8BE2\u903B\u8F91\uFF0C\u6D89\u53CA\u590D\u6742\u4E1A\u52A1\u89C4\u5219\u4E0E\u7A0B\u5E8F\u5904\u7406\u903B\u8F91\u4EA4\u7EC7\u3002\u6B64\u5904\u5C55\u793A\u7684 SQL \u4EC5\u4F5C\u4E3A\u7B80\u5355\u4E8B\u4EF6\u67E5\u8BE2\u7684\u903B\u8F91\u53C2\u8003\u793A\u4F8B \uFF0C\u4E0D\u4EE3\u8868\u4E0E\u5F53\u524D\u754C\u9762\u6240\u9009\u67E5\u8BE2\u6761\u4EF6\u5B8C\u5168\u6620\u5C04"
+  }, /*#__PURE__*/React.createElement(ExclamationCircleOutlined, {
+    style: {
+      margin: '0px 8px 0px 0px'
+    }
+  })), "SQL \u4EC5\u4F5C\u4E3A\u7B80\u5355\u4E8B\u4EF6\u67E5\u8BE2\u7684\u903B\u8F91\u53C2\u8003\u793A\u4F8B"))));
 };
 export default EventTable;

package/es/components/table/styles/index.css

@@ -0,0 +1,236 @@
+.event-mi-table {
+  margin-top: 16px;
+}
+.event-mi-table-loading {
+  min-height: 300px;
+}
+.event-mi-table-table-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 50px;
+  margin-bottom: -1px;
+  padding: 0 12px;
+  line-height: 50px;
+  background: #fafafb;
+  border: 1px solid #e6e7ea;
+  border-radius: 8px 8px 0 0;
+}
+.event-mi-table-table-header > :nth-child(2) {
+  display: flex;
+}
+.event-mi-table-table-header > :nth-child(2) > :nth-child(1) {
+  margin-right: 16px;
+}
+.event-mi-table-table-header > :nth-child(2) div {
+  height: 32px;
+  padding: 0 16px;
+  line-height: 32px;
+  background: #fff;
+  border: 1px solid #f2f3f4;
+  border-radius: 4px;
+  cursor: pointer;
+}
+.event-mi-table-table-header > :nth-child(2) div .xiazai1 {
+  margin-right: 4px;
+  font-size: 18px !important;
+  vertical-align: -2px;
+}
+.event-mi-table-table-header > :nth-child(2) div:hover {
+  color: #165dff;
+  background: #e8efff;
+  border: 1px solid #165dff;
+}
+.event-mi-table-table-header > :nth-child(2) div:active {
+  color: #1454e5;
+  background: #e8efff;
+  border: 1px solid #1454e5;
+}
+.event-mi-table-table-header-left {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  overflow: hidden;
+}
+.event-mi-table-table-header-left-box {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  overflow: hidden;
+  color: #67727f;
+}
+.event-mi-table-table-header-left-content {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  overflow: hidden;
+  color: #67727f;
+}
+.event-mi-table-table-header-left-content > span {
+  display: flex;
+  flex-direction: row;
+  max-width: 33.33%;
+  overflow: hidden;
+}
+.event-mi-table-table-header-left-content > span :first-child {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.event-mi-table-table-header-left-content > span :nth-child(2) {
+  flex: 1;
+  white-space: nowrap;
+}
+.event-mi-table .ant-table {
+  border-radius: 0 0 8px 8px;
+}
+.event-mi-table .sourcepanel-table-header {
+  overflow: hidden;
+  border-radius: 8px 8px 0 0;
+}
+.event-mi-table .sourcepanel-table-header .ant-table {
+  max-height: none;
+}
+.event-mi-table .ant-pagination {
+  margin-top: 24px !important;
+}
+.event-mi-table .ant-table .ant-table-thead .ant-table-cell.ant-table-column-has-sorters .ant-table-column-sorters {
+  justify-content: flex-end !important;
+}
+.event-mi-table .ant-table-cell-with-append {
+  padding-left: 20px;
+}
+.event-mi-table .ant-table-cell-with-append .ant-table-row-expand-icon {
+  position: absolute;
+  left: 0;
+  margin-top: 0;
+}
+.event-mi-table .tooltip-userGroup-box {
+  display: flex;
+  max-width: 330px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.event-mi-table .tooltip-userGroup-box div {
+  max-width: 330px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.event-mi-table .tooltip-name-box {
+  display: flex;
+}
+.event-mi-table .tooltip-name-box-market {
+  width: 180px;
+  margin-right: 8px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  cursor: pointer;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+}
+.event-mi-table .tooltip-name-box-market .shoucang {
+  color: #fd9f41;
+  font-size: 16px !important;
+}
+.event-mi-table .tooltip-name-box-market .notshoucang {
+  opacity: 0;
+}
+.event-mi-table .tooltip-name-box .fuzhi1 {
+  display: none;
+  font-size: 16px !important;
+}
+.event-mi-table .tooltip-name-box .fuzhi1:hover {
+  color: #165dff;
+}
+.event-mi-table .tooltip-name-box:hover .fuzhi1 {
+  display: block;
+}
+.event-mi-table-table-empty img {
+  width: 50px !important;
+  height: auto;
+  margin-top: 30px;
+  margin-bottom: 10px;
+}
+.event-mi-table-table-empty p {
+  color: rgba(0, 0, 0, 0.25);
+}
+.event-mi-table-chart-box {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+.event-mi-table-chart-box-tooltip {
+  width: 200px;
+  margin-bottom: 24px;
+  color: #67727f;
+  font-size: 12px;
+}
+.event-table-sql-modal .ant-modal {
+  width: 720px !important;
+}
+.event-table-sql-modal .ant-modal-header {
+  position: relative;
+  z-index: 1;
+  height: 82px;
+  background: transparent;
+}
+.event-table-sql-modal .ant-modal-body {
+  padding: 0 24px 24px 24px;
+}
+.event-table-sql-modal .ant-modal-close-x {
+  margin-top: 13px;
+  margin-right: 8px;
+}
+.event-table-sql-modal img {
+  width: 100%;
+}
+.event-table-sql-modal .qingchu {
+  font-weight: 500;
+  font-size: 22px !important;
+}
+.event-table-sql-modal .modal-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: auto;
+}
+.event-table-sql-modal pre {
+  margin-bottom: 0;
+}
+.event-table-sql-modal .hljs {
+  height: 400px;
+  padding: 16px;
+  padding-bottom: 0;
+  background: #fafafb;
+  border-radius: 8px;
+}
+.event-table-sql-modal .copy-box {
+  position: absolute;
+  top: 98px;
+  right: 40px;
+  padding: 0 8px;
+  background: #f2f3f4;
+  border-radius: 4px;
+}
+.event-table-sql-modal .copy-box .fuzhi1 {
+  margin-right: 8px;
+}
+.event-table-sql-modal .copy-box:hover {
+  color: #165dff;
+  background: #e8efff;
+}
+.event-table-sql-modal .copy-box:active {
+  color: #1454e5;
+  background: #e8efff;
+}
+.ant-modal-content {
+  position: relative;
+}
+.ant-modal-content .sql-tip {
+  position: absolute;
+  bottom: 30px;
+}

package/es/components/table/styles/index.less

@@ -1,241 +1,249 @@
-.event-mi-table {
-  margin-top: 16px;
-  &-loading {
-    min-height: 300px;
-  }
-  &-table-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 50px;
-    margin-bottom: -1px;
-    padding: 0 12px;
-    line-height: 50px;
-    background: #fafafb;
-    border: 1px solid #e6e7ea;
-    border-radius: 8px 8px 0 0;
-    > :nth-child(2) {
-      display: flex;
-      > :nth-child(1) {
-        margin-right: 16px;
-      }
-      div {
-        height: 32px;
-        padding: 0 16px;
-        line-height: 32px;
-        background: #fff;
-        border: 1px solid #f2f3f4;
-        border-radius: 4px;
-        cursor: pointer;
-        .xiazai1 {
-          margin-right: 4px;
-          font-size: 18px !important;
-          vertical-align: -2px;
-        }
-      }
-      div:hover {
-        color: #165dff;
-        background: #e8efff;
-        border: 1px solid #165dff;
-      }
-      div:active {
-        color: #1454e5;
-        background: #e8efff;
-        border: 1px solid #1454e5;
-      }
-    }
-    &-left {
-      display: flex;
-      flex: 1;
-      flex-direction: row;
-      overflow: hidden;
-      &-box {
-        display: flex;
-        flex: 1;
-        flex-direction: row;
-        overflow: hidden;
-        color: #67727f;
-      }
-      &-content {
-        display: flex;
-        flex: 1;
-        flex-direction: row;
-        overflow: hidden;
-        color: #67727f;
-        > span {
-          display: flex;
-          flex-direction: row;
-          max-width: 33.33%;
-          overflow: hidden;
-          :first-child {
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-          :nth-child(2) {
-            flex: 1;
-            white-space: nowrap;
-          }
-        }
-      }
-    }
-  }
-  .ant-table {
-    border-radius: 0 0 8px 8px;
-  }
-  .sourcepanel-table-header {
-    overflow: hidden;
-    border-radius: 8px 8px 0 0;
-    .ant-table {
-      max-height: none;
-    }
-  }
-  .ant-pagination {
-    margin-top: 24px !important;
-  }
-  .ant-table
-    .ant-table-thead
-    .ant-table-cell.ant-table-column-has-sorters
-    .ant-table-column-sorters {
-    justify-content: flex-end !important;
-  }
-  .ant-table-cell-with-append {
-    padding-left: 20px;
-    .ant-table-row-expand-icon {
-      position: absolute;
-      left: 0;
-      margin-top: 0;
-    }
-  }
-  .tooltip-userGroup-box {
-    display: flex;
-    max-width: 330px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    div {
-      max-width: 330px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-  }
-  .tooltip-name-box {
-    display: flex;
-    &-market {
-      // max-width: calc(100% - 20px);
-      margin-right: 8px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      cursor: pointer;
-      -webkit-line-clamp: 1;
-      -webkit-box-orient: vertical;
-      .shoucang {
-        color: #fd9f41;
-        font-size: 16px !important;
-      }
-      .notshoucang {
-        opacity: 0;
-      }
-    }
-
-    .fuzhi1 {
-      display: none;
-      font-size: 16px !important;
-    }
-    .fuzhi1:hover {
-      color: #165dff;
-    }
-  }
-  .tooltip-name-box:hover {
-    .fuzhi1 {
-      display: block;
-    }
-  }
-
-  &-table-empty {
-    img {
-      width: 50px !important;
-      height: auto;
-      margin-top: 30px;
-      margin-bottom: 10px;
-    }
-    p {
-      color: rgba(0, 0, 0, 0.25);
-    }
-  }
-
-  &-chart-box {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    &-tooltip {
-      width: 200px;
-      margin-bottom: 24px;
-      color: #67727f;
-      font-size: 12px;
-    }
-  }
-}
-.event-table-sql-modal {
-  .ant-modal {
-    width: 720px !important;
-  }
-  .ant-modal-header {
-    position: relative;
-    z-index: 1;
-    height: 82px;
-    background: transparent;
-  }
-  .ant-modal-body {
-    padding: 0 24px 24px 24px;
-  }
-  .ant-modal-close-x {
-    margin-top: 13px;
-    margin-right: 8px;
-  }
-  img {
-    width: 100%;
-  }
-  .qingchu {
-    font-weight: 500;
-    font-size: 22px !important;
-  }
-  .modal-bg {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: auto;
-  }
-  pre {
-    margin-bottom: 0;
-  }
-  .hljs {
-    height: 400px;
-    padding: 16px;
-    padding-bottom: 0;
-    background: #fafafb;
-    border-radius: 8px;
-  }
-  .copy-box {
-    position: absolute;
-    top: 98px;
-    right: 40px;
-    padding: 0 8px;
-    background: #f2f3f4;
-    border-radius: 4px;
-    .fuzhi1 {
-      margin-right: 8px;
-    }
-  }
-  .copy-box:hover {
-    color: #165dff;
-    background: #e8efff;
-  }
-  .copy-box:active {
-    color: #1454e5;
-    background: #e8efff;
-  }
-}
+.event-mi-table {
+  margin-top: 16px;
+  &-loading {
+    min-height: 300px;
+  }
+  &-table-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 50px;
+    margin-bottom: -1px;
+    padding: 0 12px;
+    line-height: 50px;
+    background: #fafafb;
+    border: 1px solid #e6e7ea;
+    border-radius: 8px 8px 0 0;
+    > :nth-child(2) {
+      display: flex;
+      > :nth-child(1) {
+        margin-right: 16px;
+      }
+      div {
+        height: 32px;
+        padding: 0 16px;
+        line-height: 32px;
+        background: #fff;
+        border: 1px solid #f2f3f4;
+        border-radius: 4px;
+        cursor: pointer;
+        .xiazai1 {
+          margin-right: 4px;
+          font-size: 18px !important;
+          vertical-align: -2px;
+        }
+      }
+      div:hover {
+        color: #165dff;
+        background: #e8efff;
+        border: 1px solid #165dff;
+      }
+      div:active {
+        color: #1454e5;
+        background: #e8efff;
+        border: 1px solid #1454e5;
+      }
+    }
+    &-left {
+      display: flex;
+      flex: 1;
+      flex-direction: row;
+      overflow: hidden;
+      &-box {
+        display: flex;
+        flex: 1;
+        flex-direction: row;
+        overflow: hidden;
+        color: #67727f;
+      }
+      &-content {
+        display: flex;
+        flex: 1;
+        flex-direction: row;
+        overflow: hidden;
+        color: #67727f;
+        > span {
+          display: flex;
+          flex-direction: row;
+          max-width: 33.33%;
+          overflow: hidden;
+          :first-child {
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+          :nth-child(2) {
+            flex: 1;
+            white-space: nowrap;
+          }
+        }
+      }
+    }
+  }
+  .ant-table {
+    border-radius: 0 0 8px 8px;
+  }
+  .sourcepanel-table-header {
+    overflow: hidden;
+    border-radius: 8px 8px 0 0;
+    .ant-table {
+      max-height: none;
+    }
+  }
+  .ant-pagination {
+    margin-top: 24px !important;
+  }
+  .ant-table
+    .ant-table-thead
+    .ant-table-cell.ant-table-column-has-sorters
+    .ant-table-column-sorters {
+    justify-content: flex-end !important;
+  }
+  .ant-table-cell-with-append {
+    padding-left: 20px;
+    .ant-table-row-expand-icon {
+      position: absolute;
+      left: 0;
+      margin-top: 0;
+    }
+  }
+  .tooltip-userGroup-box {
+    display: flex;
+    max-width: 330px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    div {
+      max-width: 330px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+  .tooltip-name-box {
+    display: flex;
+    &-market {
+      // max-width: calc(100% - 20px);
+      width: 180px;
+      margin-right: 8px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      cursor: pointer;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      .shoucang {
+        color: #fd9f41;
+        font-size: 16px !important;
+      }
+      .notshoucang {
+        opacity: 0;
+      }
+    }
+
+    .fuzhi1 {
+      display: none;
+      font-size: 16px !important;
+    }
+    .fuzhi1:hover {
+      color: #165dff;
+    }
+  }
+  .tooltip-name-box:hover {
+    .fuzhi1 {
+      display: block;
+    }
+  }
+
+  &-table-empty {
+    img {
+      width: 50px !important;
+      height: auto;
+      margin-top: 30px;
+      margin-bottom: 10px;
+    }
+    p {
+      color: rgba(0, 0, 0, 0.25);
+    }
+  }
+
+  &-chart-box {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    &-tooltip {
+      width: 200px;
+      margin-bottom: 24px;
+      color: #67727f;
+      font-size: 12px;
+    }
+  }
+}
+.event-table-sql-modal {
+  .ant-modal {
+    width: 720px !important;
+  }
+  .ant-modal-header {
+    position: relative;
+    z-index: 1;
+    height: 82px;
+    background: transparent;
+  }
+  .ant-modal-body {
+    padding: 0 24px 24px 24px;
+  }
+  .ant-modal-close-x {
+    margin-top: 13px;
+    margin-right: 8px;
+  }
+  img {
+    width: 100%;
+  }
+  .qingchu {
+    font-weight: 500;
+    font-size: 22px !important;
+  }
+  .modal-bg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: auto;
+  }
+  pre {
+    margin-bottom: 0;
+  }
+  .hljs {
+    height: 400px;
+    padding: 16px;
+    padding-bottom: 0;
+    background: #fafafb;
+    border-radius: 8px;
+  }
+  .copy-box {
+    position: absolute;
+    top: 98px;
+    right: 40px;
+    padding: 0 8px;
+    background: #f2f3f4;
+    border-radius: 4px;
+    .fuzhi1 {
+      margin-right: 8px;
+    }
+  }
+  .copy-box:hover {
+    color: #165dff;
+    background: #e8efff;
+  }
+  .copy-box:active {
+    color: #1454e5;
+    background: #e8efff;
+  }
+}
+.ant-modal-content {
+  position: relative;
+  .sql-tip {
+    position: absolute;
+    bottom: 30px;
+  }
+}

package/es/index.d.ts

@@ -2,4 +2,5 @@
 import EventChart from './modules/chart';
 import ModuleEvent from './modules/home';
 import { getNumberPanelData } from './modules/content/utils';
-export { ModuleEvent, EventChart, getNumberPanelData };
+import EventFilter from './components/eventFilter';
+export { ModuleEvent, EventChart, getNumberPanelData, EventFilter };

package/es/index.js

@@ -1,4 +1,5 @@
 import EventChart from './modules/chart';
 import ModuleEvent from './modules/home';
 import { getNumberPanelData } from './modules/content/utils';
-export { ModuleEvent, EventChart, getNumberPanelData };
+import EventFilter from './components/eventFilter';
+export { ModuleEvent, EventChart, getNumberPanelData, EventFilter };

package/es/modules/chart/index.js

@@ -181,8 +181,9 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
       title: '当前图表数据实时更新，约每分钟更新一次'
     }, /*#__PURE__*/React.createElement("div", null, "\u6570\u636E\u66F4\u65B0\u65F6\u95F4\uFF1A", moment().format('YYYY-MM-DD HH:mm')));
   };
-  var tooltipFormatter = function tooltipFormatter(params) {
+  var tooltipFormatter = function tooltipFormatter(data) {
     var xLabel = '';
+    var params = data[0] ? data : [data];
     var array = params[0].name.split('|');
     if (array.length > 1) {
       xLabel = moment(array[0]).format('MM-DD') + '~' + moment(array[1]).format('MM-DD');

package/es/modules/content/index.js

@@ -165,9 +165,9 @@ var EventContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       if (['bar', 'pie', 'map'].indexOf(searchData.chartType) !== -1) {
         _data = getSortData(_data);
       } else {
-        var _data$series$;
+        var _data2, _data2$series$;
         _sortData = sortOriginalData(dataTemp, {
-          columnKey: "field".concat(((_data$series$ = _data.series[0]) === null || _data$series$ === void 0 ? void 0 : _data$series$.values.length) - 1),
+          columnKey: "field".concat(((_data2 = _data) === null || _data2 === void 0 ? void 0 : (_data2$series$ = _data2.series[0]) === null || _data2$series$ === void 0 ? void 0 : _data2$series$.values.length) - 1),
           order: 'descend'
         });
       }

package/es/modules/content/utils.js

@@ -8,8 +8,9 @@ import { ajax } from '@zgfe/business-lib';
 import { Apis } from '../../constants';
 import _ from 'lodash';
 export var getMapChartData = function getMapChartData(data) {
+  var _data$series;
   var _data = _.cloneDeep(data);
-  _data.series.map(function (item) {
+  _data === null || _data === void 0 ? void 0 : (_data$series = _data.series) === null || _data$series === void 0 ? void 0 : _data$series.map(function (item) {
     if (item.names.length > 1) {
       if (item.names[1] === '新疆维吾尔自治区') {
         item.names = [item.names[0], '新疆'];

package/es/modules/home/demo/index.js

@@ -11,7 +11,7 @@ import './styles/index.less';
 import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
 export default (function () {
-  var _useState = useState(false),
+  var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     isDetail = _useState2[0],
     setIsDetail = _useState2[1];
@@ -24,6 +24,9 @@ export default (function () {
     setSearchParams = _useState6[1];
   useEffect(function () {
     setGlobalConfig(requestConfig);
+    setTimeout(function () {
+      setIsDetail(false);
+    }, 3000);
   }, []);
   var afterEditTarget = function afterEditTarget(type, data) {
     console.log("".concat(type, "\u56DE\u8C03"), data);

package/es/types.d.ts

@@ -7,6 +7,7 @@ export interface bizAttributeSelectorValueProp {
     value?: number | string;
     id?: number;
     key?: number | string;
+    encryptionType?: number;
 }
 export interface AnalysisSubject {
     subjectId?: number;
@@ -76,6 +77,7 @@ export interface SeriesProps {
     index?: string;
     duration?: TableChildrenProps[];
     diyTarget?: boolean;
+    attrSum?: number;
 }
 export interface TableChildrenProps {
     name: string;

package/es/utils/formData.js

@@ -82,7 +82,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     var _getValue;
     data.push({
       title: (_getValue = getValue(searchData.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.label,
-      width: 150,
+      width: 180,
       dataIndex: 'dimension',
       key: 'dimension',
       ellipsis: true,
@@ -114,7 +114,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
           paddingLeft: '16px'
         }
       }, "\u4E8B\u4EF6"),
-      width: 200,
+      width: 180,
       dataIndex: 'eventName',
       key: 'eventName',
       ellipsis: true,
@@ -146,6 +146,23 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       }
     });
   }
+  data.push({
+    title: '合计',
+    width: 50,
+    dataIndex: 'attrSum',
+    ellipsis: true,
+    key: 'attrSum',
+    align: 'center',
+    className: "".concat(classPrefix, "-table-td"),
+    fixed: 'left',
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "tooltip-userGroup-box"
+      }, /*#__PURE__*/React.createElement(Tooltip, {
+        title: text
+      }, /*#__PURE__*/React.createElement("div", null, text)));
+    }
+  });
   var _loop = function _loop(i) {
     var value = columnData[i];
     if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
@@ -192,7 +209,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
 export function getChartDataEventAliasName(dataSource, eventGroupList) {
   var data = _.cloneDeep(dataSource);
   var series = [];
-  data.series.map(function (item) {
+  data === null || data === void 0 ? void 0 : data.series.map(function (item) {
     item.originalNames = item.names;
     item.names = item.names.length > 1 ? [item.names[0], getEventAliasName(item.names[1], eventGroupList)] : [getEventAliasName(item.names[0], eventGroupList)];
     series.push(item);
@@ -223,7 +240,7 @@ export function getEventAliasId(name, eventGroupList) {
   return eventId;
 }
 export function getSortData(data) {
-  var series = data.series;
+  var series = data === null || data === void 0 ? void 0 : data.series;
   var sort = function sort(obj1, obj2) {
     var val1 = obj1.values[0];
     var val2 = obj2.values[0];
@@ -239,20 +256,20 @@ export function getSortData(data) {
   return data;
 }
 export function getUserGroupsCompareData(data) {
-  if (data.series.length <= 0) {
+  if ((data === null || data === void 0 ? void 0 : data.series.length) <= 0) {
     return data;
   } else {
     var _data = _.cloneDeep(data);
     var _series = [];
-    _data.series.map(function (item, index) {
+    _data === null || _data === void 0 ? void 0 : _data.series.map(function (item, index) {
       _series.push(item);
-      _data.series.map(function (_item, _index) {
+      _data === null || _data === void 0 ? void 0 : _data.series.map(function (_item, _index) {
         if (item.names[1] === _item.names[1] && index !== _index) {
           _series.push(_item);
-          delete _data.series[_index];
+          _data === null || _data === void 0 ? true : delete _data.series[_index];
         }
       });
-      delete _data.series[index];
+      _data === null || _data === void 0 ? true : delete _data.series[index];
     });
     _data.series = _series;
     return _data;
@@ -341,10 +358,12 @@ export function formTableData(originalData, userGroups, attrNum, showList) {
       name: name,
       userGroup: userGroup,
       nameGroup: nameGroup,
-      color: color
+      color: color,
+      attrSum: item.attrSum
     };
     if (attrNum) {
       data["dimension"] = name;
+      data['originalName'] = originalName;
     } else {
       data["eventName"] = name;
       data["originalName"] = originalName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.29-zhongyuan.2",
+  "version": "1.0.29-zhongyuan.20",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "private": false,
@@ -41,7 +41,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.70-hxd.1",
+    "@zgfe/business-lib": "1.2.71-hxd.6",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -54,7 +54,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "9814054f09c1dcd59c8b10ac00109ae60a4ae2c5",
+  "gitHead": "ead331cbf490858801ee76b215ace405c12306ab",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }