@zgfe/modules-interval 1.0.0-interval.15 → 1.0.0-interval.17

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

@@ -112,10 +112,10 @@ var EventContent = function EventContent(props) {
   }, [ajaxFlag]);
   // 查询
   var fetchRequest = function fetchRequest(flag) {
-    var _searchData$start, _searchData$endId, _searchData$associate, _searchData$associate2, _searchData$associate3;
+    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$endId = searchData.endId) === null || _searchData$endId === void 0 ? void 0 : _searchData$endId.id) === null) {
+    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;
     }

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

@@ -1,18 +1,23 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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, { useEffect, useState } from 'react';
-import { Form, Button, message } from 'antd';
+import React, { useState } from 'react';
+import { Form, Button } from 'antd';
 import { BizAttributeSelector, BizUserGroupHeader } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
-import _ from 'lodash';
-import { transformData } from "../content/utils";
 var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
+  var _defaultValue$associa, _defaultValue$associa2, _defaultValue$associa3, _defaultValue$associa4, _defaultValue$associa5, _defaultValue$associa6, _defaultValue$associa7, _defaultValue$associa8, _defaultValue$dimensi, _defaultValue$dimensi2, _defaultValue$dimensi3, _defaultValue$dimensi4;
   console.log(777777, props);
   var defaultValue = props.defaultValue,
     loading = props.loading,
@@ -39,12 +44,7 @@ var TopPanel = function TopPanel(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     relevancyFl = _useState8[0],
     setRelevancyFl = _useState8[1];
-  // 筛选条件值
   var _ref = defaultValue,
-    id = _ref.id,
-    name = _ref.name,
-    dimension = _ref.dimension,
-    filters = _ref.filters,
     userGroup = _ref.userGroup;
   // 细分属性初始值
   var _useState9 = useState(),
@@ -72,30 +72,11 @@ var TopPanel = function TopPanel(props) {
       setRelevancyFl(true);
     }
     if (allData.userGroup) {
-      _data.userGroup = [];
-      if (_.isArray(allData.userGroup[0])) {
-        if (allData.userGroup[0].length > 20) {
-          message.warning('最多添加20个');
-        }
-        var app = [transformData(allData.userGroup)];
-        allData.userGroup = app;
-      } else {
-        allData.userGroup = allData === null || allData === void 0 ? void 0 : allData.userGroup.map(function (group) {
-          return group === null || group === void 0 ? void 0 : group.id;
-        });
-      }
+      _data.userGroup = allData.userGroup;
+      if (_data.userGroup.length <= 0) _data.userGroup = [0];
     }
-    props.onChange(allData, false);
+    props.onChange(allData, (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
   };
-  useEffect(function () {
-    onChangeAttr(undefined, 'dimension');
-    onChangeAttr(undefined, 'associatedPreAttr');
-  }, [startId]);
-  useEffect(function () {
-    onChangeAttr(undefined, 'dimension');
-    onChangeAttr(undefined, 'associatedNextAttr');
-  }, [endId]);
-  // 重置
   var resetting = function resetting() {
     form.resetFields();
     form.setFieldsValue({
@@ -162,25 +143,27 @@ var TopPanel = function TopPanel(props) {
     className: "panel-form",
     layout: "vertical",
     initialValues: {
-      userGroup: userGroup ? userGroup.map(function (item) {
-        return {
-          id: item
-        };
-      }) : [{
-        id: 0
-      }],
-      start: {
-        id: id,
-        name: name,
-        dimension: dimension,
-        filters: filters
-      },
-      end: {
-        id: id,
-        name: name,
-        dimension: dimension,
-        filters: filters
-      }
+      userGroup: userGroup ? userGroup : [0],
+      start: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start,
+      end: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.end,
+      associatedNextAttr: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_next_attr), {}, {
+        dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa = defaultValue.associated_next_attr) === null || _defaultValue$associa === void 0 ? void 0 : _defaultValue$associa.dimension_sub,
+        isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa2 = defaultValue.associated_next_attr) === null || _defaultValue$associa2 === void 0 ? void 0 : _defaultValue$associa2.is_hidden,
+        propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa3 = defaultValue.associated_next_attr) === null || _defaultValue$associa3 === void 0 ? void 0 : _defaultValue$associa3.prop_category,
+        eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa4 = defaultValue.associated_next_attr) === null || _defaultValue$associa4 === void 0 ? void 0 : _defaultValue$associa4.event_id
+      }),
+      associatedPreAttr: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_pre_attr), {}, {
+        dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa5 = defaultValue.associated_pre_attr) === null || _defaultValue$associa5 === void 0 ? void 0 : _defaultValue$associa5.dimension_sub,
+        isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa6 = defaultValue.associated_pre_attr) === null || _defaultValue$associa6 === void 0 ? void 0 : _defaultValue$associa6.is_hidden,
+        propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa7 = defaultValue.associated_pre_attr) === null || _defaultValue$associa7 === void 0 ? void 0 : _defaultValue$associa7.prop_category,
+        eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa8 = defaultValue.associated_pre_attr) === null || _defaultValue$associa8 === void 0 ? void 0 : _defaultValue$associa8.event_id
+      }),
+      dimension: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.dimension), {}, {
+        dimensionSub: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi = defaultValue.dimension) === null || _defaultValue$dimensi === void 0 ? void 0 : _defaultValue$dimensi.dimension_sub,
+        isHidden: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi2 = defaultValue.dimension) === null || _defaultValue$dimensi2 === void 0 ? void 0 : _defaultValue$dimensi2.is_hidden,
+        propCategory: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi3 = defaultValue.dimension) === null || _defaultValue$dimensi3 === void 0 ? void 0 : _defaultValue$dimensi3.prop_category,
+        eventId: defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi4 = defaultValue.dimension) === null || _defaultValue$dimensi4 === void 0 ? void 0 : _defaultValue$dimensi4.event_id
+      })
     },
     scrollToFirstError: true,
     onValuesChange: onValuesChange
@@ -192,9 +175,6 @@ var TopPanel = function TopPanel(props) {
       paddingLeft: 0
     }
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
-    value: [{
-      id: 0
-    }],
     enableTags: true,
     max: 1
   })), /*#__PURE__*/React.createElement("div", {

package/dist/esm/types.d.ts

@@ -1,12 +1,17 @@
 import { AttrConditionTypes } from '@zgfe/business-lib';
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
 import { ReactNode } from 'react';
-import { FormDataProps } from './modules/topPanel/types';
+import { FormDataProps, start } from './modules/topPanel/types';
 /**
  * 属性选择器 默认值
  */
 export interface bizAttributeSelectorValueProp {
     propCategory?: string;
+    prop_category?: string;
+    dimension_sub?: string;
+    is_hidden?: string;
+    real_time?: string;
+    event_id?: string;
     category?: string;
     value?: number | string;
     key?: number | string;
@@ -56,6 +61,7 @@ export interface SearchValue {
      * @description   用户群id
      */
     userGroup?: number[];
+    user_group?: number[];
     /**
      * 事件、属性、属性细分
      */
@@ -89,10 +95,20 @@ export interface SearchValue {
      *
      */
     associatedPreAttr?: bizAttributeSelectorValueProp;
+    associated_pre_attr?: bizAttributeSelectorValueProp;
     /**
      * @description  关联属性-结束
      */
+    associated_next_attr?: bizAttributeSelectorValueProp;
     associatedNextAttr?: bizAttributeSelectorValueProp;
+    /**
+     * @description  开始事件
+     */
+    start?: start;
+    /**
+     * @description  结束事件
+     */
+    end?: start;
 }
 export interface UserDrillParamsProp {
     /**
@@ -124,7 +140,7 @@ export interface UserDrillParamsProp {
      */
     module?: string;
 }
-export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map';
+export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map' | 'boxplot';
 /**
  * 图表选择类型
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.0-interval.15",
+  "version": "1.0.0-interval.17",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -43,7 +43,7 @@
     "@types/uuid": "^9.0.2",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.81-page.3",
+    "@zgfe/business-lib": "1.1.81-page.9",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",