@zgfe/modules-event 1.0.29-zhongyuan-event.1 → 1.0.29-zhongyuan-event.2

package/es/components/table/index.js

@@ -25,7 +25,7 @@ import { Modal, message, Table, ConfigProvider, Empty, Tooltip, Typography } fro
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { formTableData, getColumns } from '../../utils/formData';
 import './styles/index.less';
-import { getValue } from '../../modules/content/utils';
+import { useGetValue } from '../../modules/content/utils';
 import { EventContext } from '../../types';
 import { getEventAliasName } from '../../utils/formData';
 var classPrefix = 'event-mi-table';
@@ -190,7 +190,7 @@ var EventTable = function EventTable(props) {
       seriesNames.push(base64.encode('用户群'));
     }
     if (searchData.dimension) {
-      seriesNames.push(base64.encode(getValue(searchData.dimension, eventGroupList, eventEnvList, userPropList, searchData).label));
+      seriesNames.push(base64.encode(useGetValue(searchData.dimension, eventGroupList, eventEnvList, userPropList, searchData).label));
     }
     if (searchData.id && !searchData.dimension || !searchData.id) {
       seriesNames.push(base64.encode('事件'));

package/es/modules/chart/index.js

@@ -15,7 +15,7 @@ import { Tooltip, Empty } from 'antd';
 import { BizChart, BizGlobalDataContext, ajax, BizLoading, BizEmpty } from '@zgfe/business-lib';
 import { EventTable } from '../../components';
 import { judgeIsCity } from '../content/utils';
-import { getValue, getMapChartData } from '../../modules/content/utils';
+import { useGetValue, getMapChartData } from '../../modules/content/utils';
 import { getShowColor, getUserGroupsCompareData, getSortData, getChartDataEventAliasName, formTableData, sortOriginalData } from '../../utils/formData';
 import _ from 'lodash';
 import moment from 'moment';
@@ -95,8 +95,8 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (completedSearchData.id) {
       var dimensions = completedSearchData.dimension;
       if (type === 'map' && dimensions) {
-        var _getValue;
-        setIsCity(judgeIsCity((_getValue = getValue(dimensions, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name));
+        var _useGetValue;
+        setIsCity(judgeIsCity((_useGetValue = useGetValue(dimensions, eventGroupList, eventEnvList, userPropList)) === null || _useGetValue === void 0 ? void 0 : _useGetValue.name));
       }
     }
   }, [completedSearchData, props.type]);

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

@@ -6,7 +6,7 @@ export declare const getMapChartData: (data: any) => any;
 export declare const judgeFilterValue: (data: AttrConditionTypes.GroupValue | undefined, count: number) => boolean;
 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, searchData?: SearchValue) => AttributeSelect.Value | undefined;
+export declare const useGetValue: (param: bizAttributeSelectorValueProp, eventGroupList: EventGroup[] | undefined, eventEnvList: EnvProp[] | undefined, userPropList: UserProp[] | undefined, searchData?: SearchValue) => AttributeSelect.Value | undefined;
 export declare const getNumberPanelData: (data: any) => Promise<unknown>;
 export declare const normalOptions: (type: any) => {
     label: string;

package/es/modules/content/utils.js

@@ -20,8 +20,6 @@ import { fetchEventAttrs } from '@zgfe/business-lib/es/utils/eventApi';
 import { Apis } from '../../constants';
 import _ from 'lodash';
 import { useContext } from 'react';
-var _useContext = useContext(BizGlobalDataContext),
-  currentApp = _useContext.currentApp;
 export var getMapChartData = function getMapChartData(data) {
   var _data$series;
   var _data = _.cloneDeep(data);
@@ -62,7 +60,9 @@ export var judgeIsArea = function judgeIsArea(name) {
   var areaData = ['current_area', 'current_city', 'area', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
 };
-export var getValue = function getValue(param, eventGroupList, eventEnvList, userPropList, searchData) {
+export var useGetValue = function useGetValue(param, eventGroupList, eventEnvList, userPropList, searchData) {
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
   var res = undefined;
   if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'envProp') {
     eventEnvList === null || eventEnvList === void 0 ? void 0 : eventEnvList.forEach(function (attr) {

package/es/utils/formData.js

@@ -13,7 +13,7 @@ import { chartColors } from '../constants/color';
 import { PropCategory } from '@zgfe/business-lib/es/attributeSelector/types';
 import { Tooltip } from 'antd';
 import '../style/index.less';
-import { getValue } from '../modules/content/utils';
+import { useGetValue } from '../modules/content/utils';
 var classPrefix = 'event-form-data';
 export function sortOriginalData(data, sorter) {
   var columnKey = sorter.columnKey,
@@ -79,9 +79,9 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     });
   }
   if (searchData.dimension) {
-    var _getValue;
+    var _useGetValue;
     data.push({
-      title: (_getValue = getValue(searchData.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.label,
+      title: (_useGetValue = useGetValue(searchData.dimension, eventGroupList, eventEnvList, userPropList)) === null || _useGetValue === void 0 ? void 0 : _useGetValue.label,
       width: 180,
       dataIndex: 'dimension',
       key: 'dimension',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.29-zhongyuan-event.1",
+  "version": "1.0.29-zhongyuan-event.2",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "private": false,
@@ -54,7 +54,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "20d332eba164ff00500773debe6fdd32c6e09145",
+  "gitHead": "da03822e4a1751cecd3170a4610be63151067cb6",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }