@zgfe/modules-event 1.0.29-zhongyuan.9 → 1.0.29-zhongyuanE.0

package/README.md

@@ -1,35 +1,35 @@
-# modules-event
-
-事件分析
-
-## Getting Started
-
-Install dependencies,
-
-```bash
-$ npm i
-```
-
-Start the dev server,
-
-```bash
-$ npm start
-```
-
-Build documentation,
-
-```bash
-$ npm run docs:build
-```
-
-Run test,
-
-```bash
-$ npm test
-```
-
-Build library via `father-build`,
-
-```bash
-$ npm run build
-```
+# modules-event
+
+事件分析
+
+## Getting Started
+
+Install dependencies,
+
+```bash
+$ npm i
+```
+
+Start the dev server,
+
+```bash
+$ npm start
+```
+
+Build documentation,
+
+```bash
+$ npm run docs:build
+```
+
+Run test,
+
+```bash
+$ npm test
+```
+
+Build library via `father-build`,
+
+```bash
+$ npm run build
+```

package/es/components/eventFilter/index.js

@@ -96,12 +96,14 @@ var EventFilter = function EventFilter(props) {
       if (_data && _data.id) {
         setShowDimension(true);
       }
-      if (_data.filters) {
-        setFilter(_data.filters);
-        setCount(_data.filters.conditions.length);
+      if (_data === null || _data === void 0 ? void 0 : _data.filters) {
+        setFilter(_data === null || _data === void 0 ? void 0 : _data.filters);
+        setCount(_data === null || _data === void 0 ? void 0 : _data.filters.conditions.length);
       }
       if (_data.dimension) {
-        setBizAttributeSelectorValue(_data.dimension);
+        setBizAttributeSelectorValue(function () {
+          return _objectSpread({}, _data.dimension);
+        });
       }
     }
     ajax(Apis.getEventSwitch, {
@@ -115,7 +117,7 @@ var EventFilter = function EventFilter(props) {
         queryRelationConfig();
       }
     });
-  }, [isCascadeShow]);
+  }, []);
   var queryRelationConfig = function queryRelationConfig() {
     ajax(Apis.queryRelationConfig, {
       method: 'post',
@@ -201,7 +203,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/styles/index.less

@@ -1,148 +1,148 @@
-.eventfilter-box {
-  .attr-box-show {
-    margin-top: 4px;
-  }
-  > div:nth-child(1) {
-    display: flex;
-    padding: 4px 0 4px 24px;
-    &:hover {
-      background: #e8efff;
-    }
-    .biz-event-select,
-    .biz-attr-select {
-      min-width: 208px;
-      margin-right: 16px;
-    }
-    .shaixuan,
-    .guanli {
-      margin-top: 2px;
-      color: #9aa1a9;
-      font-size: 20px !important;
-      cursor: pointer;
-    }
-    .shaixuan:hover,
-    .guanli:hover {
-      color: #165dff;
-    }
-    .disable {
-      color: #ccd0d4 !important;
-      cursor: not-allowed !important;
-    }
-  }
-  &-multiple {
-    .biz-event-select {
-      width: auto !important;
-      min-width: 208px;
-    }
-  }
-}
-
-.set-cascade-modal-box {
-  .ant-modal-header {
-    padding-bottom: 0;
-  }
-  .ant-modal-body {
-    padding: 0;
-  }
-  &-tips {
-    padding: 16px 24px;
-    color: #67727f;
-    font-weight: 400;
-    font-size: 14px;
-    line-height: 22px;
-  }
-  &-set::-webkit-scrollbar {
-    display: none;
-  }
-  &-set {
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
-    height: 328px;
-    padding-right: 24px;
-    padding-bottom: 16px;
-    padding-left: 24px;
-    overflow-y: auto;
-    &-empty {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 328px;
-    }
-    &-item {
-      display: flex;
-      flex-direction: row;
-      gap: 16px;
-      align-self: stretch;
-      justify-content: space-between;
-      padding: 16px 16px 16px 24px;
-      color: var(--io-N8-, #354354);
-      font-weight: 400;
-      font-size: 14px;
-      font-family: 'PingFang SC';
-      font-style: normal;
-      line-height: 22px;
-      border: 1px solid var(--io-i1-, #e8efff);
-      border-radius: 4px;
-      &-info {
-        display: flex;
-        flex: 1;
-        flex-direction: column;
-        gap: 16px;
-        &-item {
-          display: flex;
-          flex-direction: row;
-          align-items: center;
-          height: 32px;
-          .biz-event-select,
-          .biz-attr-select {
-            flex: 1;
-          }
-          .biz-attr-select-handle {
-            width: inherit;
-          }
-          &-shu {
-            width: 1px;
-            height: 32px;
-            background: #e8efff;
-          }
-          &-heng {
-            width: 12px;
-            height: 1px;
-            margin-right: 8px;
-            background: #e8efff;
-          }
-        }
-      }
-      .qingchu {
-        color: #9aa1a9;
-        cursor: pointer;
-      }
-      .qingchu:hover {
-        color: #fb5547;
-      }
-    }
-  }
-  &-footer {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 80px;
-    padding: 24px;
-    background: #fff;
-    border-top: 1px solid var(--io-n-05, #f2f3f4);
-    border-bottom-right-radius: 8px;
-    border-bottom-left-radius: 8px;
-    .addEvent {
-      padding: 0 16px;
-      div {
-        display: flex;
-        align-items: center;
-      }
-    }
-    .button:not(.disabled):not(.ant-btn-primary) {
-      color: #1454e5;
-      border: 1px solid #1454e5;
-    }
-  }
-}
+.eventfilter-box {
+  .attr-box-show {
+    margin-top: 4px;
+  }
+  > div:nth-child(1) {
+    display: flex;
+    padding: 4px 0 4px 24px;
+    &:hover {
+      background: #e8efff;
+    }
+    .biz-event-select,
+    .biz-attr-select {
+      min-width: 208px;
+      margin-right: 16px;
+    }
+    .shaixuan,
+    .guanli {
+      margin-top: 2px;
+      color: #9aa1a9;
+      font-size: 20px !important;
+      cursor: pointer;
+    }
+    .shaixuan:hover,
+    .guanli:hover {
+      color: #165dff;
+    }
+    .disable {
+      color: #ccd0d4 !important;
+      cursor: not-allowed !important;
+    }
+  }
+  &-multiple {
+    .biz-event-select {
+      width: auto !important;
+      min-width: 208px;
+    }
+  }
+}
+
+.set-cascade-modal-box {
+  .ant-modal-header {
+    padding-bottom: 0;
+  }
+  .ant-modal-body {
+    padding: 0;
+  }
+  &-tips {
+    padding: 16px 24px;
+    color: #67727f;
+    font-weight: 400;
+    font-size: 14px;
+    line-height: 22px;
+  }
+  &-set::-webkit-scrollbar {
+    display: none;
+  }
+  &-set {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    height: 328px;
+    padding-right: 24px;
+    padding-bottom: 16px;
+    padding-left: 24px;
+    overflow-y: auto;
+    &-empty {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 328px;
+    }
+    &-item {
+      display: flex;
+      flex-direction: row;
+      gap: 16px;
+      align-self: stretch;
+      justify-content: space-between;
+      padding: 16px 16px 16px 24px;
+      color: var(--io-N8-, #354354);
+      font-weight: 400;
+      font-size: 14px;
+      font-family: 'PingFang SC';
+      font-style: normal;
+      line-height: 22px;
+      border: 1px solid var(--io-i1-, #e8efff);
+      border-radius: 4px;
+      &-info {
+        display: flex;
+        flex: 1;
+        flex-direction: column;
+        gap: 16px;
+        &-item {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          height: 32px;
+          .biz-event-select,
+          .biz-attr-select {
+            flex: 1;
+          }
+          .biz-attr-select-handle {
+            width: inherit;
+          }
+          &-shu {
+            width: 1px;
+            height: 32px;
+            background: #e8efff;
+          }
+          &-heng {
+            width: 12px;
+            height: 1px;
+            margin-right: 8px;
+            background: #e8efff;
+          }
+        }
+      }
+      .qingchu {
+        color: #9aa1a9;
+        cursor: pointer;
+      }
+      .qingchu:hover {
+        color: #fb5547;
+      }
+    }
+  }
+  &-footer {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 80px;
+    padding: 24px;
+    background: #fff;
+    border-top: 1px solid var(--io-n-05, #f2f3f4);
+    border-bottom-right-radius: 8px;
+    border-bottom-left-radius: 8px;
+    .addEvent {
+      padding: 0 16px;
+      div {
+        display: flex;
+        align-items: center;
+      }
+    }
+    .button:not(.disabled):not(.ant-btn-primary) {
+      color: #1454e5;
+      border: 1px solid #1454e5;
+    }
+  }
+}

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/renderContent/styles/index.less

@@ -1,19 +1,19 @@
-@import '~@zgfe/business-lib/es/assets/styles/variable.less';
-
-.render-content {
-  &-chart-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 392px;
-    padding: @padding-lg;
-    border: 1px solid @border-color-base;
-    border-radius: @border-radius-normal;
-    .echarts-for-react {
-      width: 100%;
-    }
-  }
-  &-loading {
-    min-height: 300px;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/variable.less';
+
+.render-content {
+  &-chart-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 392px;
+    padding: @padding-lg;
+    border: 1px solid @border-color-base;
+    border-radius: @border-radius-normal;
+    .echarts-for-react {
+      width: 100%;
+    }
+  }
+  &-loading {
+    min-height: 300px;
+  }
+}

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';
@@ -96,6 +97,7 @@ var SearchPanel = function SearchPanel(props) {
     defaultValue: time,
     onChange: onChangeTime,
     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/searchPanel/styles/index.less

@@ -1,22 +1,22 @@
-@import '~@zgfe/business-lib/es/assets/styles/variable.less';
-
-.search-panel {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 32px;
-  margin-bottom: 24px;
-
-  &-search-right {
-    display: flex;
-    gap: 16px;
-    &-refresh {
-      display: flex !important;
-      gap: 4px;
-    }
-  }
-
-  &-select {
-    width: 112px;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/variable.less';
+
+.search-panel {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 32px;
+  margin-bottom: 24px;
+
+  &-search-right {
+    display: flex;
+    gap: 16px;
+    &-refresh {
+      display: flex !important;
+      gap: 4px;
+    }
+  }
+
+  &-select {
+    width: 112px;
+  }
+}

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;