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

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: 204
+    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',

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);
+      });
+    });
   }, []);
 
   // 查询条件初始化
@@ -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,
@@ -102,7 +112,7 @@ var ModuleInterval = function ModuleInterval(props) {
         name: title,
         params: _objectSpread({
           app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-          module: 'event'
+          module: 'interval'
         }, searchData)
       }
     } : undefined,
@@ -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,18 +131,21 @@ var ModuleInterval = function ModuleInterval(props) {
       userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
+      subjectEnable: subjectEnable,
       panelName: title,
       includeToday: props.includeToday,
-      changeLoading: changeLoading,
+      enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,
+      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/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';
-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,9 @@ export declare namespace EventProps {
         /**
          * 用户钻取
          */
-        onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
+        onUserDrill: (data: IntervalDrillParams, isSubject: boolean) => void;
+        onJumpWarning: (data: Record<string, any>, searchData: SearchValue) => void;
+        onChange?: (data: SearchValue) => void;
     }
     interface Value {
         /**
@@ -69,6 +70,8 @@ export declare namespace EventProps {
         min?: number;
         perValue?: number;
         peopleNum?: number;
+        names?: string[];
+        total?: number;
         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 = {}));