@zgfe/modules-event 0.1.5-event.43 → 0.1.5-event.46

package/es/components/eventFilter/index.js

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Tooltip } from 'antd';
 import React, { useEffect, useRef, useState, useContext } from 'react';
-import { BizEventSelector, BizAttributeSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
+import { BizEventSelector, BizAttributeSelector, IconFont, BizAttrConditionGroup, BizGlobalDataContext } from '@zgfe/business-lib';
 import { EventContext } from '../../types';
 import './styles/index.less';
 import { judgeIsCity, judgeIsArea } from '../../modules/content/utils';
@@ -27,6 +27,9 @@ var EventFilter = function EventFilter(props) {
     selectEventData = _useContext.selectEventData,
     searchData = _useContext.searchData,
     setSearchData = _useContext.setSearchData;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    _useContext2$eventIdM = _useContext2.eventIdMap,
+    eventIdMap = _useContext2$eventIdM === void 0 ? {} : _useContext2$eventIdM;
   var _useState = useState(props.value && props.value.filters && props.value.filters.conditions ? props.value.filters.conditions.length : 0),
     _useState2 = _slicedToArray(_useState, 2),
     count = _useState2[0],
@@ -66,7 +69,9 @@ var EventFilter = function EventFilter(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     bizAttributeSelectorValue = _useState14[0],
     setBizAttributeSelectorValue = _useState14[1];
-  var _useState15 = useState([]),
+  var _useState15 = useState(_.isArray(props.value) ? props.value.map(function (id) {
+      return eventIdMap[id];
+    }) : []),
     _useState16 = _slicedToArray(_useState15, 2),
     eventList = _useState16[0],
     setEventList = _useState16[1];
@@ -193,14 +198,16 @@ var EventFilter = function EventFilter(props) {
   }, [bizAttributeSelectorValue, filter, event, group, eventList]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: analysisType === 'eventProp' && eventList.length > 1 ? "".concat(classPrefix, "-multiple") : ''
+  }, /*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,
     key: "".concat(analysisType),
     multiple: analysisType === 'eventProp',
     showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,
-    defaultValue: analysisType === 'eventProp' ? [] : {
+    defaultValue: analysisType === 'eventProp' ? eventList : {
       event: event,
       group: group
     },

package/es/components/eventFilter/styles/index.less

@@ -24,4 +24,9 @@
   > :nth-child(1):hover {
     background: #e8efff;
   }
+  &-multiple {
+    .biz-event-select {
+      width: 100% !important;
+    }
+  }
 }

package/es/modules/home/demo/index.js

@@ -21,7 +21,6 @@ export default (function () {
     setDetailParams = _useState4[1];
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
-    searchParams = _useState6[0],
     setSearchParams = _useState6[1];
   useEffect(function () {
     setGlobalConfig(requestConfig);
@@ -47,7 +46,26 @@ export default (function () {
     }
   }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleEvent, {
     onChange: onChange,
-    defaultValue: searchParams,
+    defaultValue: {
+      data: {
+        analysisIndex: 'number',
+        chartType: 'line',
+        time: {
+          begin: '2023-10-24',
+          end: '2023-10-31',
+          relative: [7, 0],
+          unit: 'day'
+        },
+        userGroup: [],
+        eventIds: [18065, 18067, 18063, 18064],
+        analysisSubject: {
+          subjectId: 91,
+          subjectName: 'url',
+          subjectAlias: '网址',
+          unit: '达不溜'
+        }
+      }
+    },
     afterEditTarget: afterEditTarget,
     onUserDrill: onUserDrill
   }));

package/es/modules/topPanel/index.js

@@ -47,7 +47,6 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var userGroup = value.userGroup;
   function onSearch(data) {
     var _data$filterCondition, _data$filterCondition2, _data$filterCondition3;
-    console.log('查询参数', data);
     var searchData = _objectSpread(_objectSpread({
       analysisSubject: data.analysisSubject ? {
         subjectId: data.analysisSubject.id || data.analysisSubject.subjectId,
@@ -102,7 +101,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     layout: "vertical",
     initialValues: {
       userGroup: userGroup ? userGroup : [0],
-      filterConditions: {
+      filterConditions: (value === null || value === void 0 ? void 0 : value.eventIds) || {
         id: value === null || value === void 0 ? void 0 : value.id,
         name: value === null || value === void 0 ? void 0 : value.name,
         dimension: value === null || value === void 0 ? void 0 : value.dimension,
@@ -149,7 +148,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: "".concat(classPrefix, "-form-event"),
     rules: [{
       validator: function validator(_rule, value) {
-        if (value && value.id) {
+        if (value && (value.id || value.subjectId)) {
           return Promise.resolve();
         } else {
           return Promise.reject('请选择分析主体');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/modules-event",
-    "version": "0.1.5-event.43",
+    "version": "0.1.5-event.46",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",
@@ -49,7 +49,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "460ac62899547f82ed459f4e5ecb395c6b272a69",
+    "gitHead": "e2e8f137fc4e9753affc88d4e0b75fdbe6a01622",
     "dependencies": {
         "react-copy-to-clipboard": "^5.1.0",
         "react-highlight": "^0.15.0"