@zgfe/modules-interval 1.0.3-alpha.2 → 1.0.3-alpha.20

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

@@ -197,8 +197,8 @@ var EventFilter = function EventFilter(props) {
   }, /*#__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/types.d.ts

@@ -50,5 +50,6 @@ export interface EventFilterProps {
     relevancyFl?: boolean;
     relevancy?: boolean;
     subject?: SubjectTypes.Subject;
+    analysisType?: 'user' | 'eventProp';
     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)),

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,7 +35,7 @@ var EventTable = function EventTable(props) {
     eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou,
     eventEnvList = _useContext.eventEnvList,
     userPropList = _useContext.userPropList;
-  var _useContext2 = useContext(EventContext),
+  var _useContext2 = useContext(IntervalContext),
     panelName = _useContext2.panelName,
     onUserDrill = _useContext2.onUserDrill;
 

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;
@@ -105,7 +105,7 @@ var TopBar = function TopBar(props) {
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
       module: 'interval'
     }, searchData), {}, {
-      chartType: 'line'
+      chartType: 'boxplot'
     }),
     onOk: function onOk(data) {
       return _onOk('scene', data);

package/dist/esm/constants/apis.js

@@ -9,7 +9,8 @@ var Apis = {
   /**
    * 主体下钻
    */
-  subjectDrill: '/interval/eventDrill'
+  subjectDrill: '/interval/eventDrill',
+  querySubjectDisplay: '/analysisSubject/querySubDisplay'
 };
 for (var key in Apis) {
   Apis[key] = "/zg/web/v2".concat(Apis[key]);

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

@@ -97,12 +97,13 @@ var IntervalEventChart = function IntervalEventChart(props) {
     dataSource: dataSource,
     showList: showList,
     dataSourceList: dataSourceList,
-    params: params
-  }), (params === null || params === void 0 ? void 0 : params.chartType) === 'line' ? /*#__PURE__*/React.createElement(EventTable, {
+    params: params,
+    onlyChart: props.onlyChart
+  }), !props.onlyChart && /*#__PURE__*/React.createElement(EventTable, {
     dataSource: dataSource,
     searchData: params,
     showList: [],
     changeShow: onChangeShow
-  }) : null);
+  }));
 };
 export default IntervalEventChart;

package/dist/esm/modules/chart/intervalChart.js

@@ -87,7 +87,7 @@ var IntervalChart = function IntervalChart(props) {
         right: 3,
         height: 20 // 设置内置的dataZoom的高度
       }, {
-        show: (params === null || params === void 0 ? void 0 : params.module) === 'interval' ? false : true,
+        show: props.onlyChart ? false : true,
         type: 'slider',
         bottom: '38px',
         xAxisIndex: [0],

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

@@ -13,6 +13,7 @@ export declare namespace eventChartProps {
          */
         dataSource?: ChartTypesProps;
         dataSourceList?: DisplaySetup[];
+        onlyChart?: boolean;
         /**
          * 查询条件
          */

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";
@@ -56,15 +56,11 @@ var EventContent = function EventContent(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     isCity = _useState12[0],
     setIsCity = _useState12[1];
-  var _useState13 = useState(false),
+  var _useState13 = useState(-1),
     _useState14 = _slicedToArray(_useState13, 2),
-    ajaxFlag = _useState14[0],
-    setAjaxFlag = _useState14[1];
-  var _useState15 = useState(-1),
-    _useState16 = _slicedToArray(_useState15, 2),
-    eventId = _useState16[0],
-    setEventId = _useState16[1];
-  var _useContext2 = useContext(EventContext),
+    eventId = _useState14[0],
+    setEventId = _useState14[1];
+  var _useContext2 = useContext(IntervalContext),
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
     eventGroupList = _useContext2.eventGroupList,
@@ -72,11 +68,17 @@ var EventContent = function EventContent(props) {
     userPropList = _useContext2.userPropList;
   var _useContext3 = useContext(BizTargetFromPanelContext),
     handleSearch = _useContext3.handleSearch;
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    searchTimer = _useState16[0],
+    setSearchTimer = _useState16[1];
   var collapseRef = useRef();
   // 初始化
   useEffect(function () {
     if (props.defaultValue) {
       setEventId(props.defaultValue.id);
+    } else {
+      setLoading(false);
     }
   }, [props.defaultValue]);
   useEffect(function () {
@@ -88,42 +90,28 @@ var EventContent = function EventContent(props) {
         setIsCity(judgeIsCity(_attrName));
       }
     }
-    if (timer) clearTimeout(timer);
-    var flag = true;
-    timer = setTimeout(function () {
-      if (flag) {
-        fetchRequest(false);
-      }
-    }, 500);
+    if (!searchData || !searchData.analysisModel) return;
+    if (searchTimer) clearTimeout(searchTimer);
+    setSearchTimer(setTimeout(function () {
+      fetchRequest();
+    }, 300));
     return function () {
-      // 清理异步任务
-      if (timer) clearTimeout(timer);
-      flag = false;
+      clearTimeout(searchTimer);
     };
   }, [searchData]);
   useEffect(function () {
     handleSearch && handleSearch(loading);
   }, [loading]);
-  useEffect(function () {
-    if (ajaxFlag) {
-      fetchRequest(true);
-    }
-  }, [ajaxFlag]);
+
   // 查询
-  var fetchRequest = function fetchRequest(flag) {
+  var fetchRequest = function fetchRequest() {
     var _searchData$start, _searchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3;
-    if (flag !== undefined) setAjaxFlag(flag);
-    if (!ajaxFlag) return;
     if ((searchData === null || searchData === void 0 ? void 0 : (_searchData$start = searchData.start) === null || _searchData$start === void 0 ? void 0 : _searchData$start.id) === null || (searchData === null || searchData === void 0 ? void 0 : (_searchData$end = searchData.end) === null || _searchData$end === void 0 ? void 0 : _searchData$end.id) === null) {
       setLoading(false);
       return;
     }
     setEventData(undefined);
     setLoading(true);
-    // 取消上次未完成的请求
-    // if (typeof cancel === 'function') {
-    //   cancel();
-    // }
     if (searchData !== null && searchData !== void 0 && (_searchData$associate = searchData.associatedNextAttr) !== null && _searchData$associate !== void 0 && _searchData$associate.type && (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate2 = searchData.associatedPreAttr) === null || _searchData$associate2 === void 0 ? void 0 : _searchData$associate2.type) !== (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate3 = searchData.associatedNextAttr) === null || _searchData$associate3 === void 0 ? void 0 : _searchData$associate3.type)) {
       setLoading(false);
       return message.error('您查询的属性不一致，暂不支持查询');
@@ -159,7 +147,6 @@ var EventContent = function EventContent(props) {
     setSearchData(function (value) {
       return _objectSpread(_objectSpread({}, value), data);
     });
-    setAjaxFlag(true);
   };
 
   // 改变显示内容
@@ -174,9 +161,6 @@ var EventContent = function EventContent(props) {
         platform: data
       });
     });
-    setTimeout(function () {
-      setAjaxFlag(true);
-    }, 100);
   };
 
   // TopPanel组件数值变更
@@ -188,7 +172,6 @@ var EventContent = function EventContent(props) {
         analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
       });
     });
-    setAjaxFlag(false);
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,
@@ -205,11 +188,8 @@ var EventContent = function EventContent(props) {
       collapseRef: collapseRef,
       onChange: onChangeSearch,
       defaultValue: searchData,
-      urlParam: props.urlParam,
-      ajaxFlag: ajaxFlag,
       loading: loading,
-      finalSearchData: finalSearchData,
-      fetchRequest: fetchRequest
+      finalSearchData: finalSearchData
     })
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix

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

@@ -1,4 +1,4 @@
-import { SearchValue, UserDrillParamsProp } from '../../types';
+import { SearchValue } from '../../types';
 import { IntervalProps } from '../home/types';
 export declare namespace EventContentProps {
     interface Props {
@@ -10,7 +10,6 @@ export declare namespace EventContentProps {
          * 默认值
          */
         value: SearchValue;
-        urlParam?: SearchValue;
         /**
          * 展示列表
          */
@@ -19,7 +18,7 @@ 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.js

@@ -91,7 +91,7 @@ export function searchDataParams(params) {
       sub: (params === null || params === void 0 ? void 0 : (_params$dimension2 = params.dimension) === null || _params$dimension2 === void 0 ? void 0 : _params$dimension2.propCategory) === 'userProp' ? 'user_attr' : (params === null || params === void 0 ? void 0 : (_params$dimension3 = params.dimension) === null || _params$dimension3 === void 0 ? void 0 : _params$dimension3.propCategory) === 'eventProp' ? 'event_attr' : params === null || params === void 0 ? void 0 : (_params$dimension4 = params.dimension) === null || _params$dimension4 === void 0 ? void 0 : _params$dimension4.name,
       category: (params === null || params === void 0 ? void 0 : (_params$dimension5 = params.dimension) === null || _params$dimension5 === void 0 ? void 0 : _params$dimension5.category) || 'custom',
       attrId: params === null || params === void 0 ? void 0 : (_params$dimension6 = params.dimension) === null || _params$dimension6 === void 0 ? void 0 : _params$dimension6.id,
-      userAttr: (params === null || params === void 0 ? void 0 : (_params$dimension7 = params.dimension) === null || _params$dimension7 === void 0 ? void 0 : _params$dimension7.propCategory) === 'userProp' ? params === null || params === void 0 ? void 0 : (_params$dimension8 = params.dimension) === null || _params$dimension8 === void 0 ? void 0 : _params$dimension8.dimensionSub : null,
+      userAttr: (params === null || params === void 0 ? void 0 : (_params$dimension7 = params.dimension) === null || _params$dimension7 === void 0 ? void 0 : _params$dimension7.propCategory) === 'userProp' ? params === null || params === void 0 ? void 0 : (_params$dimension8 = params.dimension) === null || _params$dimension8 === void 0 ? void 0 : _params$dimension8.name : null,
       eventAttr: (params === null || params === void 0 ? void 0 : (_params$dimension9 = params.dimension) === null || _params$dimension9 === void 0 ? void 0 : _params$dimension9.propCategory) === 'eventProp' ? params === null || params === void 0 ? void 0 : (_params$dimension10 = params.dimension) === null || _params$dimension10 === void 0 ? void 0 : _params$dimension10.label : null,
       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,

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

@@ -17,7 +17,7 @@ var defaultValue = {
   panelId: 400900,
   panelType: 'edit',
   data: {
-    chartType: 'line',
+    chartType: 'boxplot',
     analysisIndex: 'per',
     id: 7565,
     name: '测试6666',

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);
   }, []);
@@ -45,9 +39,42 @@ export default (function () {
       return setIsDetail(false);
     }
   }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleInterval, {
-    defaultValue: searchParams,
-    urlParam: urlParam,
     afterEditTarget: afterEditTarget,
-    onUserDrill: onUserDrill
+    onUserDrill: onUserDrill,
+    defaultValue: {
+      data: {
+        time: {
+          begin: '2023-08-01',
+          end: '2023-10-18',
+          unit: 'day'
+        },
+        chartType: 'boxplot',
+        start: {
+          id: 7612,
+          name: '间隔事件-01',
+          relevancy: false
+        },
+        end: {
+          id: 7614,
+          name: '间隔事件-02'
+        },
+        dimension: {
+          alias: '',
+          eventId: 7612,
+          id: 151567,
+          isHidden: 0,
+          key: 'eventProp-151567',
+          label: '商品数量',
+          propCategory: 'eventProp',
+          type: 2,
+          realTime: true,
+          dimensionSub: 'event_attr'
+        },
+        userGroups: [0],
+        analysisModel: 'commonInterval',
+        analysisIndex: 'number'
+      }
+    },
+    onJumpWarning: function onJumpWarning() {}
   }));
 });

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

@@ -13,7 +13,7 @@ var defaultValue = {
   data: {
     module: 'event',
     analysisIndex: 'times',
-    chartType: 'line',
+    chartType: 'boxplot',
     name: 'wqeqwe',
     time: {
       unit: 'day',

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);
+      });
+    });
   }, []);
 
   // 查询条件初始化
@@ -80,20 +89,21 @@ var ModuleInterval = function ModuleInterval(props) {
     setSearchData({
       userGroup: (userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.length) > 0 ? [userGroupList[0].id] : [0],
       time: getInitDate(props.includeToday),
-      chartType: 'line'
+      chartType: 'boxplot'
     });
   };
-
-  // 改变loading
-  var changeLoading = function changeLoading(flag) {
-    setLoading(flag);
-  };
-  if (pageLoading) {
-    return /*#__PURE__*/React.createElement(Spin, null);
+  useEffect(function () {
+    if (props.onChange) props.onChange(searchData);
+  }, [searchData]);
+  if (loading) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: classPrefix
+    }, /*#__PURE__*/React.createElement(Spin, {
+      className: "".concat(classPrefix, "-loading")
+    }));
   }
-  return /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading,
-    wrapperClassName: classPrefix
+  return /*#__PURE__*/React.createElement("div", {
+    className: classPrefix
   }, /*#__PURE__*/React.createElement(BizTargetFromPanel, {
     value: panelId ? {
       panelId: panelId,
@@ -112,7 +122,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,10 +131,11 @@ 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,
       onJumpWarning: props.onJumpWarning
@@ -133,7 +144,6 @@ var ModuleInterval = function ModuleInterval(props) {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,
     value: searchData,
     show: showList,
-    urlParam: props.urlParam,
     onUserDrill: props.onUserDrill,
     onJumpWarning: props.onJumpWarning,
     onChange: setSearchData,

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

@@ -8,6 +8,12 @@
   min-width: 1000px;
   height: 100%;
   background: #fafafb;
+  &-loading {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+  }
   .interval-layout {
     .biz-layout-collapse-container {
       height: 24px;

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

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

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

@@ -10,20 +10,20 @@ 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, { useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { Form, Button, Radio } from 'antd';
 import { BizAttributeSelector, BizSelect, BizUserGroupHeader, useSubject } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
 import { AnalysisMode } from "./types";
+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, _props$defaultValue3, _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, _currentParams$start2, _currentParams$end2, _currentParams$start3, _currentParams$end3;
   var defaultValue = props.defaultValue,
     loading = props.loading,
     collapseRef = props.collapseRef,
-    finalSearchData = props.finalSearchData,
-    fetchRequest = props.fetchRequest;
+    finalSearchData = props.finalSearchData;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -47,7 +47,9 @@ var TopPanel = function TopPanel(props) {
   var _useSubject = useSubject(),
     subjectList = _useSubject.subjectList,
     subjectLoading = _useSubject.loading;
-  var _ref = defaultValue,
+  var _useContext = useContext(IntervalContext),
+    subjectEnable = _useContext.subjectEnable;
+  var _ref = defaultValue || {},
     userGroup = _ref.userGroup;
   // 细分属性初始值
   var _useState9 = useState(),
@@ -62,6 +64,18 @@ var TopPanel = function TopPanel(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     currentSubject = _useState14[0],
     setCurrentSubject = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    inited = _useState16[0],
+    setInited = _useState16[1];
+  var _useState17 = useState(),
+    _useState18 = _slicedToArray(_useState17, 2),
+    currentParams = _useState18[0],
+    setCurrentParams = _useState18[1];
+  var _useState19 = useState(true),
+    _useState20 = _slicedToArray(_useState19, 2),
+    searchDisabled = _useState20[0],
+    setSearchDisabled = _useState20[1];
   // 用户组和事件变更
   var onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
@@ -88,15 +102,36 @@ var TopPanel = function TopPanel(props) {
       _data.userGroup = allData.userGroup;
       if (_data.userGroup.length <= 0) _data.userGroup = [0];
     }
-    props.onChange(_objectSpread(_objectSpread({}, allData), {}, {
+    setCurrentParams(_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);
+    }));
   };
+  useEffect(function () {
+    var _currentParams$start, _currentParams$start$, _currentParams$start$2, _currentParams$end, _currentParams$end$fi, _currentParams$end$fi2;
+    var conditionValid = true;
+    currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$start = currentParams.start) === null || _currentParams$start === void 0 ? void 0 : (_currentParams$start$ = _currentParams$start.filters) === null || _currentParams$start$ === void 0 ? void 0 : (_currentParams$start$2 = _currentParams$start$.conditions) === null || _currentParams$start$2 === void 0 ? void 0 : _currentParams$start$2.forEach(function (item) {
+      var _item$values;
+      if (!/null/.test(item.operator || '') && !((_item$values = item.values) !== null && _item$values !== void 0 && _item$values.length)) {
+        conditionValid = false;
+      }
+    });
+    currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$end = currentParams.end) === null || _currentParams$end === void 0 ? void 0 : (_currentParams$end$fi = _currentParams$end.filters) === null || _currentParams$end$fi === void 0 ? void 0 : (_currentParams$end$fi2 = _currentParams$end$fi.conditions) === null || _currentParams$end$fi2 === void 0 ? void 0 : _currentParams$end$fi2.forEach(function (item) {
+      var _item$values2;
+      if (!/null/.test(item.operator || '') && !((_item$values2 = item.values) !== null && _item$values2 !== void 0 && _item$values2.length)) {
+        conditionValid = false;
+      }
+    });
+    if (loading || !(currentParams !== null && currentParams !== void 0 && currentParams.start) || !(currentParams !== null && currentParams !== void 0 && currentParams.start.id) || !(currentParams !== null && currentParams !== void 0 && currentParams.end) || !(currentParams !== null && currentParams !== void 0 && currentParams.end.id) || !conditionValid || relevancy && !(currentParams !== null && currentParams !== void 0 && currentParams.associatedNextAttr) && !(currentParams !== null && currentParams !== void 0 && currentParams.associatedNextAttr) || analysisType === 'eventProp' && !currentSubject) {
+      setSearchDisabled(true);
+    } else {
+      setSearchDisabled(false);
+    }
+  }, [currentParams]);
   var resetting = function resetting() {
     form.resetFields();
     form.setFieldsValue({
@@ -163,6 +198,20 @@ var TopPanel = function TopPanel(props) {
       });
     }
   };
+  useEffect(function () {
+    if (!defaultValue) {
+      setInited(true);
+      return;
+    }
+    setInited(false);
+    if (defaultValue.analysisSubject) {
+      setAnalysisType('eventProp');
+    } else {
+      setAnalysisType('user');
+    }
+    setInited(true);
+  }, []);
+  if (!inited) return null;
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     component: "div",
@@ -170,7 +219,8 @@ 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],
+      analysisSubject: props === null || props === void 0 ? void 0 : (_props$defaultValue3 = props.defaultValue) === null || _props$defaultValue3 === void 0 ? void 0 : _props$defaultValue3.analysisSubject,
       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
       }),
@@ -197,7 +247,7 @@ var TopPanel = function TopPanel(props) {
     },
     scrollToFirstError: true,
     onValuesChange: onValuesChange
-  }, /*#__PURE__*/React.createElement(Form.Item, {
+  }, subjectEnable && /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u4E3B\u4F53",
     className: "panel-form-interval-item"
   }, /*#__PURE__*/React.createElement(BizSelect, {
@@ -227,6 +277,11 @@ var TopPanel = function TopPanel(props) {
     keyField: "id",
     onChange: function onChange(val) {
       setCurrentSubject(val);
+      setRelevancy(false);
+      form.setFieldsValue({
+        start: undefined,
+        end: undefined
+      });
     }
   })), analysisType === 'user' && /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
@@ -247,7 +302,9 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(EventFilter, {
     subject: currentSubject,
     relevancyFl: relevancyFl,
-    relevancy: true
+    relevancy: true,
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
+    analysisType: analysisType
   })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
     className: "associated"
   }, /*#__PURE__*/React.createElement("span", {
@@ -273,6 +330,7 @@ var TopPanel = function TopPanel(props) {
     value: bizAttributeSelectorValue,
     enableDelete: true,
     onChange: onChangeAttr,
+    key: "".concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$start2 = currentParams.start) === null || _currentParams$start2 === void 0 ? void 0 : _currentParams$start2.id, "-").concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$end2 = currentParams.end) === null || _currentParams$end2 === void 0 ? void 0 : _currentParams$end2.id, "-pre"),
     onDelete: function onDelete() {
       onChangeAttr(undefined, 'associatedPreAttr');
     }
@@ -291,6 +349,7 @@ var TopPanel = function TopPanel(props) {
     value: bizAttributeSelectorValue,
     enableDelete: true,
     onChange: onChangeAttr,
+    key: "".concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$start3 = currentParams.start) === null || _currentParams$start3 === void 0 ? void 0 : _currentParams$start3.id, "-").concat(currentParams === null || currentParams === void 0 ? void 0 : (_currentParams$end3 = currentParams.end) === null || _currentParams$end3 === void 0 ? void 0 : _currentParams$end3.id, "-next"),
     onDelete: function onDelete() {
       onChangeAttr(undefined, 'associatedNextAttr');
     }
@@ -311,15 +370,18 @@ var TopPanel = function TopPanel(props) {
     label: "\u7ED3\u675F\u4E8B\u4EF6",
     name: "end"
   }, /*#__PURE__*/React.createElement(EventFilter, {
-    subject: currentSubject
+    subject: currentSubject,
+    analysisType: analysisType,
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start")
   })), /*#__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,
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-dimension"),
     eventIdList: startId === endId ? [startId] : [startId, endId],
     value: bizAttributeSelectorValue,
     enableDelete: true,
@@ -341,10 +403,10 @@ var TopPanel = function TopPanel(props) {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
     loading: loading || subjectLoading,
-    disabled: loading || !startId || !endId || relevancy && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr) && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr),
+    disabled: searchDisabled,
     type: "primary",
     onClick: function onClick() {
-      fetchRequest(true);
+      props.onChange(currentParams, (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
     }
   }, "\u67E5\u8BE2"))));
 };

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

@@ -19,13 +19,13 @@
 .panel-form-interval {
   &-item {
     .ant-form-item-label {
-      padding-left: 24px;
+      padding-left: 24px !important;
       font-weight: 500;
     }
     .ant-form-item-control-input-content {
       height: 40px;
-      padding: 0 24px;
-      line-height: 40px;
+      padding: 0 24px !important;
+      line-height: 40px !important;
       .biz-select-handle {
         display: inline-block;
         width: 208px;

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

@@ -42,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/types.d.ts

@@ -131,20 +131,6 @@ export interface SearchValue {
         unit: string;
     };
 }
-export interface UserDrillParamsProp {
-    /**
-     * @description  用户数量
-     */
-    count: number;
-    /**
-     * @description 查询接口
-     */
-    url: string;
-    /**
-     * @description 查询对象
-     */
-    params?: Record<string, any>;
-}
 export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map' | 'boxplot';
 /**
  * 图表选择类型
@@ -187,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

@@ -37,6 +37,7 @@ export declare function formTableData(originalData: ChartData): {
     perValue: number;
     total: number;
     peopleNum: number;
+    names: string[];
 }[] | {
     key: number;
     time: string;
@@ -59,6 +60,7 @@ export declare function formTableData(originalData: ChartData): {
         perValue: number;
         total: number;
         peopleNum: number;
+        names: string[];
     }[];
 }[] | undefined;
 type ChartData = {

package/dist/esm/utils/formData.js

@@ -16,6 +16,7 @@ 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);
@@ -144,6 +145,11 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     align: 'right',
     dataIndex: 'total',
     key: 'total',
+    className: "".concat(classPrefix, "-table-td"),
+    sorter: function sorter(a, b) {
+      var _a$total, _b$total;
+      return ((_a$total = a === null || a === void 0 ? void 0 : a.total) !== null && _a$total !== void 0 ? _a$total : 0) - ((_b$total = b === null || b === void 0 ? void 0 : b.total) !== null && _b$total !== void 0 ? _b$total : 0);
+    },
     render: function render(text, record) {
       return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
     }
@@ -164,22 +170,30 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
         className: "interval-drill",
         onClick: function onClick() {
           var params;
+          var searchParam = searchDataParams(searchData);
           // 主体下钻
           if (searchData.analysisSubject) {
             params = {
               url: Apis.subjectDrill,
               count: Number(text),
-              params: _objectSpread({}, searchData)
+              params: _objectSpread({}, searchParam)
             };
           } else {
             // 用户下钻
             params = {
               url: Apis.userDrill,
               count: Number(text),
-              params: _objectSpread({}, searchData)
+              params: _objectSpread({}, searchParam)
             };
           }
-          onUserDrill === null || onUserDrill === void 0 ? void 0 : onUserDrill(params);
+          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"
@@ -282,7 +296,8 @@ function getChildrenData(data, index) {
         min: values[i][4] || 0,
         perValue: values[i][5] || 0,
         total: values[i][6] || 0,
-        peopleNum: values[i][7] || 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.2",
+  "version": "1.0.3-alpha.20",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "680096640933239c71ddd9636ed7cc86dc20e40f"
+  "gitHead": "c2b22cc5dc375e76bfa62ae6355d2479ee2211ae"
 }