@zgfe/modules-event 1.0.29-zhongyuan.25 → 1.0.29-zhongyuan.26

package/README.md

@@ -1,35 +1,37 @@
-# modules-event
-
-事件分析
-
-## Getting Started
-
-Install dependencies,
-
-```bash
-$ npm i
-```
-
-Start the dev server,
-
-```bash
-$ npm start
-```
-
-Build documentation,
-
-```bash
-$ npm run docs:build
-```
-
-Run test,
-
-```bash
-$ npm test
-```
-
-Build library via `father-build`,
-
-```bash
-$ npm run build
-```
+# modules-event
+
+事件分析
+
+## Getting Started
+
+Install dependencies,
+
+```bash
+$ npm i
+```
+
+Start the dev server,
+
+```bash
+$ npm start
+```
+
+Build documentation,
+
+```bash
+$ npm run docs:build
+```
+
+Run test,
+
+```bash
+$ npm test
+```
+
+Build library via `father-build`,
+
+```bash
+$ npm run build
+```
+
+pub

package/es/components/table/index.js

@@ -73,10 +73,10 @@ var EventTable = function EventTable(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     total = _useState12[0],
     setTotal = _useState12[1];
-  var _useState13 = useState(),
+  var _useState13 = useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    pvTitle = _useState14[0],
-    setPvTitle = _useState14[1];
+    userGroupEventCounts = _useState14[0],
+    setUserGroupEventCounts = _useState14[1];
   useEffect(function () {
     var gLen = (searchData === null || searchData === void 0 ? void 0 : searchData.dimension) ? 1 : 0;
     var _data = formTableData(dataSource, searchData.userGroup || [0], gLen);
@@ -102,9 +102,7 @@ var EventTable = function EventTable(props) {
         data.attrSum = sum;
         dataAll.push(data);
       });
-      setPvTitle(dataSource.eventPvTitle.split(';').map(function (item) {
-        return item.split(' ');
-      }));
+      setUserGroupEventCounts(dataSource.userGroupEventCounts);
     }
     setTableData([].concat(dataAll, _toConsumableArray(_data)));
   }, []);
@@ -231,15 +229,18 @@ var EventTable = function EventTable(props) {
     className: "".concat(classPrefix, "-table-header")
   }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-table-header-left")
-  }, "\u6307\u6807\u8BE6\u60C5", pvTitle && pvTitle.length ? /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", null, "\u6307\u6807\u8BE6\u60C5"), userGroupEventCounts && userGroupEventCounts.length ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-table-header-left-box")
-  }, "\uFF08\u4E8B\u4EF6\u603B\u91CF\uFF1A", /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-table-header-left-content")
-  }, pvTitle.map(function (item, index) {
-    return /*#__PURE__*/React.createElement(Tooltip, {
-      title: item[0] + '：' + item[1],
-      key: index
-    }, /*#__PURE__*/React.createElement("span", null, item[0], "\uFF1A"), /*#__PURE__*/React.createElement("span", null, item[1], index === pvTitle.length - 1 ? '' : ' ｜ '));
+  }, /*#__PURE__*/React.createElement("span", null, "\uFF08\u4E8B\u4EF6\u89E6\u53D1\u6B21\u6570\uFF1A"), /*#__PURE__*/React.createElement(Tooltip, {
+    overlayStyle: {
+      maxWidth: '500px'
+    },
+    placement: "topLeft",
+    title: userGroupEventCounts.map(function (item) {
+      return item.num + '【群组名称：' + item.groupName + '】';
+    }).join('｜')
+  }, userGroupEventCounts.map(function (item, index) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, item.num), /*#__PURE__*/React.createElement("span", null, "\u3010\u7FA4\u7EC4\u540D\u79F0\uFF1A", item.groupName, "\u3011", index !== userGroupEventCounts.length - 1 && ' ｜ '));
   }), "\uFF09")) : null), /*#__PURE__*/React.createElement("div", null, authority[100051] && /*#__PURE__*/React.createElement("div", {
     onClick: seeSql
   }, "\u67E5\u770BSQL"), authority[100050] && showProdDownload && /*#__PURE__*/React.createElement("div", {

package/es/components/table/styles/index.less

@@ -49,12 +49,14 @@
       flex: 1;
       flex-direction: row;
       overflow: hidden;
+      span:first-child {
+        flex: 0 0 57px;
+      }
       &-box {
-        display: flex;
-        flex: 1;
-        flex-direction: row;
         overflow: hidden;
         color: #67727f;
+        white-space: nowrap;
+        text-overflow: ellipsis;
       }
       &-content {
         display: flex;
@@ -62,20 +64,13 @@
         flex-direction: row;
         overflow: hidden;
         color: #67727f;
+        white-space: nowrap;
+        text-overflow: ellipsis;
         > span {
           display: flex;
           flex-direction: row;
           max-width: 33.33%;
           overflow: hidden;
-          :first-child {
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-          :nth-child(2) {
-            flex: 1;
-            white-space: nowrap;
-          }
         }
       }
     }

package/es/style/index.less

@@ -1,62 +1,49 @@
-@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:not(.not-to-detail) {
+      text-decoration: underline;
+      cursor: pointer;
+      &:hover {
+        color: @primary-color;
+      }
+    }
+  }
+  &-table-event-data {
+    text-align: right !important;
+  }
+}

package/es/types.d.ts

@@ -69,6 +69,7 @@ export interface ResponseDataProps {
         [k: string]: number[];
     }];
     eventPvTitle: string;
+    userGroupEventCounts: any[];
 }
 export interface SeriesProps {
     names?: string[];

package/es/utils/formData.js

@@ -195,9 +195,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
           onClick: function onClick() {
             !record.isAdd && click ? onClickToDetailCallback(record, columnData[i], text) : null;
           }
-        }, !record.isAdd && click && /*#__PURE__*/React.createElement(IconFont, {
-          type: "a-yanjingkai"
-        }), text);
+        }, text);
       }
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.29-zhongyuan.25",
+  "version": "1.0.29-zhongyuan.26",
   "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": "6ceab13dbbc5574ea49e0027329d5f173ab9045b",
+  "gitHead": "59a0aa05cde75d92d5be09d230608aafe3097d33",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }