@zgfe/modules-interval 1.0.3-alpha.3 → 1.0.3-alpha.30

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

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

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

@@ -47,8 +47,7 @@ export interface ConditionsnProps {
 export interface EventFilterProps {
     id?: string;
     value?: eventProps;
-    relevancyFl?: boolean;
-    relevancy?: boolean;
     subject?: SubjectTypes.Subject;
-    onChange?: (event: eventProps) => {};
+    analysisType?: 'user' | 'eventProp';
+    onChange?: (event: eventProps) => void;
 }

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

@@ -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

@@ -56,14 +56,10 @@ 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];
+    eventId = _useState14[0],
+    setEventId = _useState14[1];
   var _useContext2 = useContext(IntervalContext),
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
@@ -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,21 +161,19 @@ var EventContent = function EventContent(props) {
         platform: data
       });
     });
-    setTimeout(function () {
-      setAjaxFlag(true);
-    }, 100);
   };
 
   // TopPanel组件数值变更
   var onChangeSearch = function onChangeSearch(data, flag) {
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
-      return _objectSpread(_objectSpread(_objectSpread({}, _searchData), data), {}, {
+      return _objectSpread(_objectSpread({}, data), {}, {
+        time: _searchData.time,
+        platform: _searchData.platform,
         userGroup: data.analysisSubject ? undefined : data.userGroup,
         analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
       });
     });
-    setAjaxFlag(false);
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,
@@ -205,11 +190,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

@@ -10,7 +10,6 @@ export declare namespace EventContentProps {
          * 默认值
          */
         value: SearchValue;
-        urlParam?: SearchValue;
         /**
          * 展示列表
          */

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);
   }, []);
@@ -38,16 +32,207 @@ export default (function () {
     console.log('onUserDrill:111', data, searchData);
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
-    needMeta: true,
-    defaultApp: 271
+    needMeta: true
   }, 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,
+    defaultValue: {
+      data: {
+        analysisSubject: {
+          subjectId: 91,
+          subjectName: 'url',
+          subjectAlias: '网址',
+          unit: '达不溜'
+        },
+        start: {
+          alias: '页面访问',
+          attrList: [{
+            alias: '',
+            eventId: 18062,
+            id: 96068,
+            isHidden: 0,
+            key: 'eventProp-96068',
+            label: 'landing_page',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18062,
+            id: 96060,
+            isHidden: 0,
+            key: 'eventProp-96060',
+            label: 'url',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18062,
+            id: 96059,
+            isHidden: 0,
+            key: 'eventProp-96059',
+            label: 'page_url',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18062,
+            id: 96069,
+            isHidden: 0,
+            key: 'eventProp-96069',
+            label: 'page_title',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18062,
+            id: 96062,
+            isHidden: 0,
+            key: 'eventProp-96062',
+            label: 'ref',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }],
+          id: 18062,
+          isDelete: 0,
+          isStop: 0,
+          name: 'pv',
+          eventHidden: 0,
+          marked: false,
+          clickAnalysis: true
+        },
+        end: {
+          alias: '收入',
+          attrList: [{
+            alias: '',
+            eventId: 18065,
+            id: 96079,
+            isHidden: 0,
+            key: 'eventProp-96079',
+            label: 'productQuantity',
+            propCategory: 'eventProp',
+            type: 2,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18065,
+            id: 96081,
+            isHidden: 0,
+            key: 'eventProp-96081',
+            label: 'page_title',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18065,
+            id: 96083,
+            isHidden: 0,
+            key: 'eventProp-96083',
+            label: 'price',
+            propCategory: 'eventProp',
+            type: 2,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18065,
+            id: 96082,
+            isHidden: 0,
+            key: 'eventProp-96082',
+            label: 'productID',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18065,
+            id: 96078,
+            isHidden: 0,
+            key: 'eventProp-96078',
+            label: 'total',
+            propCategory: 'eventProp',
+            type: 2,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18065,
+            id: 96089,
+            isHidden: 0,
+            key: 'eventProp-96089',
+            label: 'page_url',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18065,
+            id: 96088,
+            isHidden: 0,
+            key: 'eventProp-96088',
+            label: 'ref',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18065,
+            id: 96084,
+            isHidden: 0,
+            key: 'eventProp-96084',
+            label: 'revenueType',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }, {
+            alias: '',
+            eventId: 18065,
+            id: 96085,
+            isHidden: 0,
+            key: 'eventProp-96085',
+            label: 'url',
+            propCategory: 'eventProp',
+            type: 1,
+            realTime: true,
+            dimensionSub: 'event_attr'
+          }],
+          id: 18065,
+          isDelete: 0,
+          isStop: 0,
+          name: 'revenue',
+          eventHidden: 0,
+          marked: false,
+          clickAnalysis: false
+        },
+        analysisModel: 'commonInterval',
+        time: {
+          begin: '2023-10-25',
+          end: '2023-11-01',
+          relative: [7, 0],
+          unit: 'day'
+        }
+      }
+    },
+    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',