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

package/es/components/searchPanel/index.js

@@ -11,6 +11,7 @@ import { BizDatePicker, BizSelect, BizTargetDimension } from '@zgfe/business-lib
 import React, { useContext, useEffect, useState } from 'react';
 import { chartTypeOptions, getInitDate } from '../../constants';
 import { EventContext } from '../../types';
+import { normalOptions } from '../../modules/content/utils';
 import './styles/index.less';
 var classPrefix = 'search-panel';
 var SearchPanel = function SearchPanel(props) {
@@ -77,6 +78,7 @@ var SearchPanel = function SearchPanel(props) {
       chartType: chart.value
     }, data));
   };
+  console.log('BizTargetDimension', props.eventId);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -88,6 +90,7 @@ var SearchPanel = function SearchPanel(props) {
     onChange: onChangeTime,
     selectRange: 365
   }), /*#__PURE__*/React.createElement(BizTargetDimension, {
+    normalOptions: normalOptions,
     value: dimension,
     eventId: props.eventId,
     onChange: onDimensionChange

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/chart/index.js

@@ -13,7 +13,7 @@ import { BizChart, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
 import { EventTable, MiNone } from '../../components';
 import { judgeIsCity } from '../content/utils';
 import { getValue } from '../../modules/content/utils';
-import { getDefaultShow, getShowColor } from '../../utils/formData';
+import { getDefaultShow, getShowColor, getUserGroupsCompareData } from '../../utils/formData';
 import _ from 'lodash';
 import moment from 'moment';
 import { Apis, chartColors } from '../../constants';
@@ -99,7 +99,11 @@ var EventChart = function EventChart(props) {
       if (!res) {
         return;
       }
-      setDataSource(res.data);
+      if (params.userGroup.length > 1) {
+        setDataSource(getUserGroupsCompareData(res.data));
+      } else {
+        setDataSource(res.data);
+      }
       setLoading(false);
     }).catch(function () {
       setLoading(false);

package/es/modules/content/index.js

@@ -16,7 +16,7 @@ import './styles/index.less';
 import { Apis } from '../../constants';
 import { judgeIsCity, judgeIsArea, getValue } from './utils';
 import { ContentPanel, SearchPanel } from '../../components';
-import { getDefaultShow } from '../../utils/formData';
+import { getDefaultShow, getUserGroupsCompareData } from '../../utils/formData';
 import TopPanel from '../topPanel';
 var timer = 0;
 var ajaxFlag = true;
@@ -115,7 +115,11 @@ var EventContent = function EventContent(props) {
       }
       var result = res.data;
       setShowList(result ? getDefaultShow(result) : []);
-      setEventData(result);
+      if (searchData.userGroup.length > 1) {
+        setEventData(getUserGroupsCompareData(result));
+      } else {
+        setEventData(result);
+      }
       setFinalSearchData(_objectSpread({}, searchData));
       setTimeout(function () {
         setLoading(false);

package/es/modules/content/utils.d.ts

@@ -6,3 +6,7 @@ export declare const judgeIsCity: (name: string | undefined) => boolean;
 export declare const judgeIsArea: (name: string | undefined) => boolean;
 export declare const getValue: (param: bizAttributeSelectorValueProp, eventGroupList: EventGroup[] | undefined, eventEnvList: EnvProp[] | undefined, userPropList: UserProp[] | undefined) => AttributeSelect.Value | undefined;
 export declare const getNumberPanelData: (data: any) => Promise<unknown>;
+export declare const normalOptions: {
+    label: string;
+    value: string;
+}[];

package/es/modules/content/utils.js

@@ -13,7 +13,7 @@ export var judgeFilterValue = function judgeFilterValue(data, count) {
     }
     data.conditions.map(function (item) {
       var _item$values;
-      if (item.values && ((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0) flag = false;
+      if (item.values && (((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 || item.values[0] === '')) flag = false;
     });
   }
   return flag;
@@ -60,4 +60,17 @@ export var getNumberPanelData = function getNumberPanelData(data) {
       reject(err);
     });
   });
-};
+};
+export var normalOptions = [{
+  label: '人数',
+  value: 'number'
+}, {
+  label: '次数',
+  value: 'times'
+}, {
+  label: '活跃比',
+  value: 'active_ratio'
+}, {
+  label: '人均次数',
+  value: 'per'
+}];

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/style/index.less

@@ -39,10 +39,7 @@
     &-link {
       display: flex;
       justify-content: flex-end;
-      cursor: pointer;
       &:hover {
-        color: @primary-color;
-        // text-decoration: underline;
         .a-yanjingkai {
           display: block;
         }
@@ -52,6 +49,12 @@
         margin-right: 10px;
       }
     }
+    &-link:not(.not-to-detail) {
+      cursor: pointer;
+      &:hover {
+        color: @primary-color;
+      }
+    }
   }
   &-table-event-data {
     text-align: right !important;

package/es/utils/formData.d.ts

@@ -5,7 +5,10 @@ import { ResponseDataProps, SearchValue } from '../types';
 import { EventProps } from '../modules/home/types';
 import '../style/index.less';
 export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], userGroup: number[], searchData: SearchValue, showList: string[], onShowCallback: Function, onClickToDetailCallback: Function): ColumnsType<EventProps.ColumnsDataType>;
+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

@@ -1,6 +1,7 @@
-import { util, IconFont } from '@zgfe/business-lib';
-import React from 'react';
+import { util, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
+import React, { useContext } from 'react';
 import { message } from 'antd';
+import _ from 'lodash';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { chartColors } from '../constants/color';
 import { PropCategory } from '@zgfe/business-lib/es/attributeSelector/types';
@@ -88,20 +89,22 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       ellipsis: true,
       fixed: true,
       render: function render(val) {
+        console.log('事件', val);
+        var _val = getEventAliasName(val);
         return /*#__PURE__*/React.createElement(Tooltip, {
           className: "tooltip-name-box",
-          title: val
+          title: _val
         }, /*#__PURE__*/React.createElement("div", {
           className: "tooltip-name-box-market"
-        }, marketEventNameList.indexOf(val) !== -1 && /*#__PURE__*/React.createElement(IconFont, {
+        }, marketEventNameList.indexOf(_val) !== -1 && /*#__PURE__*/React.createElement(IconFont, {
           type: "shoucang"
-        }), util.strMiddleSplit(val, {
+        }), util.strMiddleSplit(_val, {
           maxLength: 20,
           beginLength: 10,
           endLength: 6,
           replaceStr: '...'
         })), /*#__PURE__*/React.createElement(CopyToClipboard, {
-          text: val,
+          text: _val,
           onCopy: function onCopy() {
             return message.success('复制成功！');
           }
@@ -137,12 +140,13 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
         return a["field".concat(i)] - b["field".concat(i)];
       },
       render: function render(text, record) {
+        var click = text > 0 && searchData.analysisIndex === 'number' ? true : false;
         return /*#__PURE__*/React.createElement("div", {
-          className: "".concat(classPrefix, "-table-td-link"),
+          className: "".concat(classPrefix, "-table-td-link ").concat(click ? '' : 'not-to-detail'),
           onClick: function onClick() {
-            return onClickToDetailCallback(record, columnData[i], text);
+            click ? onClickToDetailCallback(record, columnData[i], text) : null;
           }
-        }, /*#__PURE__*/React.createElement(IconFont, {
+        }, click && /*#__PURE__*/React.createElement(IconFont, {
           type: "a-yanjingkai"
         }), text);
       }
@@ -153,6 +157,41 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
   }
   return data;
 }
+export function getEventAliasName(name) {
+  var _useContext = useContext(BizGlobalDataContext),
+    eventGroupList = _useContext.eventGroupList;
+  var aliasName = '';
+  eventGroupList && eventGroupList.map(function (item) {
+    item.eventList.map(function (_item) {
+      if (_item.name === name) {
+        aliasName = _item.alias ? _item.alias : name;
+      }
+    });
+  });
+  return aliasName;
+}
+export function getUserGroupsCompareData(data) {
+  if (data.series.length <= 0) {
+    return data;
+  } else {
+    var _data = _.cloneDeep(data);
+    var _series = [];
+    _data.series.map(function (item, index) {
+      _series.push(item);
+      _data.series.map(function (_item, _index) {
+        if (item.names[1] === _item.names[1] && index !== _index) {
+          _series.push(_item);
+          delete _data.series[_index];
+          console.log(3333, _data.series);
+        }
+      });
+      delete _data.series[index];
+    });
+    console.log('_tempData', _series);
+    _data.series = _series;
+    return _data;
+  }
+}
 export function marketEventGroupList(eventGroupList) {
   var _marketName = [];
   eventGroupList && eventGroupList.map(function (item) {
@@ -163,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.10",
+  "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": "9f7d135adfb5489d93b11bdf86786fbb9f206d5d",
+  "gitHead": "29f7fb17b85c32080fc2ccf71d9db4275b6c60f5",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"