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

package/es/style/index.less

@@ -1,62 +1,62 @@
-@import '~@zgfe/business-lib/es/assets/styles/variable.less';
-.event-form-data {
-  &-table-td {
-    padding: 0 !important;
-
-    &-show {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      min-width: 60px;
-      height: 48px;
-      cursor: pointer;
-      span {
-        width: 10px;
-        height: 10px;
-        border-radius: 50%;
-        cursor: pointer;
-      }
-    }
-
-    &-name {
-      display: flex;
-      align-items: center;
-      .bsicon {
-        margin-right: 4px;
-        color: #fd9f41;
-      }
-
-      &-content {
-        display: inline-block;
-        max-width: 300px;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        cursor: pointer;
-      }
-    }
-
-    &-link {
-      display: flex;
-      justify-content: flex-end;
-      &:hover {
-        .a-yanjingkai {
-          display: block;
-        }
-      }
-      .a-yanjingkai {
-        display: none;
-        margin-right: 10px;
-      }
-    }
-    &-link:not(.not-to-detail) {
-      cursor: pointer;
-      &:hover {
-        color: @primary-color;
-      }
-    }
-  }
-  &-table-event-data {
-    text-align: right !important;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/variable.less';
+.event-form-data {
+  &-table-td {
+    padding: 0 !important;
+
+    &-show {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      min-width: 60px;
+      height: 48px;
+      cursor: pointer;
+      span {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        cursor: pointer;
+      }
+    }
+
+    &-name {
+      display: flex;
+      align-items: center;
+      .bsicon {
+        margin-right: 4px;
+        color: #fd9f41;
+      }
+
+      &-content {
+        display: inline-block;
+        max-width: 300px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        cursor: pointer;
+      }
+    }
+
+    &-link {
+      display: flex;
+      justify-content: flex-end;
+      &:hover {
+        .a-yanjingkai {
+          display: block;
+        }
+      }
+      .a-yanjingkai {
+        display: none;
+        margin-right: 10px;
+      }
+    }
+    &-link:not(.not-to-detail) {
+      cursor: pointer;
+      &:hover {
+        color: @primary-color;
+      }
+    }
+  }
+  &-table-event-data {
+    text-align: right !important;
+  }
+}

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;
@@ -62,6 +63,12 @@ export interface ResponseDataProps {
     huanbi?: number[];
     total?: number[];
     yesterDay?: string[];
+    sum?: number;
+    yValues: number[];
+    userGroupEventTimeSum: [{
+        [k: string]: number[];
+    }];
+    eventPvTitle: string;
 }
 export interface SeriesProps {
     names?: string[];
@@ -70,6 +77,7 @@ export interface SeriesProps {
     index?: string;
     duration?: TableChildrenProps[];
     diyTarget?: boolean;
+    attrSum?: number;
 }
 export interface TableChildrenProps {
     name: string;

package/es/utils/formData.d.ts

@@ -5,10 +5,11 @@ import { EventGroup, UserProp, EnvProp } from '@zgfe/business-lib/es/attributeSe
 import { ResponseDataProps, SearchValue } from '../types';
 import { EventProps } from '../modules/home/types';
 import '../style/index.less';
+export declare function sortOriginalData(data: any, sorter: any): any;
 export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], userGroup: number[] | string[], searchData: SearchValue, showList: string[], onShowCallback: Function, onClickToDetailCallback: Function, onSelectEvent?: (id: number, name: string) => void): ColumnsType<EventProps.ColumnsDataType>;
 export declare function getChartDataEventAliasName(dataSource: eventChartProps.ChartTypesProps, eventGroupList: EventGroup[] | undefined): eventChartProps.ChartTypesProps;
 export declare function getEventAliasName(name: string, eventGroupList: EventGroup[] | undefined): string;
-export declare function getEventAliasId(name: string, eventGroupList: EventGroup[] | undefined): number;
+export declare function getEventAliasId(name: any, eventGroupList: EventGroup[] | undefined): number;
 export declare function getSortData(data: ResponseDataProps): ResponseDataProps;
 export declare function getUserGroupsCompareData(data: ResponseDataProps): ResponseDataProps;
 export declare function marketEventGroupList(eventGroupList: EventGroup[] | undefined): string[];

package/es/utils/formData.js

@@ -1,3 +1,9 @@
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { util, IconFont } from '@zgfe/business-lib';
 import React from 'react';
 import { message } from 'antd';
@@ -9,6 +15,23 @@ import { Tooltip } from 'antd';
 import '../style/index.less';
 import { getValue } from '../modules/content/utils';
 var classPrefix = 'event-form-data';
+export function sortOriginalData(data, sorter) {
+  var columnKey = sorter.columnKey,
+    order = sorter.order;
+  if (columnKey && order) {
+    var sortedData = _toConsumableArray(data).sort(function (a, b) {
+      if (order === 'ascend') {
+        return a[columnKey] - b[columnKey];
+      } else if (order === 'descend') {
+        return b[columnKey] - a[columnKey];
+      }
+      return 0;
+    });
+    return sortedData;
+  } else {
+    return data;
+  }
+}
 export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, userGroup, searchData, showList, onShowCallback, onClickToDetailCallback, onSelectEvent) {
   var marketEventNameList = marketEventGroupList(eventGroupList);
   var data = [{
@@ -23,7 +46,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     render: function render(_, record) {
       var isActive = showList.includes(record.nameGroup);
       var cannotClick = showList.length >= 10 && !isActive;
-      return /*#__PURE__*/React.createElement("div", {
+      return record.color ? (/*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-table-td-show"),
         onClick: function onClick() {
           if (cannotClick) return;
@@ -33,6 +56,8 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
         style: {
           background: isActive ? record.color : '#D9D9D9'
         }
+      }))) : (/*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-table-td-show")
       }));
     }
   }];
@@ -45,7 +70,11 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       ellipsis: true,
       fixed: 'left',
       render: function render(text) {
-        return text;
+        return /*#__PURE__*/React.createElement("div", {
+          className: "tooltip-userGroup-box"
+        }, /*#__PURE__*/React.createElement(Tooltip, {
+          title: text
+        }, /*#__PURE__*/React.createElement("div", null, text)));
       }
     });
   }
@@ -53,7 +82,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     var _getValue;
     data.push({
       title: (_getValue = getValue(searchData.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.label,
-      width: 150,
+      width: 180,
       dataIndex: 'dimension',
       key: 'dimension',
       ellipsis: true,
@@ -85,12 +114,12 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
           paddingLeft: '16px'
         }
       }, "\u4E8B\u4EF6"),
-      width: 200,
+      width: 180,
       dataIndex: 'eventName',
       key: 'eventName',
       ellipsis: true,
       fixed: 'left',
-      render: function render(val) {
+      render: function render(val, record) {
         var _val = val;
         return /*#__PURE__*/React.createElement("div", {
           className: "tooltip-name-box"
@@ -99,7 +128,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
         }, /*#__PURE__*/React.createElement("div", {
           className: "tooltip-name-box-market",
           onClick: function onClick() {
-            onSelectEvent && onSelectEvent(getEventAliasId(val, eventGroupList), val);
+            !record.isAdd && onSelectEvent && onSelectEvent(getEventAliasId(record === null || record === void 0 ? void 0 : record.originalName, eventGroupList), val);
           }
         }, /*#__PURE__*/React.createElement(IconFont, {
           type: "shoucang",
@@ -117,6 +146,23 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       }
     });
   }
+  data.push({
+    title: '合计',
+    width: 50,
+    dataIndex: 'attrSum',
+    ellipsis: true,
+    key: 'attrSum',
+    align: 'center',
+    className: "".concat(classPrefix, "-table-td"),
+    fixed: 'left',
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "tooltip-userGroup-box"
+      }, /*#__PURE__*/React.createElement(Tooltip, {
+        title: text
+      }, /*#__PURE__*/React.createElement("div", null, text)));
+    }
+  });
   var _loop = function _loop(i) {
     var value = columnData[i];
     if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
@@ -137,18 +183,19 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       align: 'center',
       ellipsis: true,
       dataIndex: "field".concat(i),
+      defaultSortOrder: i === columnData.length - 1 ? 'descend' : null,
       className: "".concat(classPrefix, "-table-event-data"),
       sorter: function sorter(a, b) {
-        return a["field".concat(i)] - b["field".concat(i)];
+        return a.isAdd || b.isAdd ? 0 : a["field".concat(i)] - b["field".concat(i)];
       },
       render: function render(text, record) {
         var click = text > 0 && (searchData.analysisIndex === 'number' ? true : false);
         return /*#__PURE__*/React.createElement("div", {
-          className: "".concat(classPrefix, "-table-td-link ").concat(click ? '' : 'not-to-detail'),
+          className: "".concat(classPrefix, "-table-td-link ").concat(!record.isAdd && click ? '' : 'not-to-detail'),
           onClick: function onClick() {
-            click ? onClickToDetailCallback(record, columnData[i], text) : null;
+            !record.isAdd && click ? onClickToDetailCallback(record, columnData[i], text) : null;
           }
-        }, click && /*#__PURE__*/React.createElement(IconFont, {
+        }, !record.isAdd && click && /*#__PURE__*/React.createElement(IconFont, {
           type: "a-yanjingkai"
         }), text);
       }
@@ -162,7 +209,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
 export function getChartDataEventAliasName(dataSource, eventGroupList) {
   var data = _.cloneDeep(dataSource);
   var series = [];
-  data.series.map(function (item) {
+  data === null || data === void 0 ? void 0 : data.series.map(function (item) {
     item.originalNames = item.names;
     item.names = item.names.length > 1 ? [item.names[0], getEventAliasName(item.names[1], eventGroupList)] : [getEventAliasName(item.names[0], eventGroupList)];
     series.push(item);
@@ -193,7 +240,7 @@ export function getEventAliasId(name, eventGroupList) {
   return eventId;
 }
 export function getSortData(data) {
-  var series = data.series;
+  var series = data === null || data === void 0 ? void 0 : data.series;
   var sort = function sort(obj1, obj2) {
     var val1 = obj1.values[0];
     var val2 = obj2.values[0];
@@ -209,20 +256,20 @@ export function getSortData(data) {
   return data;
 }
 export function getUserGroupsCompareData(data) {
-  if (data.series.length <= 0) {
+  if ((data === null || data === void 0 ? void 0 : data.series.length) <= 0) {
     return data;
   } else {
     var _data = _.cloneDeep(data);
     var _series = [];
-    _data.series.map(function (item, index) {
+    _data === null || _data === void 0 ? void 0 : _data.series.map(function (item, index) {
       _series.push(item);
-      _data.series.map(function (_item, _index) {
+      _data === null || _data === void 0 ? void 0 : _data.series.map(function (_item, _index) {
         if (item.names[1] === _item.names[1] && index !== _index) {
           _series.push(_item);
-          delete _data.series[_index];
+          _data === null || _data === void 0 ? true : delete _data.series[_index];
         }
       });
-      delete _data.series[index];
+      _data === null || _data === void 0 ? true : delete _data.series[index];
     });
     _data.series = _series;
     return _data;
@@ -311,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,26 +1,27 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.6",
-  "scripts": {
-    "start": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage",
-    "prepublishOnly": "npm run build",
-    "pub": "lerna publish"
-  },
+  "version": "1.0.29-zhongyuan-event.1",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
+  "private": false,
+  "publishConfig": {
+    "access": "public"
   },
   "files": [
     "es"
   ],
+  "scripts": {
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "prepublishOnly": "npm run build",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "pub": "lerna publish",
+    "start": "dumi dev",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
       "prettier --write"
@@ -29,6 +30,10 @@
       "prettier --parser=typescript --write"
     ]
   },
+  "dependencies": {
+    "react-copy-to-clipboard": "^5.1.0",
+    "react-highlight": "^0.15.0"
+  },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.15.1",
     "@testing-library/react": "^12.1.2",
@@ -36,7 +41,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.17",
+    "@zgfe/business-lib": "1.2.71-hxd.39",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -49,9 +54,8 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "2f2ec3eaf3e08f9cf57575ec2a07751305a4a436",
-  "dependencies": {
-    "react-copy-to-clipboard": "^5.1.0",
-    "react-highlight": "^0.15.0"
+  "gitHead": "20d332eba164ff00500773debe6fdd32c6e09145",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
   }
 }