@zgfe/modules-event 0.0.2-event.30 → 0.0.2-event.32

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, getUserGroupsCompareData } from '../../utils/formData';
+import { getDefaultShow, getShowColor, getUserGroupsCompareData, getChartDataEventAliasName } from '../../utils/formData';
 import _ from 'lodash';
 import moment from 'moment';
 import { Apis, chartColors } from '../../constants';
@@ -52,16 +52,6 @@ var EventChart = function EventChart(props) {
     if (!dataSource) return chartColors;
     return getShowColor(dataSource, showList);
   }, [showList]);
-  var chartData = useMemo(function () {
-    console.log('chartData?.length', dataSource);
-    if (dataSource) {
-      var data = _.cloneDeep(dataSource);
-      data.x_axis = dataSource.xAxis;
-      return data;
-    } else {
-      return [];
-    }
-  }, [dataSource, chartType]);
   useEffect(function () {
     if (!props.dataSource) {
       console.log('看板列表访问-请求查询', params);
@@ -108,10 +98,12 @@ var EventChart = function EventChart(props) {
       if (!res) {
         return;
       }
+      var _data = getChartDataEventAliasName(res.data, eventGroupList, params.userGroup.length);
+      console.log('chartData?.length-2', _data);
       if (params.userGroup.length > 1) {
-        setDataSource(getUserGroupsCompareData(res.data));
+        setDataSource(getUserGroupsCompareData(_data));
       } else {
-        setDataSource(res.data);
+        setDataSource(_data);
       }
       setLoading(false);
     }).catch(function () {
@@ -148,7 +140,7 @@ var EventChart = function EventChart(props) {
     }, /*#__PURE__*/React.createElement("div", null, "\u6570\u636E\u66F4\u65B0\u65F6\u95F4\uFF1A", moment().format('YYYY-MM-DD HH:mm')));
   };
   var chartBox = function chartBox() {
-    if (chartData.series.length <= 0) {
+    if (dataSource.series.length <= 0) {
       return /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-table-empty")
       }, /*#__PURE__*/React.createElement("img", {
@@ -161,7 +153,7 @@ var EventChart = function EventChart(props) {
       }, dataUpdateTime(), /*#__PURE__*/React.createElement(BizChart, {
         key: chartType,
         type: chartType,
-        data: chartData,
+        data: dataSource,
         legendPosition: "bottom",
         showList: showList,
         colors: showColors,

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, getUserGroupsCompareData } from '../../utils/formData';
+import { getDefaultShow, getUserGroupsCompareData, getChartDataEventAliasName } from '../../utils/formData';
 import TopPanel from '../topPanel';
 var timer = 0;
 var ajaxFlag = true;
@@ -68,12 +68,16 @@ var EventContent = function EventContent(props) {
     }
   }, [props.defaultValue]);
   useEffect(function () {
-    if (searchData && searchData.dimension) {
-      var _getValue;
-      var _attrName = (_getValue = getValue(searchData.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name;
-      if (_attrName) {
-        setEnableSelectChart(judgeIsArea(_attrName));
-        setIsCity(judgeIsCity(_attrName));
+    if (searchData) {
+      if (searchData.dimension) {
+        var _getValue;
+        var _attrName = (_getValue = getValue(searchData.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name;
+        if (_attrName) {
+          setEnableSelectChart(judgeIsArea(_attrName));
+          setIsCity(judgeIsCity(_attrName));
+        }
+      } else {
+        setEnableSelectChart(false);
       }
     }
     if (timer) clearTimeout(timer);
@@ -115,12 +119,9 @@ var EventContent = function EventContent(props) {
         return;
       }
       var result = res.data;
-      setShowList(result ? getDefaultShow(result) : []);
-      if (searchData.userGroup.length > 1) {
-        setEventData(getUserGroupsCompareData(result));
-      } else {
-        setEventData(result);
-      }
+      var _data = getChartDataEventAliasName(result, eventGroupList, searchData.userGroup.length);
+      setShowList(_data ? getDefaultShow(_data) : []);
+      setEventData(getUserGroupsCompareData(_data));
       setFinalSearchData(_objectSpread({}, searchData));
       setTimeout(function () {
         setLoading(false);

package/es/utils/formData.d.ts

@@ -1,10 +1,12 @@
 import { AttrConditionTypes } from '@zgfe/business-lib';
 import type { ColumnsType } from 'antd/es/table';
+import { eventChartProps } from '../modules/chart/types';
 import { EventGroup, UserProp, EnvProp } from '@zgfe/business-lib/es/attributeSelector/types';
 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, onSelectEvent?: (id: number, name: string) => void): ColumnsType<EventProps.ColumnsDataType>;
+export declare function getChartDataEventAliasName(dataSource: eventChartProps.ChartTypesProps, eventGroupList: EventGroup[] | undefined, userGroupLength: number): eventChartProps.ChartTypesProps;
 export declare function getEventAliasName(name: string, eventGroupList: EventGroup[] | undefined): string;
 export declare function getEventAliasId(name: string, eventGroupList: EventGroup[] | undefined): number;
 export declare function getUserGroupsCompareData(data: ResponseDataProps): ResponseDataProps;

package/es/utils/formData.js

@@ -89,8 +89,8 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       ellipsis: true,
       fixed: true,
       render: function render(val) {
-        console.log('事件', val);
-        var _val = getEventAliasName(val, eventGroupList);
+        console.log('事件', val, eventGroupList);
+        var _val = val;
         return /*#__PURE__*/React.createElement(Tooltip, {
           className: "tooltip-name-box",
           title: _val
@@ -160,6 +160,17 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
   }
   return data;
 }
+export function getChartDataEventAliasName(dataSource, eventGroupList, userGroupLength) {
+  var data = _.cloneDeep(dataSource);
+  var series = [];
+  data.series.map(function (item) {
+    item.names = userGroupLength > 1 ? [item.names[0], getEventAliasName(item.names[1], eventGroupList)] : [getEventAliasName(item.names[0], eventGroupList)];
+    series.push(item);
+  });
+  data.series = series;
+  console.log('getChartDataEventAliasName', data, dataSource);
+  return data;
+}
 export function getEventAliasName(name, eventGroupList) {
   var aliasName = '';
   eventGroupList && eventGroupList.map(function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.0.2-event.30",
+  "version": "0.0.2-event.32",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "7c82bb6d4001a0471fb61c7b49f7b3765c4defeb",
+  "gitHead": "549e21ba3723b7a59bbb6cbbb55de9743411c5f9",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"