@zgfe/modules-event 0.0.2-event.11 → 0.0.2-event.13

package/es/components/topBar/index.js

@@ -13,6 +13,7 @@ import { BizAddToPanel, BizAddToScene, BizGlobalDataContext } from '@zgfe/busine
 import './styles/index.less';
 import { EventContext } from '../../types';
 import { chartTypes, platformOption } from '../../constants/fields';
+import { getWarningId } from '../../utils/formData';
 var classPrefix = 'modules-event-topbar';
 var TopBar = function TopBar(props) {
   var _useContext = useContext(EventContext),
@@ -49,19 +50,7 @@ var TopBar = function TopBar(props) {
     warningId = _useState10[0],
     setWarningId = _useState10[1];
   useEffect(function () {
-    if (eventData && eventData.series.length > 0) {
-      if (searchData === null || searchData === void 0 ? void 0 : searchData.id) {
-        setWarningId(searchData === null || searchData === void 0 ? void 0 : searchData.id);
-      } else {
-        var _eventGroupList$, _eventGroupList$$even;
-        if (eventGroupList && ((_eventGroupList$ = eventGroupList[0]) === null || _eventGroupList$ === void 0 ? void 0 : (_eventGroupList$$even = _eventGroupList$.eventList[0]) === null || _eventGroupList$$even === void 0 ? void 0 : _eventGroupList$$even.id)) {
-          var _eventGroupList$2, _eventGroupList$2$eve;
-          setWarningId((_eventGroupList$2 = eventGroupList[0]) === null || _eventGroupList$2 === void 0 ? void 0 : (_eventGroupList$2$eve = _eventGroupList$2.eventList[0]) === null || _eventGroupList$2$eve === void 0 ? void 0 : _eventGroupList$2$eve.id);
-        }
-      }
-    } else {
-      setWarningId(-1);
-    }
+    setWarningId(getWarningId(searchData, eventData, eventGroupList));
   }, [searchData, eventData, eventGroupList]);
   useEffect(function () {
     if (searchData === null || searchData === void 0 ? void 0 : searchData.id) {

package/es/modules/topPanel/index.js

@@ -8,7 +8,6 @@ import React, { useState } from 'react';
 import { Form, Button } from 'antd';
 import { BizUserGroupHeader } from '@zgfe/business-lib';
 import EventFilter from '../../components/eventFilter';
-import util from '../../utils/util';
 import './styles/index.less';
 var classPrefix = 'top-panel';
 var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -33,20 +32,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
     }
     if (allData.userGroup) {
-      _data.userGroup = [];
-      allData.userGroup.map(function (item) {
-        if (util.isArray(item)) {
-          var _arr = [];
-          item.map(function (_item) {
-            var _item$;
-            var _name = "".concat(_item[1].id, ":").concat((_item$ = _item[2]) === null || _item$ === void 0 ? void 0 : _item$.layerLabelId);
-            _arr.push(_name);
-          });
-          _data.userGroup && _data.userGroup.push(_arr);
-        } else {
-          _data.userGroup && _data.userGroup.push(item.id);
-        }
-      });
+      _data.userGroup = allData.userGroup;
       if (_data.userGroup.length <= 0) _data.userGroup = [0];
     }
     if (data.filterConditions) {
@@ -62,9 +48,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var resetting = function resetting() {
     form.resetFields();
     form.setFieldsValue({
-      userGroup: [{
-        id: 0
-      }],
+      userGroup: [0],
       filterConditions: null
     });
     props.onChange({
@@ -81,13 +65,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     colon: false,
     layout: "vertical",
     initialValues: {
-      userGroup: userGroup ? userGroup.map(function (item) {
-        return {
-          id: item
-        };
-      }) : [{
-        id: 0
-      }],
+      userGroup: userGroup ? userGroup : [0],
       filterConditions: {
         id: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.id,
         name: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.name,

package/es/utils/formData.d.ts

@@ -8,6 +8,7 @@ export declare function getColumns(eventGroupList: EventGroup[] | undefined, use
 export declare function getEventAliasName(name: string): string;
 export declare function getUserGroupsCompareData(data: ResponseDataProps): ResponseDataProps;
 export declare function marketEventGroupList(eventGroupList: EventGroup[] | undefined): string[];
+export declare function getWarningId(searchData: SearchValue, eventData: ResponseDataProps, eventGroupList: EventGroup[] | undefined): number;
 export declare function getAttrLabel(attrData: AttrConditionTypes.ItemValue, eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined): string | undefined;
 export declare function formTableData(originalData: ResponseDataProps, userGroups: number[], attrNum: number, showList?: string[]): EventProps.ColumnsDataType[];
 export declare function getDefaultShow(source: ResponseDataProps): string[];

package/es/utils/formData.js

@@ -202,6 +202,26 @@ export function marketEventGroupList(eventGroupList) {
   console.log(666, _marketName);
   return _marketName;
 }
+export function getWarningId(searchData, eventData, eventGroupList) {
+  var id = -1;
+  if (eventData && eventData.series.length > 0) {
+    if (searchData === null || searchData === void 0 ? void 0 : searchData.id) {
+      id = searchData === null || searchData === void 0 ? void 0 : searchData.id;
+    } else {
+      if (eventGroupList && eventGroupList.length > 0 && eventData) {
+        eventGroupList.map(function (item) {
+          item.eventList.map(function (_item) {
+            var _name = eventData.series[0].names[searchData.userGroup.length > 1 ? 1 : 0];
+            if (_item.name === _name || _item.alias === _name) {
+              id = _item.id;
+            }
+          });
+        });
+      }
+    }
+  }
+  return id;
+}
 export function getAttrLabel(attrData, eventGroupList, userPropList, eventEnvList) {
   if (!attrData) return;
   var type = attrData.propCategory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.0.2-event.11",
+  "version": "0.0.2-event.13",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -36,7 +36,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.81-panel1.0.0",
+    "@zgfe/business-lib": "1.1.81-page.9",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "ce44449e1fb45e5415e75ebd8d04c69b813cc1c0",
+  "gitHead": "29f7fb17b85c32080fc2ccf71d9db4275b6c60f5",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"