@zgfe/modules-event 1.0.29-zhongyuan.10 → 1.0.29-zhongyuan.12

package/es/components/eventFilter/index.js

@@ -201,7 +201,8 @@ var EventFilter = function EventFilter(props) {
         propCategory: attr.propCategory,
         category: attr.category,
         value: _value,
-        id: attr.id
+        id: attr.id,
+        encryptionType: attr.encryptionType
       });
     }
   };

package/es/components/eventFilter/types.d.ts

@@ -9,6 +9,7 @@ export interface ConditionsnProps {
     attrName?: string | undefined;
     label?: string | undefined;
     dimensionSub?: string | undefined;
+    encryptionType?: number;
 }
 export interface EventFilterProps {
     value?: eventProps | number[];

package/es/components/table/index.js

@@ -91,9 +91,12 @@ var EventTable = function EventTable(props) {
           originalName: '总计',
           userGroup: Object.keys(item)[0]
         };
+        var sum = 0;
         Object.values(item)[0].forEach(function (item, index) {
           data["field".concat(index)] = item;
+          sum += item;
         });
+        data.attrSum = sum;
         dataAll.push(data);
       });
       setPvTitle(dataSource.eventPvTitle.split(';').map(function (item) {
@@ -109,7 +112,7 @@ var EventTable = function EventTable(props) {
       props.changeShowByName(nameGroup);
     };
     var onClickToDetail = function onClickToDetail(item, time, count) {
-      var _searchData$filters;
+      var _searchData$dimension, _searchData$filters;
       var userGroupData = userGroup[0] == null ? [] : [userGroup[0]];
       if ((userGroup === null || userGroup === void 0 ? void 0 : userGroup.length) > 1) {
         userGroupList && userGroupList.forEach(function (user) {
@@ -121,7 +124,7 @@ var EventTable = function EventTable(props) {
       var _time = time.split('|');
       var groupValue = '';
       if (searchData.dimension && item.dimension) {
-        groupValue = item.dimension;
+        groupValue = item.originalName;
       } else {
         eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
           group.eventList.forEach(function (event) {
@@ -138,6 +141,7 @@ var EventTable = function EventTable(props) {
         module: 'event',
         params: {
           groupValue: groupValue,
+          groupValueEncry: (((_searchData$dimension = searchData.dimension) === null || _searchData$dimension === void 0 ? void 0 : _searchData$dimension.encryptionType) || 0) > 0,
           id: searchData.id,
           userGroup: userGroupData,
           chartType: searchData.chartType,

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

@@ -11,7 +11,7 @@ import './styles/index.less';
 import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
 export default (function () {
-  var _useState = useState(false),
+  var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     isDetail = _useState2[0],
     setIsDetail = _useState2[1];
@@ -24,6 +24,9 @@ export default (function () {
     setSearchParams = _useState6[1];
   useEffect(function () {
     setGlobalConfig(requestConfig);
+    setTimeout(function () {
+      setIsDetail(false);
+    }, 3000);
   }, []);
   var afterEditTarget = function afterEditTarget(type, data) {
     console.log("".concat(type, "\u56DE\u8C03"), data);

package/es/types.d.ts

@@ -7,6 +7,7 @@ export interface bizAttributeSelectorValueProp {
     value?: number | string;
     id?: number;
     key?: number | string;
+    encryptionType?: number;
 }
 export interface AnalysisSubject {
     subjectId?: number;
@@ -76,6 +77,7 @@ export interface SeriesProps {
     index?: string;
     duration?: TableChildrenProps[];
     diyTarget?: boolean;
+    attrSum?: number;
 }
 export interface TableChildrenProps {
     name: string;

package/es/utils/formData.js

@@ -358,10 +358,12 @@ export function formTableData(originalData, userGroups, attrNum, showList) {
       name: name,
       userGroup: userGroup,
       nameGroup: nameGroup,
-      color: color
+      color: color,
+      attrSum: item.attrSum
     };
     if (attrNum) {
       data["dimension"] = name;
+      data['originalName'] = originalName;
     } else {
       data["eventName"] = name;
       data["originalName"] = originalName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.29-zhongyuan.10",
+  "version": "1.0.29-zhongyuan.12",
   "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": "852c33c50880e321ed603c79733eeb0ef6b3774c",
+  "gitHead": "071002b3c7c6a94b9f48c13eb7641ce46631c363",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }