@zgfe/modules-dm 1.0.57-zhongyuan.68 → 1.0.57-zhongyuan.69

package/es/modules/dataMap/component/rightDetail.js

@@ -21,7 +21,7 @@ import { Card, Form, Input, Upload, message, Table, Button, Space, Empty, Spin }
 import { LoadingOutlined, PlusOutlined, SlidersTwoTone } from '@ant-design/icons';
 import React, { useState, useContext, useEffect } from 'react';
 import { IconFont, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
-import { fetchAllEvents } from '@zgfe/business-lib/es/utils/eventApi';
+import { fetchEventAttrs } from '@zgfe/business-lib/es/utils/eventApi';
 import apis from '../../../constants/api';
 import request from '../../../utils/ajax';
 import { guid } from '../../../utils/index';
@@ -306,7 +306,7 @@ var RightDetail = function RightDetail(props) {
               break;
             }
             _context3.next = 9;
-            return fetchAllEvents(currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
+            return fetchEventAttrs(currentMap === null || currentMap === void 0 ? void 0 : currentMap.eventId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
           case 9:
             attrListApi = _context3.sent;
             // 事件下的细分
@@ -325,7 +325,7 @@ var RightDetail = function RightDetail(props) {
                 operator: 'equal',
                 propCategory: 'eventProp',
                 type: moduleAttrObj.type,
-                values: moduleAttrObj === null || moduleAttrObj === void 0 ? void 0 : moduleAttrObj.values
+                values: [currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.moduleAttrName]
               };
               modulePageJsonList.push(_obj);
             }
@@ -338,7 +338,7 @@ var RightDetail = function RightDetail(props) {
                 operator: 'equal',
                 propCategory: 'eventProp',
                 type: pageAttrObj.type,
-                values: pageAttrObj === null || pageAttrObj === void 0 ? void 0 : pageAttrObj.values
+                values: [currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.pageAttrName]
               };
               modulePageJsonList.push(obj1);
             }
@@ -349,15 +349,17 @@ var RightDetail = function RightDetail(props) {
             }; // console.log(allFilterObj, 'allFilterObj');
             // 细分的 属性值
             globalDimensionsList = [];
-            xifenList.forEach(function (o) {
-              var obj = {
-                propCategory: o.inquire.propCategory,
-                type: o.inquire.type,
-                attrId: o.inquire.id,
-                attrName: o.inquire.label
-              };
-              globalDimensionsList.push(obj);
-            });
+            if (xifenList) {
+              xifenList.forEach(function (o) {
+                var obj = {
+                  propCategory: o.inquire.propCategory,
+                  type: o.inquire.type,
+                  attrId: o.inquire.id,
+                  attrName: o.inquire.label
+                };
+                globalDimensionsList.push(obj);
+              });
+            }
             resultParams = {
               data: {
                 chartType: 'line',
@@ -412,7 +414,7 @@ var RightDetail = function RightDetail(props) {
             // console.log(currentTreeData, currentMap, eventGroupList,eventNameMap, 'currentTreeData');
             haveEventName = eventNameMap === null || eventNameMap === void 0 ? void 0 : eventNameMap[currentTreeData.eventName]; // 查找事件
             _context4.next = 3;
-            return fetchAllEvents(currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.eventId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
+            return fetchEventAttrs(currentTreeData === null || currentTreeData === void 0 ? void 0 : currentTreeData.eventId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
           case 3:
             attrListApi = _context4.sent;
             // 事件下的细分

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.68",
+  "version": "1.0.57-zhongyuan.69",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "5d29d195368def27f68c28f3e72174fcb44e60d8",
+  "gitHead": "cf0b1932bc6f8258b52b79ade3fe3eb8170313ed",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }