@zgfe/modules-event 1.0.3 → 1.0.5-bug.0

package/es/modules/chart/index.js

@@ -15,7 +15,7 @@ import { Tooltip, Empty } from 'antd';
 import { BizChart, BizGlobalDataContext, ajax, BizLoading } from '@zgfe/business-lib';
 import { EventTable } from '../../components';
 import { judgeIsCity } from '../content/utils';
-import { getValue } from '../../modules/content/utils';
+import { getValue, getMapChartData } from '../../modules/content/utils';
 import { getDefaultShow, getShowColor, getUserGroupsCompareData, getSortData, getChartDataEventAliasName } from '../../utils/formData';
 import _ from 'lodash';
 import moment from 'moment';
@@ -152,7 +152,7 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
         ref: ref,
         key: chartType,
         type: chartType,
-        data: dataSource,
+        data: chartType === 'map' ? getMapChartData(dataSource) : dataSource,
         legendPosition: "bottom",
         showList: showList,
         colors: showColors,

package/es/modules/content/index.js

@@ -140,7 +140,9 @@ var EventContent = function EventContent(props) {
       }
       var result = res.data;
       var _data = searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList);
-      setShowList(_data ? getDefaultShow(_data) : []);
+      var list = _data ? getDefaultShow(_data) : [];
+      setShowList(list);
+      props.onChangeShow && props.onChangeShow(list);
       if (['bar', 'pie', 'map'].indexOf(searchData.chartType) !== -1) {
         _data = getSortData(_data);
       }
@@ -169,6 +171,7 @@ var EventContent = function EventContent(props) {
   };
   var onChangeShow = function onChangeShow(data) {
     setShowList(data);
+    props.onChangeShow && props.onChangeShow(data);
   };
   var platformChange = function platformChange(data) {
     ajaxFlag = true;

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

@@ -6,5 +6,6 @@ export declare namespace EventContentProps {
         show?: string[];
         onSearching?: (flag: boolean) => void;
         initSearch?: () => void;
+        onChangeShow?: (data: string[]) => void;
     }
 }

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

@@ -1,6 +1,7 @@
 import { AttributeSelect, AttrConditionTypes } from '@zgfe/business-lib';
 import { bizAttributeSelectorValueProp } from '../../types';
 import { EventGroup, UserProp, EnvProp } from '@zgfe/business-lib/es/attributeSelector/types';
+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;

package/es/modules/content/utils.js

@@ -6,6 +6,23 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { ajax } from '@zgfe/business-lib';
 import { Apis } from '../../constants';
+import _ from 'lodash';
+export var getMapChartData = function getMapChartData(data) {
+  var _data = _.cloneDeep(data);
+  _data.series.map(function (item) {
+    if (item.names.length > 1) {
+      if (item.names[1] === '新疆维吾尔自治区') {
+        item.names = [item.names[0], '新疆'];
+      }
+      item.names = item.names.reverse();
+    } else {
+      if (item.names[0] === '新疆维吾尔自治区') {
+        item.names = ['新疆'];
+      }
+    }
+  });
+  return _data;
+};
 export var judgeFilterValue = function judgeFilterValue(data, count) {
   var flag = true;
   if (data === undefined) {

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

@@ -39,39 +39,13 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 268
+    defaultApp: 461
   }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsDetail(false);
     }
   }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleEvent, {
     onChange: onChange,
-    defaultValue: {
-      data: {
-        app_id: 268,
-        module: 'event',
-        appId: 268,
-        platform: 0,
-        userGroup: [],
-        time: {
-          begin: '2023-11-08',
-          end: '2023-11-15',
-          relative: [7, 0],
-          unit: 'day'
-        },
-        chartType: 'line',
-        analysisIndex: 'sum',
-        analysisAttr: 'total',
-        id: 16883,
-        name: 'revenue',
-        analysisSubject: {
-          subjectId: 53,
-          subjectName: 'price',
-          subjectAlias: null,
-          unit: '元'
-        }
-      }
-    },
     afterEditTarget: afterEditTarget,
     onUserDrill: onUserDrill
   }));

package/es/modules/home/index.js

@@ -127,7 +127,8 @@ var ModuleEvent = function ModuleEvent(props) {
         params: _objectSpread({
           app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
           module: 'event'
-        }, searchData)
+        }, searchData),
+        showList: showList
       }
     } : undefined,
     disabled: props === null || props === void 0 ? void 0 : props.panelDisabled,
@@ -163,7 +164,8 @@ var ModuleEvent = function ModuleEvent(props) {
     elementId: elementId,
     value: searchData,
     show: showList,
-    initSearch: initSearch
+    initSearch: initSearch,
+    onChangeShow: setShowList
   })));
 };
 ModuleEvent.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.3",
+  "version": "1.0.5-bug.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "b54a40e64bc719c7e6aee747f389d8ebfe1d2dc3",
+  "gitHead": "c547470b1d32499155edbb36a23e1d9677ea2503",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"