@zgfe/modules-interval 1.0.3-alpha.0 → 1.0.3-alpha.10

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

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Switch, Tooltip, message } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
-import { BizEventSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
+import { BizEventSelector, IconFont, BizAttrConditionGroup, useChanged } from '@zgfe/business-lib';
 import "./styles/index.less";
 import _ from 'lodash';
 var classPrefix = 'interval-box';
@@ -59,7 +59,7 @@ var EventFilter = function EventFilter(props) {
     setBizAttributeSelectorValue = _useState14[1];
 
   // 初始化
-  useEffect(function () {
+  useChanged(function () {
     if (props.value) {
       var _data = props.value;
       if (_data && _data.id) {
@@ -80,8 +80,17 @@ var EventFilter = function EventFilter(props) {
           key: _data.dimension.propCategory === 'eventProp' ? _data.dimension.value : _data.dimension.propCategory + '-' + _data.dimension.value
         }));
       }
+    } else {
+      setEvent({
+        id: null,
+        name: ''
+      });
+      setEventOverview(false);
+      setFilter(undefined);
+      setBizAttributeSelectorValue(undefined);
+      setRelevancy(false);
     }
-  }, []);
+  }, props.value);
 
   // 添加筛选
   var onAdd = function onAdd() {
@@ -149,10 +158,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",
@@ -183,8 +206,8 @@ var EventFilter = function EventFilter(props) {
   }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filter,
-    onlyAnd: true,
     enableEventProp: true,
+    enableUserProp: props.subject ? false : true,
     enableDelete: true,
     eventIdList: [event.id],
     onChange: onChangeFilters,

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';
 /**
  *  事件属性
@@ -48,5 +49,6 @@ export interface EventFilterProps {
     value?: eventProps;
     relevancyFl?: boolean;
     relevancy?: boolean;
+    subject?: SubjectTypes.Subject;
     onChange?: (event: eventProps) => {};
 }

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,
     selectRange: 365

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;
@@ -35,8 +35,9 @@ var EventTable = function EventTable(props) {
     eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou,
     eventEnvList = _useContext.eventEnvList,
     userPropList = _useContext.userPropList;
-  var _useContext2 = useContext(EventContext),
-    panelName = _useContext2.panelName;
+  var _useContext2 = useContext(IntervalContext),
+    panelName = _useContext2.panelName,
+    onUserDrill = _useContext2.onUserDrill;
 
   // 按属性排序后的数据（用于合并行）
   var _useState3 = useState({
@@ -69,7 +70,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]);
 

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

@@ -14,12 +14,12 @@ import { Button } from 'antd';
 import React, { useContext, useEffect, useState } from 'react';
 import { BizAddToPanel, BizAddToScene, BizGlobalDataContext } from '@zgfe/business-lib';
 import "./styles/index.less";
-import { EventContext } from "../../types";
+import { IntervalContext } from "../../types";
 import { chartTypes, platformOption } from "../../constants/fields";
 import { appVersionType } from '@zgfe/business-lib/es/context';
 var classPrefix = 'modules-interval-topbar';
 var TopBar = function TopBar(props) {
-  var _useContext = useContext(EventContext),
+  var _useContext = useContext(IntervalContext),
     panelId = _useContext.panelId,
     afterEditTarget = _useContext.afterEditTarget,
     enableAddScene = _useContext.enableAddScene;
@@ -118,7 +118,7 @@ var TopBar = function TopBar(props) {
     type: "primary",
     disabled: showLoading,
     onClick: function onClick() {
-      props.onUserDrill({
+      props.onJumpWarning({
         appId: Number(currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId),
         module: 'interval',
         platform: 0,

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

@@ -1,4 +1,5 @@
-import { ResponseDataProps, SearchValue, UserDrillParamsProp } from '../../types';
+import { IntervalProps } from '../../modules/home/types';
+import { ResponseDataProps, SearchValue } from '../../types';
 export interface TopBarProps {
     /**
      * @description   标题
@@ -6,6 +7,6 @@ export interface TopBarProps {
     searchData?: SearchValue;
     loading?: boolean;
     eventData?: ResponseDataProps;
-    onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
+    onJumpWarning: IntervalProps.Props['onJumpWarning'];
     platformChange: (data: number) => void;
 }

package/dist/esm/constants/apis.js

@@ -2,7 +2,15 @@ var Apis = {
   dataList: '/interval/intervalData',
   getEventDataSql: '/dataSql/getEventDataSql',
   eventDownloadReport: '/interval/downLoadintervalData',
-  querySubject: '/analysisSubject/queryAllSubject'
+  /**
+   * 用户下钻
+   */
+  userDrill: '/interval/userDrill',
+  /**
+   * 主体下钻
+   */
+  subjectDrill: '/interval/eventDrill',
+  querySubjectDisplay: '/analysisSubject/querySubDisplay'
 };
 for (var key in Apis) {
   Apis[key] = "/zg/web/v2".concat(Apis[key]);

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

@@ -14,7 +14,7 @@ import { ajax, BizGlobalDataContext, BizLayout, BizTargetFromPanelContext } from
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import Request from 'umi-request';
 import TopBar from "../../components/topBar";
-import { EventContext } from "../../types";
+import { IntervalContext } from "../../types";
 import "./styles/index.less";
 import { Apis } from "../../constants";
 import { judgeIsCity, judgeIsArea, getValue, searchDataParams } from "./utils";
@@ -64,7 +64,7 @@ var EventContent = function EventContent(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     eventId = _useState16[0],
     setEventId = _useState16[1];
-  var _useContext2 = useContext(EventContext),
+  var _useContext2 = useContext(IntervalContext),
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
     eventGroupList = _useContext2.eventGroupList,
@@ -88,6 +88,7 @@ var EventContent = function EventContent(props) {
         setIsCity(judgeIsCity(_attrName));
       }
     }
+    if (!searchData || !searchData.analysisModel) return;
     if (timer) clearTimeout(timer);
     var flag = true;
     timer = setTimeout(function () {
@@ -183,7 +184,10 @@ var EventContent = function EventContent(props) {
   var onChangeSearch = function onChangeSearch(data, flag) {
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
-      return _objectSpread(_objectSpread({}, _searchData), data);
+      return _objectSpread(_objectSpread(_objectSpread({}, _searchData), data), {}, {
+        userGroup: data.analysisSubject ? undefined : data.userGroup,
+        analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
+      });
     });
     setAjaxFlag(false);
   };
@@ -192,7 +196,7 @@ var EventContent = function EventContent(props) {
     loading: loading,
     eventData: eventData,
     platformChange: platformChange,
-    onUserDrill: props.onUserDrill
+    onJumpWarning: props.onJumpWarning
   }), /*#__PURE__*/React.createElement(BizLayout, {
     showTitle: false,
     hasCollapse: true,
@@ -202,7 +206,6 @@ var EventContent = function EventContent(props) {
       collapseRef: collapseRef,
       onChange: onChangeSearch,
       defaultValue: searchData,
-      urlParam: props.urlParam,
       ajaxFlag: ajaxFlag,
       loading: loading,
       finalSearchData: finalSearchData,

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

@@ -1,4 +1,5 @@
-import { SearchValue, UserDrillParamsProp } from '../../types';
+import { SearchValue } from '../../types';
+import { IntervalProps } from '../home/types';
 export declare namespace EventContentProps {
     interface Props {
         /**
@@ -9,7 +10,6 @@ export declare namespace EventContentProps {
          * 默认值
          */
         value: SearchValue;
-        urlParam?: SearchValue;
         /**
          * 展示列表
          */
@@ -18,7 +18,8 @@ export declare namespace EventContentProps {
          * 是否查询中
          */
         onSearching?: (flag: boolean) => void;
-        onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
+        onUserDrill: IntervalProps.Props['onUserDrill'];
+        onJumpWarning: IntervalProps.Props['onJumpWarning'];
         /**
          * 查询条件回调
          */

package/dist/esm/modules/content/utils.d.ts

@@ -51,5 +51,7 @@ export declare function searchDataParams(params: any): {
     } | null;
     associatedPreAttr: any;
     associatedNextAttr: any;
+    analysisModel: any;
+    analysisSubject: any;
 };
 export declare function transformData(data: any[][]): string[];

package/dist/esm/modules/content/utils.js

@@ -96,7 +96,9 @@ export function searchDataParams(params) {
       event: (params === null || params === void 0 ? void 0 : (_params$dimension11 = params.dimension) === null || _params$dimension11 === void 0 ? void 0 : _params$dimension11.propCategory) !== 'envProp' ? params === null || params === void 0 ? void 0 : (_params$dimension12 = params.dimension) === null || _params$dimension12 === void 0 ? void 0 : _params$dimension12.eventId : null
     } : null,
     associatedPreAttr: params === null || params === void 0 ? void 0 : (_params$associatedPre = params.associatedPreAttr) === null || _params$associatedPre === void 0 ? void 0 : _params$associatedPre.id,
-    associatedNextAttr: params === null || params === void 0 ? void 0 : (_params$associatedNex = params.associatedNextAttr) === null || _params$associatedNex === void 0 ? void 0 : _params$associatedNex.id
+    associatedNextAttr: params === null || params === void 0 ? void 0 : (_params$associatedNex = params.associatedNextAttr) === null || _params$associatedNex === void 0 ? void 0 : _params$associatedNex.id,
+    analysisModel: params.analysisModel,
+    analysisSubject: params.analysisSubject
   };
 }
 export function transformData(data) {

package/dist/esm/modules/home/demo/index.js

@@ -17,17 +17,11 @@ export default (function () {
     isDetail = _useState2[0],
     setIsDetail = _useState2[1];
   var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    detailParams = _useState4[0],
-    setDetailParams = _useState4[1];
+    _useState4 = _slicedToArray(_useState3, 1),
+    detailParams = _useState4[0];
   var _useState5 = useState(),
-    _useState6 = _slicedToArray(_useState5, 2),
-    searchParams = _useState6[0],
-    setSearchParams = _useState6[1];
-  var _useState7 = useState(),
-    _useState8 = _slicedToArray(_useState7, 2),
-    urlParam = _useState8[0],
-    setUrlParam = _useState8[1];
+    _useState6 = _slicedToArray(_useState5, 1),
+    searchParams = _useState6[0];
   useEffect(function () {
     setGlobalConfig(requestConfig);
   }, []);
@@ -39,15 +33,14 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 204
+    defaultApp: 271
   }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsDetail(false);
     }
   }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleInterval, {
-    defaultValue: searchParams,
-    urlParam: urlParam,
     afterEditTarget: afterEditTarget,
-    onUserDrill: onUserDrill
+    onUserDrill: onUserDrill,
+    onJumpWarning: function onJumpWarning() {}
   }));
 });

package/dist/esm/modules/home/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import './styles/index.less';
-import { EventProps } from './types';
-declare const ModuleInterval: React.FC<EventProps.Props>;
+import { IntervalProps } from './types';
+declare const ModuleInterval: React.FC<IntervalProps.Props>;
 export default ModuleInterval;

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

@@ -12,12 +12,12 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
 import { Spin } from 'antd';
-import { BizGlobalDataContext, BizTargetFromPanel } from '@zgfe/business-lib';
+import { BizGlobalDataContext, BizTargetFromPanel, ajax } from '@zgfe/business-lib';
 import "./styles/index.less";
-import { EventContext } from "../../types";
+import { IntervalContext } from "../../types";
 import { getInitDate } from "../../constants/initData";
 import EventContent from "../content";
-import { chartTypes } from "../../constants";
+import { Apis, chartTypes } from "../../constants";
 var classPrefix = 'interval-module-container';
 var ModuleInterval = function ModuleInterval(props) {
   // 属性
@@ -36,43 +36,52 @@ var ModuleInterval = function ModuleInterval(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var _useState5 = useState(true),
-    _useState6 = _slicedToArray(_useState5, 2),
-    pageLoading = _useState6[0],
-    setPageLoading = _useState6[1];
   // 指标标题
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    title = _useState6[0],
+    setTitle = _useState6[1];
   var _useState7 = useState(),
     _useState8 = _slicedToArray(_useState7, 2),
-    title = _useState8[0],
-    setTitle = _useState8[1];
+    panelId = _useState8[0],
+    setPanelId = _useState8[1];
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    panelId = _useState10[0],
-    setPanelId = _useState10[1];
+    elementId = _useState10[0],
+    setElementId = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    elementId = _useState12[0],
-    setElementId = _useState12[1];
-  var _useState13 = useState(),
+    showList = _useState12[0],
+    setShowList = _useState12[1];
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    showList = _useState14[0],
-    setShowList = _useState14[1];
+    subjectEnable = _useState14[0],
+    setSubjectEnable = _useState14[1];
   // 初始化
   useEffect(function () {
-    setPageLoading(true);
-    // 设置初始值
-    if (!props.defaultValue) {
-      initSearch();
-    } else {
-      setShowList(props.defaultValue.chosen_data);
-      setPanelId(props.defaultValue.panelId);
-      setElementId(props.defaultValue.id);
-      setTitle(props.defaultValue.name);
-      setSearchData(props.defaultValue.data);
-    }
-    setTimeout(function () {
-      setPageLoading(false);
-    }, 0);
+    setLoading(true);
+    ajax(Apis.querySubjectDisplay, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if (!res) return;
+      setSubjectEnable(res.data);
+      // 设置初始值
+      if (!props.defaultValue) {
+        initSearch();
+      } else {
+        setShowList(props.defaultValue.chosen_data);
+        setPanelId(props.defaultValue.panelId);
+        setElementId(props.defaultValue.id);
+        setTitle(props.defaultValue.name);
+        setSearchData(props.defaultValue.data);
+      }
+      setTimeout(function () {
+        setLoading(false);
+      });
+    });
   }, []);
 
   // 查询条件初始化
@@ -83,14 +92,6 @@ var ModuleInterval = function ModuleInterval(props) {
       chartType: 'line'
     });
   };
-
-  // 改变loading
-  var changeLoading = function changeLoading(flag) {
-    setLoading(flag);
-  };
-  if (pageLoading) {
-    return /*#__PURE__*/React.createElement(Spin, null);
-  }
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     wrapperClassName: classPrefix
@@ -112,7 +113,7 @@ var ModuleInterval = function ModuleInterval(props) {
     children: ""
   }), !panelId && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-header-title")
-  }, "\u95F4\u9694\u5206\u6790"), /*#__PURE__*/React.createElement(EventContext.Provider, {
+  }, "\u95F4\u9694\u5206\u6790"), /*#__PURE__*/React.createElement(IntervalContext.Provider, {
     value: {
       panelId: panelId,
       elementId: elementId,
@@ -121,19 +122,21 @@ var ModuleInterval = function ModuleInterval(props) {
       userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
+      subjectEnable: subjectEnable,
       panelName: title,
       includeToday: props.includeToday,
       enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,
-      changeLoading: changeLoading,
+      changeLoading: setLoading,
       afterEditTarget: props.afterEditTarget,
-      onUserDrill: props.onUserDrill
+      onUserDrill: props.onUserDrill,
+      onJumpWarning: props.onJumpWarning
     }
   }, /*#__PURE__*/React.createElement(EventContent, {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,
     value: searchData,
     show: showList,
-    urlParam: props.urlParam,
     onUserDrill: props.onUserDrill,
+    onJumpWarning: props.onJumpWarning,
     onChange: setSearchData,
     initSearch: initSearch
   })));

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

@@ -1,12 +1,11 @@
 /// <reference types="react" />
-import { SearchValue, UserDrillParamsProp } from '../../types';
-export declare namespace EventProps {
+import { SearchValue, IntervalDrillParams } from '../../types';
+export declare namespace IntervalProps {
     interface Props {
         /**
          * @description   默认查询值
          */
         defaultValue?: Value;
-        urlParam?: SearchValue;
         /**
          * @description   看板是否可禁用, true禁用
          */
@@ -23,7 +22,8 @@ export declare namespace EventProps {
         /**
          * 用户钻取
          */
-        onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
+        onUserDrill: (data: IntervalDrillParams, isSubject: boolean) => void;
+        onJumpWarning: (data: Record<string, any>, searchData: SearchValue) => void;
     }
     interface Value {
         /**
@@ -69,6 +69,7 @@ export declare namespace EventProps {
         min?: number;
         perValue?: number;
         peopleNum?: number;
+        names?: string[];
         children?: ColumnsDataType[];
     }
 }

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

@@ -1,2 +1,2 @@
-export var EventProps;
-(function (_EventProps) {})(EventProps || (EventProps = {}));
+export var IntervalProps;
+(function (_IntervalProps) {})(IntervalProps || (IntervalProps = {}));

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

@@ -12,14 +12,14 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useState } from 'react';
 import { Form, Button, Radio } from 'antd';
-import { BizAttributeSelector, BizGlobalDataContext, BizSelect, BizUserGroupHeader, ajax, useChanged } from '@zgfe/business-lib';
+import { BizAttributeSelector, BizSelect, BizUserGroupHeader, useSubject } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
 import { AnalysisMode } from "./types";
-import { Apis } from "../../constants";
+import { IntervalContext } from "../../types";
 var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
-  var _props$urlParam, _props$urlParam2, _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
+  var _props$defaultValue, _props$defaultValue2, _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
   var defaultValue = props.defaultValue,
     loading = props.loading,
     collapseRef = props.collapseRef,
@@ -45,15 +45,26 @@ var TopPanel = function TopPanel(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     relevancyFl = _useState8[0],
     setRelevancyFl = _useState8[1];
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
-  var _ref = defaultValue,
+  var _useSubject = useSubject(),
+    subjectList = _useSubject.subjectList,
+    subjectLoading = _useSubject.loading;
+  var _useContext = useContext(IntervalContext),
+    subjectEnable = _useContext.subjectEnable;
+  var _ref = defaultValue || {},
     userGroup = _ref.userGroup;
   // 细分属性初始值
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
     bizAttributeSelectorValue = _useState10[0],
     setBizAttributeSelectorValue = _useState10[1];
+  var _useState11 = useState('user'),
+    _useState12 = _slicedToArray(_useState11, 2),
+    analysisType = _useState12[0],
+    setAnalysisType = _useState12[1];
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    currentSubject = _useState14[0],
+    setCurrentSubject = _useState14[1];
   // 用户组和事件变更
   var onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
@@ -80,7 +91,14 @@ var TopPanel = function TopPanel(props) {
       _data.userGroup = allData.userGroup;
       if (_data.userGroup.length <= 0) _data.userGroup = [0];
     }
-    props.onChange(allData, (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
+    props.onChange(_objectSpread(_objectSpread({}, allData), {}, {
+      analysisSubject: allData.analysisSubject ? {
+        subjectId: allData.analysisSubject.id,
+        subjectName: allData.analysisSubject.subjectName,
+        subjectAlias: allData.analysisSubject.subjectAlias,
+        unit: allData.analysisSubject.unit
+      } : undefined
+    }), (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
   };
   var resetting = function resetting() {
     form.resetFields();
@@ -94,6 +112,7 @@ var TopPanel = function TopPanel(props) {
       associatedNextAttr: undefined
     });
     setRelevancy(false);
+    setCurrentSubject(undefined);
     props.onChange({
       userGroup: [0],
       start: undefined,
@@ -147,14 +166,6 @@ var TopPanel = function TopPanel(props) {
       });
     }
   };
-  useChanged(function () {
-    ajax(Apis.querySubject, {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id
-      }
-    });
-  }, currentApp === null || currentApp === void 0 ? void 0 : currentApp.id);
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     component: "div",
@@ -162,7 +173,7 @@ var TopPanel = function TopPanel(props) {
     className: "panel-form-interval",
     layout: "vertical",
     initialValues: {
-      userGroup: props !== null && props !== void 0 && (_props$urlParam = props.urlParam) !== null && _props$urlParam !== void 0 && _props$urlParam.userGroup ? props === null || props === void 0 ? void 0 : (_props$urlParam2 = props.urlParam) === null || _props$urlParam2 === void 0 ? void 0 : _props$urlParam2.userGroup : userGroup ? userGroup : [0],
+      userGroup: props !== null && props !== void 0 && (_props$defaultValue = props.defaultValue) !== null && _props$defaultValue !== void 0 && _props$defaultValue.userGroup ? props === null || props === void 0 ? void 0 : (_props$defaultValue2 = props.defaultValue) === null || _props$defaultValue2 === void 0 ? void 0 : _props$defaultValue2.userGroup : userGroup ? userGroup : [0],
       start: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start), {}, {
         relevancy: defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa = defaultValue.associated_next_attr) !== null && _defaultValue$associa !== void 0 && _defaultValue$associa.event_id && defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa2 = defaultValue.associated_pre_attr) !== null && _defaultValue$associa2 !== void 0 && _defaultValue$associa2.event_id || finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso = finalSearchData.associatedNextAttr) !== null && _finalSearchData$asso !== void 0 && _finalSearchData$asso.eventId && finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso2 = finalSearchData.associatedPreAttr) !== null && _finalSearchData$asso2 !== void 0 && _finalSearchData$asso2.eventId ? true : false
       }),
@@ -184,14 +195,15 @@ var TopPanel = function TopPanel(props) {
         isHidden: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi2 = defaultValue.dimension) === null || _defaultValue$dimensi2 === void 0 ? void 0 : _defaultValue$dimensi2.is_hidden) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime2 = finalSearchData.dimension) === null || _finalSearchData$dime2 === void 0 ? void 0 : _finalSearchData$dime2.isHidden),
         propCategory: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi3 = defaultValue.dimension) === null || _defaultValue$dimensi3 === void 0 ? void 0 : _defaultValue$dimensi3.prop_category) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime3 = finalSearchData.dimension) === null || _finalSearchData$dime3 === void 0 ? void 0 : _finalSearchData$dime3.propCategory),
         eventId: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi4 = defaultValue.dimension) === null || _defaultValue$dimensi4 === void 0 ? void 0 : _defaultValue$dimensi4.event_id) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime4 = finalSearchData.dimension) === null || _finalSearchData$dime4 === void 0 ? void 0 : _finalSearchData$dime4.eventId)
-      })
+      }),
+      analysisModel: (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.analysisModel) || AnalysisMode.common
     },
     scrollToFirstError: true,
     onValuesChange: onValuesChange
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u4E3B\u4F53",
     className: "panel-form-interval-item"
-  }, /*#__PURE__*/React.createElement(BizSelect, {
+  }, subjectEnable && /*#__PURE__*/React.createElement(BizSelect, {
     options: [{
       label: '用户',
       value: 'user'
@@ -199,14 +211,31 @@ var TopPanel = function TopPanel(props) {
       label: '事件属性',
       value: 'eventProp'
     }],
-    keyField: "value"
-  })), /*#__PURE__*/React.createElement(Form.Item, {
+    keyField: "value",
+    defaultValue: {
+      value: analysisType
+    },
+    onChange: function onChange(val) {
+      setAnalysisType(val.value);
+      resetting();
+    }
+  })), analysisType === 'eventProp' && /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u4E3B\u4F53\u540D\u79F0",
     name: "analysisSubject",
     className: "panel-form-interval-item"
   }, /*#__PURE__*/React.createElement(BizSelect, {
-    options: []
-  })), /*#__PURE__*/React.createElement(Form.Item, {
+    options: subjectList,
+    aliasField: "subjectAlias",
+    labelField: "subjectName",
+    keyField: "id",
+    onChange: function onChange(val) {
+      setCurrentSubject(val);
+      form.setFieldsValue({
+        start: undefined,
+        end: undefined
+      });
+    }
+  })), analysisType === 'user' && /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
     name: "userGroup",
     className: "space-item interval-item",
@@ -223,8 +252,10 @@ var TopPanel = function TopPanel(props) {
     label: "\u5F00\u59CB\u4E8B\u4EF6",
     name: "start"
   }, /*#__PURE__*/React.createElement(EventFilter, {
+    subject: currentSubject,
     relevancyFl: relevancyFl,
-    relevancy: true
+    relevancy: true,
+    key: "begin"
   })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
     className: "associated"
   }, /*#__PURE__*/React.createElement("span", {
@@ -287,13 +318,16 @@ var TopPanel = function TopPanel(props) {
   })) : '', /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u7ED3\u675F\u4E8B\u4EF6",
     name: "end"
-  }, /*#__PURE__*/React.createElement(EventFilter, null)), /*#__PURE__*/React.createElement(Form.Item, {
+  }, /*#__PURE__*/React.createElement(EventFilter, {
+    subject: currentSubject,
+    key: "end"
+  })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
     name: "dimension",
     className: "dimension-interval"
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
-    enableUserProp: true,
+    enableUserProp: analysisType === 'user',
     enableEnvProp: true,
     eventIdList: startId === endId ? [startId] : [startId, endId],
     value: bizAttributeSelectorValue,
@@ -315,7 +349,7 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
-    loading: loading,
+    loading: loading || subjectLoading,
     disabled: loading || !startId || !endId || relevancy && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr) && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr),
     type: "primary",
     onClick: function onClick() {

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

@@ -1,5 +1,6 @@
 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"
@@ -28,6 +29,7 @@ export interface FormDataProps {
     dimension?: bizAttributeSelectorValueProp;
     associatedPreAttr?: bizAttributeSelectorValueProp;
     associatedNextAttr?: bizAttributeSelectorValueProp;
+    analysisSubject?: SubjectTypes.Subject;
 }
 export interface FormHandelDataProps extends start {
     /**
@@ -40,7 +42,6 @@ export interface TopPanelProps {
      * 默认值
      */
     defaultValue?: SearchValue;
-    urlParam?: SearchValue;
     loading?: boolean;
     /**
      * 数据更新

package/dist/esm/style/index.less

@@ -51,3 +51,17 @@
     }
   }
 }
+.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>;
+}

package/dist/esm/types.js

@@ -16,4 +16,4 @@ var defaultContext = {
   onUserDrill: null,
   defaultSearch: {}
 };
-export var EventContext = /*#__PURE__*/createContext(defaultContext);
+export var IntervalContext = /*#__PURE__*/createContext(defaultContext);

package/dist/esm/utils/formData.d.ts

@@ -1,7 +1,7 @@
 import type { ColumnsType } from 'antd/es/table';
 import { EventGroup, UserProp, EnvProp } from '@zgfe/business-lib/es/attributeSelector/types';
 import { ResponseDataProps, SearchValue, SeriesProps } from '../types';
-import { EventProps } from '../modules/home/types';
+import { IntervalProps } from '../modules/home/types';
 import '../style/index.less';
 import { DisplaySetup } from '../components/searchPanel/types';
 /**
@@ -9,7 +9,7 @@ import { DisplaySetup } from '../components/searchPanel/types';
  * @param columnData xAxis
  * @returns column fields
  */
-export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], dataSource: ResponseDataProps, userGroup: number[], searchData: SearchValue, showList: string[]): ColumnsType<EventProps.ColumnsDataType>;
+export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], dataSource: ResponseDataProps, userGroup: number[], searchData: SearchValue, showList: string[], onUserDrill: IntervalProps.Props['onUserDrill']): ColumnsType<IntervalProps.ColumnsDataType>;
 /**
  * 获取属性的label
  * @param attrData 当前属性
@@ -35,7 +35,9 @@ export declare function formTableData(originalData: ChartData): {
     Q3: number;
     min: number;
     perValue: number;
+    total: number;
     peopleNum: number;
+    names: string[];
 }[] | {
     key: number;
     time: string;
@@ -45,6 +47,7 @@ export declare function formTableData(originalData: ChartData): {
     Q3: number;
     min: number;
     perValue: number;
+    total: number;
     peopleNum: number;
     children: {
         key: string;
@@ -55,7 +58,9 @@ export declare function formTableData(originalData: ChartData): {
         Q3: number;
         min: number;
         perValue: number;
+        total: number;
         peopleNum: number;
+        names: string[];
     }[];
 }[] | undefined;
 type ChartData = {

package/dist/esm/utils/formData.js

@@ -1,19 +1,22 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React from 'react';
 import { chartColors } from "../constants/color";
 import "../style/index.less";
+import { IconFont } from '@zgfe/business-lib';
+import { Apis } from "../constants";
+import { searchDataParams } from "../modules/content/utils";
 var classPrefix = 'interval-form-data';
 function convertToHMS(seconds) {
   var hours = Math.floor(seconds / 3600);
@@ -29,7 +32,7 @@ function convertToHMS(seconds) {
  * @param columnData xAxis
  * @returns column fields
  */
-export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList
+export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList, onUserDrill
 // onClickToDetailCallback: Function,
 ) {
   var _dataSource$appData, _dataSource$appData$s, _searchData$dimension;
@@ -121,7 +124,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
     }
   }, {
-    title: '人均值',
+    title: '均值',
     width: 148,
     ellipsis: true,
     align: 'right',
@@ -136,7 +139,17 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
     }
   }, {
-    title: '人数',
+    title: '合计',
+    width: 148,
+    ellipsis: true,
+    align: 'right',
+    dataIndex: 'total',
+    key: 'total',
+    render: function render(text, record) {
+      return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
+    }
+  }, {
+    title: searchData.analysisSubject ? "".concat(searchData.analysisSubject.subjectAlias || searchData.analysisSubject.subjectName, "\u6570") : '人数',
     width: 148,
     ellipsis: true,
     align: 'right',
@@ -148,7 +161,38 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     key: 'peopleNum',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
-      return /*#__PURE__*/React.createElement("span", null, " ", text);
+      return /*#__PURE__*/React.createElement("span", {
+        className: "interval-drill",
+        onClick: function onClick() {
+          var params;
+          var searchParam = searchDataParams(searchData);
+          // 主体下钻
+          if (searchData.analysisSubject) {
+            params = {
+              url: Apis.subjectDrill,
+              count: Number(text),
+              params: _objectSpread({}, searchParam)
+            };
+          } else {
+            // 用户下钻
+            params = {
+              url: Apis.userDrill,
+              count: Number(text),
+              params: _objectSpread({}, searchParam)
+            };
+          }
+          if (searchParam.dimension) {
+            params.params.groupValue = /\d{4}-\d{2}-\d{2}/.test(record.time || '') ? record.names ? record.names[0] : undefined : record.time;
+          }
+          if (/\d{4}-\d{2}-\d{2}/.test(record.time || '')) {
+            params.params.time.begin = record.time.split('|')[0];
+            params.params.time.end = record.time.split('|')[1] || record.time.split('|')[0];
+          }
+          onUserDrill === null || onUserDrill === void 0 ? void 0 : onUserDrill(params, searchData.analysisSubject ? true : false);
+        }
+      }, /*#__PURE__*/React.createElement(IconFont, {
+        type: "a-yanjingkai"
+      }), " ", text);
     }
   }];
   return data;
@@ -192,7 +236,8 @@ function createNewArray(data) {
         Q3: item.total[3] || 0,
         min: item.total[4] || 0,
         perValue: item.total[5] || 0,
-        peopleNum: item.total[6] || 0,
+        total: item.total[6] || 0,
+        peopleNum: item.total[7] || 0,
         children: getChildrenData(data, i)
       };
     });
@@ -221,7 +266,7 @@ export function convertDateArray(params, dateArray) {
         var resultArray = dateArray.map(function (date) {
           var dateObj = new Date(date);
           var weekday = weekdays[dateObj.getDay()];
-          return "".concat(date, " (").concat(weekday, ")");
+          return "".concat(date).concat(weekday ? " (".concat(weekday, ")") : '');
         });
         return resultArray;
         break;
@@ -245,7 +290,9 @@ function getChildrenData(data, index) {
         Q3: values[i][3] || 0,
         min: values[i][4] || 0,
         perValue: values[i][5] || 0,
-        peopleNum: values[i][6] || 0
+        total: values[i][6] || 0,
+        peopleNum: values[i][7] || 0,
+        names: firstSeries.names
       };
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.3-alpha.0",
+  "version": "1.0.3-alpha.10",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -47,7 +47,7 @@
     "@types/uuid": "^9.0.2",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "^1.1.88",
+    "@zgfe/business-lib": "1.1.89-qirui.10",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "728b3ca2a91011150266aed6e52bcae3ec9962de"
+  "gitHead": "ba968441f35ef1af38f430b93de7e4f344efefa2"
 }