@zgfe/modules-event 0.1.5-event.5 → 0.1.5-event.7

package/es/components/eventFilter/index.js

@@ -212,6 +212,7 @@ var EventFilter = function EventFilter(props) {
     onlyAnd: true,
     enableEventProp: true,
     enableDelete: true,
+    enableUserProp: analysisSubjectType === 'event' ? false : true,
     eventIdList: [event.id],
     onChange: onChangeFilters,
     onConditionsCount: setCount

package/es/components/table/index.js

@@ -112,8 +112,6 @@ var EventTable = function EventTable(props) {
         },
         source: 'EVENT',
         url: searchData.analysisSubject ? '/zg/web/v2/data/eventSubjectDetail' : '/zg/web/v2/data/appEventBatch',
-        downloadUrl: searchData.analysisSubject ? '/zg/web/v2/data/eventSubjectDetailDownLoad' : undefined,
-        downloadFileName: '',
         analysisSubject: searchData.analysisSubject ? searchData.analysisSubject : undefined
       }, _objectSpread(_objectSpread({
         source: 'EVENT'
@@ -151,7 +149,7 @@ var EventTable = function EventTable(props) {
     if (searchData.id && !searchData.dimension || !searchData.id) {
       seriesNames.push(base64.encode('事件'));
     }
-    var fname = "\u4E8B\u4EF6_".concat((searchData === null || searchData === void 0 ? void 0 : searchData.name) ? getEventAliasName(searchData === null || searchData === void 0 ? void 0 : searchData.name, eventGroupList) : '事件概览');
+    var fname = "\u4E8B\u4EF6\u5206\u6790-".concat((searchData === null || searchData === void 0 ? void 0 : searchData.name) ? getEventAliasName(searchData === null || searchData === void 0 ? void 0 : searchData.name, eventGroupList) : '事件概览');
     var params = _objectSpread(_objectSpread({
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
       platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0

package/es/modules/content/index.js

@@ -123,11 +123,12 @@ var EventContent = function EventContent(props) {
   };
   var fetchRequest = function fetchRequest(flag) {
     if (JSON.stringify(searchData) === JSON.stringify(finalSearchData)) {
+      console.log('数据没变，终止请求', searchData);
       return;
     }
     if (flag !== undefined) ajaxFlag = flag;
-    if (!ajaxFlag) return;
     if (analysisSubjectType === 'event' && !searchData.analysisSubject) return;
+    if (!ajaxFlag) return;
     setLoading(true);
     setEventData(undefined);
     if (typeof cancel === 'function') {

package/es/modules/topPanel/index.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Form, Button } from 'antd';
 import { BizUserGroupHeader, BizSelect } from '@zgfe/business-lib';
 import EventFilter from '../../components/eventFilter';
@@ -37,6 +37,17 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var countChange = function countChange(count) {
     setmarginStyle(count > 0 ? true : false);
   };
+  useEffect(function () {
+    console.log('value===', value);
+    if (value) {
+      var analysisSubject = value.analysisSubject;
+      setAnalysisSubjectType({
+        value: analysisSubject && analysisSubject.analysisSubjectType,
+        label: analysisSubject && analysisSubject.analysisSubjectType === 'user' ? 'user' : 'event'
+      });
+      console.log('setAnalysisSubjectType useEffect', analysisSubjectType);
+    }
+  }, []);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -57,6 +68,15 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         _data.userGroup = [0];
       }
     }
+    if (allData.analysisSubject && allData.analysisSubject.subjectId) {
+      _data.analysisSubject = {
+        subjectId: allData.analysisSubject.subjectId,
+        subjectName: allData.analysisSubject.subjectName,
+        subjectAlias: allData.analysisSubject.subjectAlias,
+        unit: allData.analysisSubject.unit,
+        analysisSubjectType: analysisSubjectType.value
+      };
+    }
     if (data.filterConditions) {
       if (finalSearchData && finalSearchData.id && data.filterConditions.id === finalSearchData.id && data.filterConditions.eventGroupId === finalSearchData.eventGroupId) {
         ajaxFlag = false;
@@ -64,14 +84,6 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         ajaxFlag = true;
       }
     }
-    if (data.analysisSubject && data.analysisSubject.subjectId) {
-      _data.analysisSubject = {
-        subjectId: data.analysisSubject.subjectId,
-        subjectName: data.analysisSubject.subjectName,
-        subjectAlias: data.analysisSubject.subjectAlias,
-        unit: data.analysisSubject.unit
-      };
-    }
     props.onChange(_data, ajaxFlag);
   };
   var resetting = function resetting() {
@@ -104,11 +116,15 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         filters: value === null || value === void 0 ? void 0 : value.filters,
         eventGroupId: value === null || value === void 0 ? void 0 : value.eventGroupId
       },
+      analysisSubjectType: {
+        value: 'event',
+        label: '事件属性'
+      },
       analysisSubject: {
-        subjectId: 0,
-        subjectName: '',
-        subjectAlias: '',
-        unit: ''
+        subjectId: '12',
+        subjectName: '12321',
+        subjectAlias: '123',
+        unit: '123'
       }
     },
     scrollToFirstError: true,

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

@@ -13,9 +13,10 @@ interface analysisSubject {
     unit?: string;
     subjectAlias?: string;
     subjectName?: string;
+    analysisSubjectType?: string;
 }
 interface analysisSubjectType {
-    value?: number;
+    value?: string;
     user?: string;
 }
 export interface FormDataProps {

package/es/types.d.ts

@@ -15,6 +15,7 @@ export interface AnalysisSubject {
     unit?: string;
     subjectAlias?: string;
     subjectName?: string;
+    analysisSubjectType?: string;
 }
 export interface eventProps {
     id?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/modules-event",
-    "version": "0.1.5-event.5",
+    "version": "0.1.5-event.7",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",
@@ -49,7 +49,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "ac609e4c3e8d783016cac54006054c6f91521bf8",
+    "gitHead": "318f569258b1d6d69ee2c95e64e25a6fa441c620",
     "dependencies": {
         "react-copy-to-clipboard": "^5.1.0",
         "react-highlight": "^0.15.0"