@zgfe/modules-interval 1.0.9 → 1.0.10-beiming.1

package/README.md

@@ -1,33 +1,33 @@
-# modules-interval
-
-## 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`,
-
-```bash
-$ npm run build
-```
+# modules-interval
+
+## 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`,
+
+```bash
+$ npm run build
+```

package/dist/esm/components/common/styles/index.less

@@ -1,40 +1,40 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.mi-common-interval {
-  &-loading-icon {
-    z-index: 1000;
-    display: inline-block;
-    width: 40px;
-    height: 40px;
-    background: url('../../../style/image/ring.svg') no-repeat;
-    background-size: contain;
-  }
-
-  &-none-text {
-    color: #354354;
-    font-size: 14px;
-  }
-
-  &-none-empty {
-    width: 88px;
-    height: 88px;
-    background-image: url('../../../style/image/empty.png');
-    background-repeat: no-repeat;
-    background-size: cover;
-  }
-
-  &-none-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-}
-.mi-common-interval-content {
-  width: 100%;
-  .ant-spin-text {
-    color: #ccc;
-  }
-}
-.ant-spin-nested-loading {
-  width: 100%;
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.mi-common-interval {
+  .ant-spin-nested-loading {
+    width: 100%;
+  }
+  &-loading-icon {
+    z-index: 1000;
+    display: inline-block;
+    width: 40px;
+    height: 40px;
+    background: url('../../../style/image/ring.svg') no-repeat;
+    background-size: contain;
+  }
+
+  &-none-text {
+    color: #354354;
+    font-size: 14px;
+  }
+
+  &-none-empty {
+    width: 88px;
+    height: 88px;
+    background-image: url('../../../style/image/empty.png');
+    background-repeat: no-repeat;
+    background-size: cover;
+  }
+
+  &-none-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+}
+.mi-common-interval-content {
+  width: 100%;
+  .ant-spin-text {
+    color: #ccc;
+  }
+}

package/dist/esm/components/eventFilter/index.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Switch, Tooltip, message } from 'antd';
+import { Tooltip, message } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 import { BizEventSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
 import "./styles/index.less";
@@ -137,9 +137,6 @@ var EventFilter = function EventFilter(props) {
       delete _dimension.key;
       _event.dimension = _dimension;
     }
-    if (props.relevancy && relevancy !== undefined) {
-      _event.relevancy = relevancy;
-    }
     props.onChange && props.onChange(_event);
   }, [bizAttributeSelectorValue, filter, event, relevancy]);
   return /*#__PURE__*/React.createElement("div", {
@@ -149,10 +146,24 @@ var EventFilter = function EventFilter(props) {
     showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,
+    destroyPopupOnHide: true,
     value: {
       event: event
     },
     onChange: onChangeEvent,
+    filter: function filter(event) {
+      if (!props.subject) return true;
+      var propMatch = false;
+      for (var i = 0; i < event.attrList.length; i++) {
+        var _props$subject;
+        var attr = event.attrList[i];
+        if (attr.label === ((_props$subject = props.subject) === null || _props$subject === void 0 ? void 0 : _props$subject.subjectName)) {
+          propMatch = true;
+          break;
+        }
+      }
+      return propMatch;
+    },
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
   }), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
     placement: "top",
@@ -163,28 +174,13 @@ var EventFilter = function EventFilter(props) {
     onClick: function onClick() {
       return onAdd();
     }
-  }))), props !== null && props !== void 0 && props.relevancy ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
-    placement: "top",
-    title: props.relevancyFl ? '请选择开始和结束事件' : ''
-  }, /*#__PURE__*/React.createElement(Switch, {
-    size: "default",
-    style: {
-      marginLeft: 24
-    },
-    checked: relevancy && !props.relevancyFl,
-    disabled: props.relevancyFl,
-    onChange: function onChange(checked) {
-      return setRelevancy(checked);
-    }
-  })), /*#__PURE__*/React.createElement("span", {
-    className: "switch-title"
-  }, "\u8BBE\u7F6E\u5173\u8054\u5C5E\u6027")) : ''), (filter || isAdd) && /*#__PURE__*/React.createElement("div", {
+  })))), (filter || isAdd) && /*#__PURE__*/React.createElement("div", {
     className: "".concat(count > 0 ? 'attr-box-show' : '', " top")
   }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filter,
-    onlyAnd: true,
     enableEventProp: true,
+    enableUserProp: props.analysisType === 'user',
     enableDelete: true,
     eventIdList: [event.id],
     onChange: onChangeFilters,

package/dist/esm/components/eventFilter/styles/index.less

@@ -1,39 +1,39 @@
-.interval-box {
-  > :nth-child(1) {
-    display: flex;
-    gap: 16px;
-    align-items: center;
-    margin-bottom: 0 !important;
-    .biz-event-select,
-    .biz-attr-select {
-      width: 208px;
-    }
-
-    .shaixuan {
-      margin-top: 2px;
-      color: #9aa1a9;
-      font-size: 20px !important;
-      cursor: pointer;
-    }
-
-    .shaixuan:hover {
-      color: #165dff;
-    }
-
-    .disable {
-      color: #ccd0d4 !important;
-      cursor: not-allowed !important;
-    }
-
-    .switch-title {
-      margin-left: -8px;
-      color: var(--io-n-8, #354354);
-      font-weight: 400;
-      font-size: 14px;
-      font-family: PingFang SC;
-      font-style: normal;
-      line-height: normal;
-      letter-spacing: 1px;
-    }
-  }
-}
+.interval-box {
+  > :nth-child(1) {
+    display: flex;
+    gap: 16px;
+    align-items: center;
+    margin-bottom: 0 !important;
+    .biz-event-select,
+    .biz-attr-select {
+      width: 208px;
+    }
+
+    .shaixuan {
+      margin-top: 2px;
+      color: #9aa1a9;
+      font-size: 20px !important;
+      cursor: pointer;
+    }
+
+    .shaixuan:hover {
+      color: #165dff;
+    }
+
+    .disable {
+      color: #ccd0d4 !important;
+      cursor: not-allowed !important;
+    }
+
+    .switch-title {
+      margin-left: -8px;
+      color: var(--io-n-8, #354354);
+      font-weight: 400;
+      font-size: 14px;
+      font-family: PingFang SC;
+      font-style: normal;
+      line-height: normal;
+      letter-spacing: 1px;
+    }
+  }
+}

package/dist/esm/components/eventFilter/types.d.ts

@@ -1,3 +1,4 @@
+import SubjectTypes from '@zgfe/business-lib/es/hooks/types/subject';
 import { eventProps } from '../../types';
 /**
  *  事件属性
@@ -46,7 +47,7 @@ export interface ConditionsnProps {
 export interface EventFilterProps {
     id?: string;
     value?: eventProps;
-    relevancyFl?: boolean;
-    relevancy?: boolean;
-    onChange?: (event: eventProps) => {};
+    subject?: SubjectTypes.Subject;
+    analysisType?: 'user' | 'eventProp';
+    onChange?: (event: eventProps) => void;
 }

package/dist/esm/components/renderContent/styles/index.less

@@ -1,33 +1,36 @@
-.render-content-interval {
-  &-chart-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-
-    .echarts-for-react {
-      width: 100%;
-      background: #fff;
-      border: 1px solid var(--unnamed, #ecedf0);
-      border-radius: 8px;
-    }
-  }
-
-  &-MiNone {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 368px;
-    padding: 24px 16px;
-    border: 1px solid #ecedf0;
-    border-radius: 8px;
-  }
-
-  &-spin-container {
-    display: flex !important;
-    align-items: center;
-    justify-content: center;
-    min-height: 300px;
-  }
-}
+.render-content-interval {
+  &-chart-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+
+    .echarts-for-react {
+      width: 100%;
+      background: #fff;
+      border: 1px solid var(--unnamed, #ecedf0);
+      border-radius: 8px;
+    }
+  }
+
+  &-MiNone {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 368px;
+    padding: 24px 16px;
+    border: 1px solid #ecedf0;
+    border-radius: 8px;
+  }
+
+  &-spin-container {
+    display: flex !important;
+    align-items: center;
+    justify-content: center;
+    min-height: 300px;
+    .biz-loading-wrapper {
+      width: 100%;
+    }
+  }
+}

package/dist/esm/components/searchPanel/index.js

@@ -13,12 +13,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizDatePicker, BizSelect } from '@zgfe/business-lib';
 import React, { useContext, useEffect, useState } from 'react';
 import { chartTypeOptions, getInitDate } from "../../constants";
-import { EventContext } from "../../types";
+import { IntervalContext } from "../../types";
 import "./styles/index.less";
 import { extractNames } from "../../utils/formData";
 var classPrefix = 'search-panel-interval';
 var SearchPanel = function SearchPanel(props) {
-  var _useContext = useContext(EventContext),
+  var _useContext = useContext(IntervalContext),
     includeToday = _useContext.includeToday;
   // 当前时间段
   var _useState = useState(props.time || getInitDate(includeToday)),
@@ -105,9 +105,8 @@ var SearchPanel = function SearchPanel(props) {
       display: 'flex'
     }
   }, /*#__PURE__*/React.createElement(BizDatePicker, {
-    dateTypeList: ['day', 'week', 'month'],
+    dateTypeList: ['day', 'week', 'month', 'custom'],
     value: time,
-    mode: "simple",
     includeToday: true,
     onChange: onChangeTime
   }), /*#__PURE__*/React.createElement(BizSelect, {

package/dist/esm/components/searchPanel/styles/index.less

@@ -1,64 +1,64 @@
-.search-panel-interval {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 32px;
-  margin-bottom: 24px;
-
-  .biz-date-picker-wrap-list {
-    font-size: 14px;
-  }
-
-  &-search-right {
-    display: flex;
-  }
-
-  &-select {
-    width: 208px;
-    margin-left: 16px;
-
-    .biz-select-handle-input-multiple {
-      .ant-tag:not(:nth-child(-n + 3)) {
-        display: none;
-      }
-    }
-  }
-}
-
-.interval-select-overlay {
-  .biz-select-option.biz-select-option-multiple:hover:not(.disabled) {
-    color: var(--1, #021429);
-    background: var(--io-i-1, #e8efff);
-  }
-
-  .biz-select-overlay {
-    padding: 0;
-  }
-
-  .biz-select-list-panel {
-    display: grid;
-    gap: 8px;
-  }
-
-  .biz-select-option {
-    padding: 0 16px;
-    border-radius: 0;
-  }
-
-  .biz-select-option.biz-select-option-multiple.active:not(.disabled) {
-    color: var(--1, #021429);
-  }
-
-  .biz-select-option.biz-select-option-multiple:hover:not(.disabled) .biz-select-checkbox {
-    color: #ccd0d4;
-  }
-
-  .biz-select-option.biz-select-option-multiple.active:hover:not(.disabled) .biz-select-checkbox {
-    color: #165dff;
-  }
-
-  .biz-select-option.biz-select-option-multiple:active:not(.disabled) {
-    color: #165dff;
-    background: var(--io-i-1, #e8efff);
-  }
-}
+.search-panel-interval {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 32px;
+  margin-bottom: 24px;
+
+  .biz-date-picker-wrap-list {
+    font-size: 14px;
+  }
+
+  &-search-right {
+    display: flex;
+  }
+
+  &-select {
+    width: 208px;
+    margin-left: 16px;
+
+    .biz-select-handle-input-multiple {
+      .ant-tag:not(:nth-child(-n + 3)) {
+        display: none;
+      }
+    }
+  }
+}
+
+.interval-select-overlay {
+  .biz-select-option.biz-select-option-multiple:hover:not(.disabled) {
+    color: var(--1, #021429);
+    background: var(--io-i-1, #e8efff);
+  }
+
+  .biz-select-overlay {
+    padding: 0;
+  }
+
+  .biz-select-list-panel {
+    display: grid;
+    gap: 8px;
+  }
+
+  .biz-select-option {
+    padding: 0 16px;
+    border-radius: 0;
+  }
+
+  .biz-select-option.biz-select-option-multiple.active:not(.disabled) {
+    color: var(--1, #021429);
+  }
+
+  .biz-select-option.biz-select-option-multiple:hover:not(.disabled) .biz-select-checkbox {
+    color: #ccd0d4;
+  }
+
+  .biz-select-option.biz-select-option-multiple.active:hover:not(.disabled) .biz-select-checkbox {
+    color: #165dff;
+  }
+
+  .biz-select-option.biz-select-option-multiple:active:not(.disabled) {
+    color: #165dff;
+    background: var(--io-i-1, #e8efff);
+  }
+}

package/dist/esm/components/table/index.js

@@ -17,7 +17,7 @@ import { message } from 'antd';
 import { formTableData, getColumns } from "../../utils/formData";
 import "./styles/index.less";
 import { searchDataParams } from "../../modules/content/utils";
-import { EventContext } from "../../types";
+import { IntervalContext } from "../../types";
 var classPrefix = 'mi-interval-table';
 var EventTable = function EventTable(props) {
   var _dataSource$appData2;
@@ -36,8 +36,9 @@ var EventTable = function EventTable(props) {
     eventEnvList = _useContext.eventEnvList,
     userPropList = _useContext.userPropList,
     authority = _useContext.authority;
-  var _useContext2 = useContext(EventContext),
-    panelName = _useContext2.panelName;
+  var _useContext2 = useContext(IntervalContext),
+    panelName = _useContext2.panelName,
+    onUserDrill = _useContext2.onUserDrill;
 
   // 按属性排序后的数据（用于合并行）
   var _useState3 = useState({
@@ -70,7 +71,7 @@ var EventTable = function EventTable(props) {
     var _dataSource$appData;
     var _searchData$userGroup = searchData.userGroup,
       userGroup = _searchData$userGroup === void 0 ? [0] : _searchData$userGroup;
-    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : _dataSource$appData.x_axis) || [], dataSource, userGroup, searchData, showList);
+    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : _dataSource$appData.x_axis) || [], dataSource, userGroup, searchData, showList, onUserDrill);
     return _getColumns;
   }, [dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData2 = dataSource.appData) === null || _dataSource$appData2 === void 0 ? void 0 : _dataSource$appData2.x_axis, showList, sortTable, panelName]);