@zgfe/modules-interval 1.0.23-zhongyuan.1 → 1.0.23-zhongyuan.10

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

@@ -6,48 +6,146 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
-import { ModuleInterval } from "../../../index";
+import { ModuleInterval } from '@zgfe/modules-interval';
 import { requestConfig } from "../../../utils/ajaxConfig";
 import { Button } from 'antd';
 var defaultValue = {
-  id: 7565,
-  name: '测试6666',
-  type: 0,
+  appId: 52,
   enlarged: 0,
-  panelId: 400900,
+  hasPermission: true,
+  id: 488,
+  isPerfect: 1,
+  name: '间隔',
+  reqParam: {
+    data: {
+      appId: 52,
+      module: 'interval',
+      userGroup: [0],
+      start: {
+        id: 590,
+        name: 'pv',
+        deleted: 0
+      },
+      associatedPreAttr: {
+        realTime: true,
+        eventId: 590,
+        propCategory: 'eventProp',
+        alias: '',
+        id: 31415926,
+        label: '业务',
+        dimensionSub: 'event_attr',
+        type: 1,
+        key: 'eventProp-31415926',
+        isHidden: 0
+      },
+      associatedNextAttr: {
+        realTime: true,
+        eventId: 590,
+        propCategory: 'eventProp',
+        alias: '',
+        id: 3045,
+        label: 'page_title',
+        dimensionSub: 'event_attr',
+        type: 1,
+        key: 'eventProp-3045',
+        isHidden: 0
+      },
+      end: {
+        id: 590,
+        name: 'pv',
+        deleted: 0
+      },
+      dimension: {
+        id: 0,
+        alias: null,
+        category: 'fixed',
+        key: 'userProp-last_visit_time-0',
+        label: '最后一次访问时间',
+        name: 'last_visit_time',
+        propCategory: 'userProp',
+        type: 3,
+        realTime: false,
+        dimensionSub: 'last_visit_time'
+      },
+      analysisModel: 'commonInterval',
+      time: {
+        begin: '2024-11-15',
+        end: '2024-11-22',
+        relative: [7, 0],
+        unit: 'day'
+      },
+      platform: 0,
+      chartType: 'boxplot'
+    },
+    chosen_data: []
+  },
+  type: 0,
+  unExistEvent: '',
+  renderType: 'normal',
+  source: 'PANEL',
+  panelId: 87,
   panelType: 'edit',
   data: {
-    chartType: 'boxplot',
-    analysisIndex: 'per',
-    id: 7565,
-    name: '测试6666',
-    appId: 266,
-    platform: 0,
-    userGroup: [933, 935],
-    time: {
-      unit: 'day',
-      relative: [14, 0],
-      begin: '2023-08-04',
-      end: '2023-08-18'
+    appId: 52,
+    module: 'interval',
+    userGroup: [0],
+    start: {
+      id: 590,
+      name: 'pv',
+      deleted: 0
     },
-    dimension: {
+    associatedPreAttr: {
+      realTime: true,
+      eventId: 590,
       propCategory: 'eventProp',
-      value: 151045
+      alias: '',
+      id: 31415926,
+      label: '业务',
+      dimensionSub: 'event_attr',
+      type: 1,
+      key: 'eventProp-31415926',
+      isHidden: 0
     },
-    filters: {
-      relation: 'and',
-      conditions: [{
-        attrId: 151045,
-        propCategory: 'eventProp',
-        type: 1,
-        operator: 'equal',
-        values: ['55'],
-        dimensionSub: 'event_attr',
-        label: '应用名称',
-        attrName: '应用名称'
-      }]
-    }
-  }
+    associatedNextAttr: {
+      realTime: true,
+      eventId: 590,
+      propCategory: 'eventProp',
+      alias: '',
+      id: 3045,
+      label: 'page_title',
+      dimensionSub: 'event_attr',
+      type: 1,
+      key: 'eventProp-3045',
+      isHidden: 0
+    },
+    end: {
+      id: 590,
+      name: 'pv',
+      deleted: 0
+    },
+    dimension: {
+      id: 0,
+      alias: null,
+      category: 'fixed',
+      key: 'userProp-last_visit_time-0',
+      label: '最后一次访问时间',
+      name: 'last_visit_time',
+      propCategory: 'userProp',
+      type: 3,
+      realTime: false,
+      dimensionSub: 'last_visit_time'
+    },
+    analysisModel: 'commonInterval',
+    time: {
+      begin: '2024-11-15',
+      end: '2024-11-22',
+      relative: [7, 0],
+      unit: 'day'
+    },
+    platform: 0,
+    chartType: 'boxplot'
+  },
+  chosen_data: []
 };
 export default (function () {
   // 是否进入用户钻取页面
@@ -74,7 +172,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 266
+    defaultApp: 52
   }, 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);

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

@@ -6,7 +6,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
 import React, { useEffect, useState } from 'react';
-import { ModuleInterval } from "../../../index";
+import { ModuleInterval } from '@zgfe/modules-interval';
 import "./styles/index.less";
 import { requestConfig } from "../../../utils/ajaxConfig";
 import { Button } from 'antd';

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

@@ -6,7 +6,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
-import { ModuleInterval } from "../../../index";
+import { ModuleInterval } from '@zgfe/modules-interval';
 import { requestConfig } from "../../../utils/ajaxConfig";
 import { Button } from 'antd';
 var defaultValue = {

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

@@ -63,6 +63,11 @@ var ModuleInterval = function ModuleInterval(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     subjectEnable = _useState16[0],
     setSubjectEnable = _useState16[1];
+  var _useState17 = useState(false),
+    _useState18 = _slicedToArray(_useState17, 2),
+    exception = _useState18[0],
+    setException = _useState18[1];
+
   // 初始化
   useEffect(function () {
     setLoading(true);
@@ -145,7 +150,9 @@ var ModuleInterval = function ModuleInterval(props) {
       changeLoading: setLoading,
       afterEditTarget: props.afterEditTarget,
       onUserDrill: props.onUserDrill,
-      onJumpWarning: props.onJumpWarning
+      onJumpWarning: props.onJumpWarning,
+      exception: exception,
+      setException: setException
     }
   }, /*#__PURE__*/React.createElement(EventContent, {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,

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

@@ -71,7 +71,6 @@ export declare namespace IntervalProps {
         perValue?: number;
         peopleNum?: number;
         names?: string[];
-        originalNames?: string[];
         total?: number;
         children?: ColumnsDataType[];
     }

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

@@ -21,6 +21,7 @@ var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
   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;
   var defaultValue = props.defaultValue,
+    propsDefaultValue = props.propsDefaultValue,
     loading = props.loading,
     collapseRef = props.collapseRef,
     finalSearchData = props.finalSearchData;
@@ -38,7 +39,7 @@ var TopPanel = function TopPanel(props) {
     endEvent = _useState4[0],
     setEndEvent = _useState4[1];
   // 关联属性
-  var _useState5 = useState(false),
+  var _useState5 = useState(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr ? true : false),
     _useState6 = _slicedToArray(_useState5, 2),
     relevancy = _useState6[0],
     setRelevancy = _useState6[1];
@@ -62,14 +63,23 @@ var TopPanel = function TopPanel(props) {
     inited = _useState12[0],
     setInited = _useState12[1];
   var formRef = React.useRef(null);
+
+  // 初始化设置细分属性
+  useEffect(function () {
+    if (formRef.current && propsDefaultValue && propsDefaultValue.dimension) {
+      var _formRef$current;
+      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('dimension', propsDefaultValue.dimension);
+    }
+  }, [formRef.current, propsDefaultValue]);
   function onSearch(values) {
     if (props.onChange) {
+      var _values$analysisSubje, _values$analysisSubje2, _values$analysisSubje3, _values$analysisSubje4;
       props.onChange(_objectSpread(_objectSpread({}, values), {}, {
-        analysisSubject: values.analysisSubject ? {
-          subjectId: values.analysisSubject.id,
-          subjectName: values.analysisSubject.subjectName,
-          subjectAlias: values.analysisSubject.subjectAlias,
-          unit: values.analysisSubject.unit
+        analysisSubject: values !== null && values !== void 0 && values.analysisSubject ? {
+          subjectId: values === null || values === void 0 ? void 0 : (_values$analysisSubje = values.analysisSubject) === null || _values$analysisSubje === void 0 ? void 0 : _values$analysisSubje.id,
+          subjectName: values === null || values === void 0 ? void 0 : (_values$analysisSubje2 = values.analysisSubject) === null || _values$analysisSubje2 === void 0 ? void 0 : _values$analysisSubje2.subjectName,
+          subjectAlias: values === null || values === void 0 ? void 0 : (_values$analysisSubje3 = values.analysisSubject) === null || _values$analysisSubje3 === void 0 ? void 0 : _values$analysisSubje3.subjectAlias,
+          unit: values === null || values === void 0 ? void 0 : (_values$analysisSubje4 = values.analysisSubject) === null || _values$analysisSubje4 === void 0 ? void 0 : _values$analysisSubje4.unit
         } : undefined
       }), true);
     }
@@ -106,12 +116,12 @@ var TopPanel = function TopPanel(props) {
       return;
     }
     setInited(false);
-    if (defaultValue.analysisSubject) {
+    if (defaultValue !== null && defaultValue !== void 0 && defaultValue.analysisSubject) {
       setAnalysisType('eventProp');
     } else {
       setAnalysisType('user');
     }
-    if (defaultValue.analysisSubject) {
+    if (defaultValue !== null && defaultValue !== void 0 && defaultValue.analysisSubject) {
       setCurrentSubject(subjectList.find(function (item) {
         var _defaultValue$analysi;
         return item.id === (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$analysi = defaultValue.analysisSubject) === null || _defaultValue$analysi === void 0 ? void 0 : _defaultValue$analysi.subjectId);
@@ -190,7 +200,7 @@ var TopPanel = function TopPanel(props) {
     name: "analysisSubject",
     className: "panel-form-interval-item",
     rules: [{
-      validator: function validator(rule, value) {
+      validator: function validator(_rule, value) {
         if (!value) {
           return Promise.reject('请选择口径名称');
         }
@@ -203,12 +213,12 @@ var TopPanel = function TopPanel(props) {
     labelField: "subjectName",
     keyField: "id",
     onChange: function onChange(val) {
-      var _formRef$current, _formRef$current2, _formRef$current3;
+      var _formRef$current2, _formRef$current3, _formRef$current4;
       setCurrentSubject(val);
       setRelevancy(false);
-      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('start', undefined);
-      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('end', undefined);
-      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('dimension', undefined);
+      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('start', undefined);
+      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('end', undefined);
+      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
     }
   })), analysisType === 'user' && /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
@@ -260,9 +270,9 @@ var TopPanel = function TopPanel(props) {
     key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
     analysisType: analysisType,
     onChange: function onChange(evt) {
-      var _formRef$current4;
+      var _formRef$current5;
       setStartEvent(evt);
-      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
+      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Space, {
     align: "baseline",
@@ -307,8 +317,8 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-pre"),
     onDelete: function onDelete() {
-      var _formRef$current5;
-      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedPreAttr', undefined);
+      var _formRef$current6;
+      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedPreAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: "associated-label"
@@ -330,8 +340,8 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-next"),
     onDelete: function onDelete() {
-      var _formRef$current6;
-      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedNextAttr', undefined);
+      var _formRef$current7;
+      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('associatedNextAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement("i", {
     style: {
@@ -340,9 +350,9 @@ var TopPanel = function TopPanel(props) {
       cursor: 'pointer'
     },
     onClick: function onClick() {
-      var _formRef$current7, _formRef$current8;
-      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('associatedPreAttr', undefined);
-      (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setFieldValue('associatedNextAttr', undefined);
+      var _formRef$current8, _formRef$current9;
+      (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setFieldValue('associatedPreAttr', undefined);
+      (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.setFieldValue('associatedNextAttr', undefined);
       setRelevancy(false);
     },
     className: "bsicon qingchu"
@@ -373,11 +383,11 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(EventFilter, {
     subject: currentSubject,
     analysisType: analysisType,
-    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-end"),
     onChange: function onChange(val) {
-      var _formRef$current9;
+      var _formRef$current10;
       setEndEvent(val);
-      (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.setFieldValue('dimension', undefined);
+      (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : _formRef$current10.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
@@ -392,8 +402,8 @@ var TopPanel = function TopPanel(props) {
     showCommonProp: true,
     enableDelete: true,
     onDelete: function onDelete() {
-      var _formRef$current10;
-      (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : _formRef$current10.setFieldValue('dimension', undefined);
+      var _formRef$current11;
+      (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u6A21\u578B",
@@ -411,8 +421,8 @@ var TopPanel = function TopPanel(props) {
     loading: loading || subjectLoading,
     type: "primary",
     onClick: function onClick() {
-      var _formRef$current11;
-      (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.submit();
+      var _formRef$current12;
+      (_formRef$current12 = formRef.current) === null || _formRef$current12 === void 0 ? void 0 : _formRef$current12.submit();
     }
   }, "\u67E5\u8BE2"))));
 };