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

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

@@ -1,186 +1,213 @@
-@import '../../../assets/icons/iconfont.css';
-@import '../../../assets/business/iconfont.css';
-
-.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 {
-  .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;
-    }
-  }
-}
+@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;
+    }
+  }
+}

package/dist/esm/modules/topPanel/types.d.ts

@@ -1,5 +1,10 @@
 import { AttrConditionTypes } from '@zgfe/business-lib';
 import { bizAttributeSelectorValueProp, SearchValue } from '../../types';
+import SubjectTypes from '@zgfe/business-lib/es/hooks/types/subject';
+export declare enum AnalysisMode {
+    common = "commonInterval",
+    firstAndLast = "firstLastInterval"
+}
 export interface start {
     eventId?: number;
     id?: number;
@@ -24,6 +29,7 @@ export interface FormDataProps {
     dimension?: bizAttributeSelectorValueProp;
     associatedPreAttr?: bizAttributeSelectorValueProp;
     associatedNextAttr?: bizAttributeSelectorValueProp;
+    analysisSubject?: SubjectTypes.Subject;
 }
 export interface FormHandelDataProps extends start {
     /**
@@ -36,23 +42,14 @@ export interface TopPanelProps {
      * 默认值
      */
     defaultValue?: SearchValue;
-    urlParam?: SearchValue;
     loading?: boolean;
     /**
      * 数据更新
      */
     onChange: (data: SearchValue, flag: boolean) => void;
-    /**
-     * 是否请求数据
-     */
-    ajaxFlag: boolean;
     /**
      * 请求后的最新查询数据
      */
     finalSearchData?: SearchValue;
-    /**
-     * 请求数据方法
-     */
-    fetchRequest: (flag?: boolean) => void;
     collapseRef?: any;
 }

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

@@ -1 +1,5 @@
-export {};
+export var AnalysisMode = /*#__PURE__*/function (AnalysisMode) {
+  AnalysisMode["common"] = "commonInterval";
+  AnalysisMode["firstAndLast"] = "firstLastInterval";
+  return AnalysisMode;
+}({});

package/dist/esm/style/image/ring.svg

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
-<circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
-  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
-</circle>
-<circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
-  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
-</circle>
-<!-- [ldio] generated by https://loading.io/ --></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
+  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
+</circle>
+<circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
+  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
+</circle>
+<!-- [ldio] generated by https://loading.io/ --></svg>

package/dist/esm/style/index.less

@@ -1,53 +1,67 @@
-.interval-form-data {
-  &-table-td {
-    padding: 0 !important;
-
-    .ant-table-column-sorters {
-      justify-content: end !important;
-    }
-
-    &-show {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      min-width: 60px;
-      height: 48px;
-      cursor: pointer;
-
-      span {
-        width: 10px;
-        height: 10px;
-        border-radius: 50%;
-        cursor: pointer;
-      }
-    }
-
-    &-name {
-      display: flex;
-      align-items: center;
-
-      .bsicon {
-        margin-right: 4px;
-        color: #fd9f41;
-      }
-
-      &-content {
-        display: inline-block;
-        max-width: 300px;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        cursor: pointer;
-      }
-    }
-
-    &-link {
-      cursor: pointer;
-
-      &:hover {
-        color: #165dff;
-        text-decoration: underline;
-      }
-    }
-  }
-}
+.interval-form-data {
+  &-table-td {
+    padding: 0 !important;
+
+    .ant-table-column-sorters {
+      justify-content: end !important;
+    }
+
+    &-show {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      min-width: 60px;
+      height: 48px;
+      cursor: pointer;
+
+      span {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        cursor: pointer;
+      }
+    }
+
+    &-name {
+      display: flex;
+      align-items: center;
+
+      .bsicon {
+        margin-right: 4px;
+        color: #fd9f41;
+      }
+
+      &-content {
+        display: inline-block;
+        max-width: 300px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        cursor: pointer;
+      }
+    }
+
+    &-link {
+      cursor: pointer;
+
+      &:hover {
+        color: #165dff;
+        text-decoration: underline;
+      }
+    }
+  }
+}
+.interval-drill {
+  display: block;
+  .bsicon {
+    display: none;
+    margin-right: 4px;
+  }
+  &:hover {
+    color: @primary-color;
+    cursor: pointer;
+    .bsicon {
+      display: inline;
+    }
+  }
+}

package/dist/esm/types.d.ts

@@ -1,7 +1,7 @@
 import { AttrConditionTypes } from '@zgfe/business-lib';
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
 import { ReactNode } from 'react';
-import { FormDataProps, start } from './modules/topPanel/types';
+import { AnalysisMode, FormDataProps, start } from './modules/topPanel/types';
 /**
  * 属性选择器 默认值
  */
@@ -117,36 +117,19 @@ export interface SearchValue {
      * @description  分类
      */
     module?: string;
-}
-export interface UserDrillParamsProp {
-    /**
-     * @description 应用id
-     */
-    appId: number;
-    /**
-     * @description 平台
-     */
-    platform: number;
-    /**
-     * @description  用户数量
-     */
-    count: number;
-    /**
-     * @description 模型类型 整体|事件|漏斗|留存|获取|粘性|崩溃|微信生态-整体|微信生态-小程序
-     */
-    source: string;
-    /**
-     * @description 查询接口
-     */
-    url: string;
     /**
-     * @description 查询对象
+     * 分析模型
      */
-    params?: Record<string, any>;
+    analysisModel?: AnalysisMode;
     /**
-     * @description 间隔分析，数据格式与其他业务不一致，间隔分析单独提出来了，其他业务在data里面
+     * 分析主体
      */
-    module?: string;
+    analysisSubject?: {
+        subjectId: number;
+        subjectName: string;
+        subjectAlias?: string;
+        unit: string;
+    };
 }
 export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map' | 'boxplot';
 /**
@@ -190,4 +173,18 @@ export interface TableChildrenProps {
     name: string;
     values: number[];
 }
-export declare const EventContext: import("react").Context<any>;
+export declare const IntervalContext: import("react").Context<any>;
+export interface IntervalDrillParams {
+    /**
+     * @description  用户数量
+     */
+    count: number;
+    /**
+     * @description 查询接口
+     */
+    url: string;
+    /**
+     * @description 查询对象
+     */
+    params?: Record<string, any>;
+}