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

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

@@ -41,6 +41,45 @@ export default (function () {
   }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleInterval, {
     afterEditTarget: afterEditTarget,
     onUserDrill: onUserDrill,
+    defaultValue: {
+      data: {
+        time: {
+          begin: '2023-08-01',
+          end: '2023-10-18',
+          unit: 'day'
+        },
+        chartType: 'line',
+        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'
+        },
+        analysisSubject: {
+          subjectId: 31,
+          subjectName: '商品数量',
+          subjectAlias: '查克拉',
+          unit: '个'
+        },
+        analysisModel: 'commonInterval',
+        analysisIndex: 'number'
+      }
+    },
     onJumpWarning: function onJumpWarning() {}
   }));
 });

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

@@ -92,9 +92,18 @@ var ModuleInterval = function ModuleInterval(props) {
       chartType: 'line'
     });
   };
-  return /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading,
-    wrapperClassName: classPrefix
+  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("div", {
+    className: classPrefix
   }, /*#__PURE__*/React.createElement(BizTargetFromPanel, {
     value: panelId ? {
       panelId: panelId,

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

@@ -24,6 +24,7 @@ export declare namespace IntervalProps {
          */
         onUserDrill: (data: IntervalDrillParams, isSubject: boolean) => void;
         onJumpWarning: (data: Record<string, any>, searchData: SearchValue) => void;
+        onChange?: (data: SearchValue) => void;
     }
     interface Value {
         /**
@@ -70,6 +71,7 @@ export declare namespace IntervalProps {
         perValue?: number;
         peopleNum?: number;
         names?: string[];
+        total?: number;
         children?: ColumnsDataType[];
     }
 }

package/dist/esm/modules/topPanel/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 React, { useContext, 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";
@@ -19,7 +19,7 @@ import { AnalysisMode } from "./types";
 import { IntervalContext } from "../../types";
 var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
-  var _props$defaultValue, _props$defaultValue2, _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
+  var _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,
     loading = props.loading,
     collapseRef = props.collapseRef,
@@ -65,6 +65,10 @@ 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 onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
@@ -166,6 +170,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",
@@ -174,6 +192,7 @@ var TopPanel = function TopPanel(props) {
     layout: "vertical",
     initialValues: {
       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
       }),
@@ -200,10 +219,10 @@ 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"
-  }, subjectEnable && /*#__PURE__*/React.createElement(BizSelect, {
+  }, /*#__PURE__*/React.createElement(BizSelect, {
     options: [{
       label: '用户',
       value: 'user'

package/dist/esm/utils/formData.js

@@ -145,6 +145,10 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     align: 'right',
     dataIndex: 'total',
     key: 'total',
+    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));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.3-alpha.10",
+  "version": "1.0.3-alpha.12",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -62,5 +62,5 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "ba968441f35ef1af38f430b93de7e4f344efefa2"
+  "gitHead": "30f360d146a9d4d545b52a990a34347dae974c29"
 }