@zgfe/modules-interval 1.0.11-zhongbang.8 → 1.0.23-zhongyuan.1

package/dist/esm/modules/topPanel/index.js

@@ -10,9 +10,9 @@ 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 React, { useContext, useState } from 'react';
-import { Form, Button, Radio, Space, Switch } from 'antd';
-import { BizAttributeSelector, BizSelect, BizUserGroupHeader } from '@zgfe/business-lib';
+import React, { useContext, useEffect, useState } from 'react';
+import { Form, Button, Radio, Space, Switch, Tooltip } from 'antd';
+import { BizAttributeSelector, BizGlobalDataContext, BizSelect, BizUserGroupHeader, IconFont, useSubject } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
 import { AnalysisMode } from "./types";
@@ -24,6 +24,8 @@ var TopPanel = function TopPanel(props) {
     loading = props.loading,
     collapseRef = props.collapseRef,
     finalSearchData = props.finalSearchData;
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -40,8 +42,11 @@ var TopPanel = function TopPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     relevancy = _useState6[0],
     setRelevancy = _useState6[1];
-  var _useContext = useContext(IntervalContext),
-    subjectEnable = _useContext.subjectEnable;
+  var _useSubject = useSubject(),
+    subjectList = _useSubject.subjectList,
+    subjectLoading = _useSubject.loading;
+  var _useContext2 = useContext(IntervalContext),
+    subjectEnable = _useContext2.subjectEnable;
   var _ref = defaultValue || {},
     userGroup = _ref.userGroup;
   var _useState7 = useState('user'),
@@ -52,6 +57,10 @@ var TopPanel = function TopPanel(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     currentSubject = _useState10[0],
     setCurrentSubject = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    inited = _useState12[0],
+    setInited = _useState12[1];
   var formRef = React.useRef(null);
   function onSearch(values) {
     if (props.onChange) {
@@ -90,6 +99,27 @@ var TopPanel = function TopPanel(props) {
       associatedNextAttr: undefined
     }, true);
   };
+  useEffect(function () {
+    if (subjectLoading) return;
+    if (!defaultValue) {
+      setInited(true);
+      return;
+    }
+    setInited(false);
+    if (defaultValue.analysisSubject) {
+      setAnalysisType('eventProp');
+    } else {
+      setAnalysisType('user');
+    }
+    if (defaultValue.analysisSubject) {
+      setCurrentSubject(subjectList.find(function (item) {
+        var _defaultValue$analysi;
+        return item.id === (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$analysi = defaultValue.analysisSubject) === null || _defaultValue$analysi === void 0 ? void 0 : _defaultValue$analysi.subjectId);
+      }));
+    }
+    setInited(true);
+  }, [subjectLoading]);
+  if (!inited) return null;
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     ref: formRef,
@@ -127,11 +157,21 @@ var TopPanel = function TopPanel(props) {
     scrollToFirstError: true,
     onFinish: onSearch
   }, subjectEnable && /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u5206\u6790\u4E3B\u4F53",
+    label: /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-label-hasIcon")
+    }, /*#__PURE__*/React.createElement("span", null, "\u7EDF\u8BA1\u53E3\u5F84"), "\xA0\xA0", /*#__PURE__*/React.createElement(Tooltip, {
+      title: "\u5E2E\u52A9",
+      placement: "top"
+    }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "bangzhu",
+      onClick: function onClick() {
+        return window.open('https://docs.zhugeio.com/datamanager/Statistical_caliber.html', '_blank');
+      }
+    }))),
     className: "panel-form-interval-item"
   }, /*#__PURE__*/React.createElement(BizSelect, {
     options: [{
-      label: '用户',
+      label: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) != 'user' ? '主体' : '用户',
       value: 'user'
     }, {
       label: '事件属性',
@@ -145,6 +185,31 @@ var TopPanel = function TopPanel(props) {
       setAnalysisType(val.value);
       resetting();
     }
+  })), analysisType === 'eventProp' && /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u53E3\u5F84\u540D\u79F0",
+    name: "analysisSubject",
+    className: "panel-form-interval-item",
+    rules: [{
+      validator: function validator(rule, value) {
+        if (!value) {
+          return Promise.reject('请选择口径名称');
+        }
+        return Promise.resolve();
+      }
+    }]
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    options: subjectList,
+    aliasField: "subjectAlias",
+    labelField: "subjectName",
+    keyField: "id",
+    onChange: function onChange(val) {
+      var _formRef$current, _formRef$current2, _formRef$current3;
+      setCurrentSubject(val);
+      setRelevancy(false);
+      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('start', undefined);
+      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('end', undefined);
+      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('dimension', undefined);
+    }
   })), analysisType === 'user' && /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
     name: "userGroup",
@@ -195,9 +260,9 @@ var TopPanel = function TopPanel(props) {
     key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
     analysisType: analysisType,
     onChange: function onChange(evt) {
-      var _formRef$current;
+      var _formRef$current4;
       setStartEvent(evt);
-      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('dimension', undefined);
+      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Space, {
     align: "baseline",
@@ -242,8 +307,8 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-pre"),
     onDelete: function onDelete() {
-      var _formRef$current2;
-      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('associatedPreAttr', undefined);
+      var _formRef$current5;
+      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedPreAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: "associated-label"
@@ -265,8 +330,8 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-next"),
     onDelete: function onDelete() {
-      var _formRef$current3;
-      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('associatedNextAttr', undefined);
+      var _formRef$current6;
+      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedNextAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement("i", {
     style: {
@@ -275,9 +340,9 @@ var TopPanel = function TopPanel(props) {
       cursor: 'pointer'
     },
     onClick: function onClick() {
-      var _formRef$current4, _formRef$current5;
-      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('associatedPreAttr', undefined);
-      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedNextAttr', undefined);
+      var _formRef$current7, _formRef$current8;
+      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('associatedPreAttr', undefined);
+      (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setFieldValue('associatedNextAttr', undefined);
       setRelevancy(false);
     },
     className: "bsicon qingchu"
@@ -310,9 +375,9 @@ var TopPanel = function TopPanel(props) {
     analysisType: analysisType,
     key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
     onChange: function onChange(val) {
-      var _formRef$current6;
+      var _formRef$current9;
       setEndEvent(val);
-      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('dimension', undefined);
+      (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
@@ -327,8 +392,8 @@ var TopPanel = function TopPanel(props) {
     showCommonProp: true,
     enableDelete: true,
     onDelete: function onDelete() {
-      var _formRef$current7;
-      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('dimension', undefined);
+      var _formRef$current10;
+      (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : _formRef$current10.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u6A21\u578B",
@@ -343,11 +408,11 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
-    loading: loading,
+    loading: loading || subjectLoading,
     type: "primary",
     onClick: function onClick() {
-      var _formRef$current8;
-      (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.submit();
+      var _formRef$current11;
+      (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.submit();
     }
   }, "\u67E5\u8BE2"))));
 };

package/dist/esm/modules/topPanel/styles/index.less

@@ -1,213 +1,219 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.top-panel-interval {
-  &-form-botton-box {
-    display: flex;
-    justify-content: flex-end;
-    margin-top: 24px;
-    margin-right: 24px;
-
-    > :nth-child(1) {
-      margin-right: 16px;
-      color: #fff;
-      background-color: #29bd52;
-      border-color: #29bd52;
-    }
-  }
-}
-
-.panel-form-interval {
-  .ant-form-item-explain-error {
-    margin-left: 24px;
-  }
-  &-item {
-    .ant-form-item-label {
-      padding-left: 24px !important;
-      font-weight: 500;
-    }
-    .ant-form-item-control-input-content {
-      height: 40px;
-      padding: 0 24px !important;
-      line-height: 40px !important;
-      .biz-select-handle {
-        display: inline-block;
-        width: 208px;
-      }
-      span.ant-radio + * {
-        padding-right: 40px;
-        padding-left: 12px;
-      }
-      &:hover {
-        background-color: #e8efff;
-      }
-    }
-  }
-  .interval-item {
-    margin-top: -2px;
-    .ant-space-vertical {
-      gap: 0px !important;
-      width: 100%;
-      .ant-space-item:nth-child(1) {
-        padding: 0 12px;
-      }
-
-      .ant-space-item:nth-child(2) {
-        display: flex;
-        align-items: center;
-        height: 42px;
-        margin-top: 4px;
-        padding: 0 12px;
-      }
-
-      .ant-space-item:nth-child(2):hover {
-        background-color: #e8efff;
-      }
-    }
-  }
-
-  .biz-user-group-header {
-    padding: 0;
-    background-color: #fff;
-  }
-
-  .space-item {
-    .ant-space-item {
-      .biz-user-group {
-        width: 100%;
-        min-width: 208px;
-      }
-    }
-
-    .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
-      display: none;
-    }
-  }
-
-  .collapseRefs {
-    .ant-form-item {
-      margin-bottom: 16px;
-    }
-
-    .ant-form-item-control-input {
-      display: flex;
-      align-items: center;
-    }
-
-    .ant-form-item-label {
-      padding-left: 24px;
-      font-weight: 500;
-    }
-
-    .interval-box {
-      > div:nth-child(1) {
-        padding: 4px 24px;
-      }
-
-      > div:nth-child(1):hover {
-        background-color: #e8efff;
-      }
-
-      .biz-attr-condition-group-handle {
-        margin-right: 0;
-        margin-left: 32px;
-      }
-
-      .biz-attr-condition-group-container {
-        gap: 0px !important;
-      }
-
-      .biz-attr-condition-group-container-item {
-        max-width: calc(100% + 32px) !important;
-        margin-top: 4px;
-        padding: 4px 56px;
-        .ant-space-item {
-          width: auto;
-          max-width: auto;
-          margin-left: 0px;
-          padding: 0;
-        }
-      }
-
-      .ant-space-item:hover {
-        background-color: #e8efff;
-      }
-    }
-
-    .dimension-interval {
-      .ant-form-item-control-input {
-        padding: 4px 24px;
-      }
-
-      .ant-form-item-control-input:hover {
-        background-color: #e8efff;
-      }
-    }
-  }
-
-  .biz-event-select {
-    width: 208px;
-  }
-
-  > .ant-form-item {
-    margin-bottom: 16px;
-    .biz-user-group-val {
-      color: #021429;
-    }
-  }
-
-  .associated {
-    margin-top: -10px;
-    margin-bottom: 12px;
-
-    .qingchu {
-      color: #9aa1a9;
-    }
-
-    .qingchu:hover {
-      color: @error-color;
-    }
-
-    .ant-form-item-control-input {
-      padding: 4px 24px;
-
-      .ant-form-item-control-input {
-        padding: 0;
-      }
-
-      .ant-form-item {
-        margin-bottom: 0;
-      }
-    }
-
-    .ant-form-item-control-input:hover {
-      background-color: #e8efff;
-    }
-
-    .associated-link {
-      display: block;
-      line-height: 32px;
-    }
-
-    .ant-form-item-row {
-      flex-direction: inherit;
-    }
-
-    .ant-form-item-control-input-content {
-      display: flex;
-      gap: 12px;
-    }
-
-    .associated-label {
-      color: var(--3, #5f6085);
-      font-weight: 400;
-      font-size: 14px;
-      font-family: PingFang SC;
-      font-style: normal;
-      line-height: 32px;
-      text-align: right;
-    }
-    .ant-form-item-explain-error {
-      margin-left: 0 !important;
-    }
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.top-panel-interval {
+  &-form-botton-box {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 24px;
+    margin-right: 24px;
+
+    > :nth-child(1) {
+      margin-right: 16px;
+      color: #fff;
+      background-color: #29bd52;
+      border-color: #29bd52;
+    }
+  }
+
+  &-label-hasIcon {
+    .bsicon {
+      cursor: pointer;
+    }
+  }
+}
+
+.panel-form-interval {
+  .ant-form-item-explain-error {
+    margin-left: 24px;
+  }
+  &-item {
+    .ant-form-item-label {
+      padding-left: 24px !important;
+      font-weight: 500;
+    }
+    .ant-form-item-control-input-content {
+      height: 40px;
+      padding: 0 24px !important;
+      line-height: 40px !important;
+      .biz-select-handle {
+        display: inline-block;
+        width: 208px;
+      }
+      span.ant-radio + * {
+        padding-right: 40px;
+        padding-left: 12px;
+      }
+      &:hover {
+        background-color: #e8efff;
+      }
+    }
+  }
+  .interval-item {
+    margin-top: -2px;
+    .ant-space-vertical {
+      gap: 0px !important;
+      width: 100%;
+      .ant-space-item:nth-child(1) {
+        padding: 0 12px;
+      }
+
+      .ant-space-item:nth-child(2) {
+        display: flex;
+        align-items: center;
+        height: 42px;
+        margin-top: 4px;
+        padding: 0 12px;
+      }
+
+      .ant-space-item:nth-child(2):hover {
+        background-color: #e8efff;
+      }
+    }
+  }
+
+  .biz-user-group-header {
+    padding: 0;
+    background-color: #fff;
+  }
+
+  .space-item {
+    .ant-space-item {
+      .biz-user-group {
+        width: 100%;
+        min-width: 208px;
+      }
+    }
+
+    .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
+      display: none;
+    }
+  }
+
+  .collapseRefs {
+    .ant-form-item {
+      margin-bottom: 16px;
+    }
+
+    .ant-form-item-control-input {
+      display: flex;
+      align-items: center;
+    }
+
+    .ant-form-item-label {
+      padding-left: 24px;
+      font-weight: 500;
+    }
+
+    .interval-box {
+      > div:nth-child(1) {
+        padding: 4px 24px;
+      }
+
+      > div:nth-child(1):hover {
+        background-color: #e8efff;
+      }
+
+      .biz-attr-condition-group-handle {
+        margin-right: 0;
+        margin-left: 32px;
+      }
+
+      .biz-attr-condition-group-container {
+        gap: 0px !important;
+      }
+
+      .biz-attr-condition-group-container-item {
+        max-width: calc(100% + 32px) !important;
+        margin-top: 4px;
+        padding: 4px 56px;
+        .ant-space-item {
+          width: auto;
+          max-width: auto;
+          margin-left: 0px;
+          padding: 0;
+        }
+      }
+
+      .ant-space-item:hover {
+        background-color: #e8efff;
+      }
+    }
+
+    .dimension-interval {
+      .ant-form-item-control-input {
+        padding: 4px 24px;
+      }
+
+      .ant-form-item-control-input:hover {
+        background-color: #e8efff;
+      }
+    }
+  }
+
+  .biz-event-select {
+    width: 208px;
+  }
+
+  > .ant-form-item {
+    margin-bottom: 16px;
+    .biz-user-group-val {
+      color: #021429;
+    }
+  }
+
+  .associated {
+    margin-top: -10px;
+    margin-bottom: 12px;
+
+    .qingchu {
+      color: #9aa1a9;
+    }
+
+    .qingchu:hover {
+      color: @error-color;
+    }
+
+    .ant-form-item-control-input {
+      padding: 4px 24px;
+
+      .ant-form-item-control-input {
+        padding: 0;
+      }
+
+      .ant-form-item {
+        margin-bottom: 0;
+      }
+    }
+
+    .ant-form-item-control-input:hover {
+      background-color: #e8efff;
+    }
+
+    .associated-link {
+      display: block;
+      line-height: 32px;
+    }
+
+    .ant-form-item-row {
+      flex-direction: inherit;
+    }
+
+    .ant-form-item-control-input-content {
+      display: flex;
+      gap: 12px;
+    }
+
+    .associated-label {
+      color: var(--3, #5f6085);
+      font-weight: 400;
+      font-size: 14px;
+      font-family: PingFang SC;
+      font-style: normal;
+      line-height: 32px;
+      text-align: right;
+    }
+    .ant-form-item-explain-error {
+      margin-left: 0 !important;
+    }
+  }
+}