@zgfe/modules-event 1.0.29-zhongyuan.9 → 1.0.29-zhongyuanE.0

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/modules/home/demo/styles/index.less

@@ -1,33 +1,33 @@
-/*滚动条凹槽的颜色，还可以设置边框属性 */
-::-webkit-scrollbar-track-piece {
-  background-color: #fff;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-
-/*滚动条的宽度*/
-::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-
-/*滚动条的设置*/
-::-webkit-scrollbar-thumb {
-  background-color: #cacdd4;
-  background-clip: padding-box;
-  border: 2px solid #fff;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-
-/*滚动条鼠标移上去*/
-::-webkit-scrollbar-thumb:hover {
-  // background-color: #bbb;
-}
-
-::-webkit-scrollbar-track-piece {
-  width: 6px;
-  height: 6px;
-}
+/*滚动条凹槽的颜色，还可以设置边框属性 */
+::-webkit-scrollbar-track-piece {
+  background-color: #fff;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+
+/*滚动条的宽度*/
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+/*滚动条的设置*/
+::-webkit-scrollbar-thumb {
+  background-color: #cacdd4;
+  background-clip: padding-box;
+  border: 2px solid #fff;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+
+/*滚动条鼠标移上去*/
+::-webkit-scrollbar-thumb:hover {
+  // background-color: #bbb;
+}
+
+::-webkit-scrollbar-track-piece {
+  width: 6px;
+  height: 6px;
+}

package/es/modules/home/styles/index.less

@@ -1,49 +1,49 @@
-.event-module-container {
-  width: 100%;
-  min-width: 1000px;
-  height: 100% !important;
-  background: #fafafb;
-  &-header-title {
-    height: 48px;
-    padding: 0px 16px;
-    color: #021429;
-    font-weight: 500;
-    font-size: 16px;
-    line-height: 48px;
-    background: #fff;
-  }
-  .biz-layout-top {
-    margin-top: 2px;
-    padding: 0 16px 16px;
-    .biz-user-group-header {
-      .ant-space-item {
-        color: #5f6085;
-      }
-    }
-  }
-  .ant-spin-container {
-    width: 100%;
-    height: 100%;
-  }
-
-  .biz-select-option:not(.biz-select-option-multiple),
-  .biz-attr-select-option {
-    &.active {
-      background: @primary-color !important;
-    }
-  }
-
-  // 设置下拉框最大高度
-  .biz-select-overlay {
-    max-height: 300px;
-  }
-
-  .biz-layout-panel-content {
-    height: auto;
-  }
-
-  .biz-layout-collapse-container {
-    align-items: center;
-    height: 24px;
-  }
-}
+.event-module-container {
+  width: 100%;
+  min-width: 1000px;
+  height: 100% !important;
+  background: #fafafb;
+  &-header-title {
+    height: 48px;
+    padding: 0px 16px;
+    color: #021429;
+    font-weight: 500;
+    font-size: 16px;
+    line-height: 48px;
+    background: #fff;
+  }
+  .biz-layout-top {
+    margin-top: 2px;
+    padding: 0 16px 16px;
+    .biz-user-group-header {
+      .ant-space-item {
+        color: #5f6085;
+      }
+    }
+  }
+  .ant-spin-container {
+    width: 100%;
+    height: 100%;
+  }
+
+  .biz-select-option:not(.biz-select-option-multiple),
+  .biz-attr-select-option {
+    &.active {
+      background: @primary-color !important;
+    }
+  }
+
+  // 设置下拉框最大高度
+  .biz-select-overlay {
+    max-height: 300px;
+  }
+
+  .biz-layout-panel-content {
+    height: auto;
+  }
+
+  .biz-layout-collapse-container {
+    align-items: center;
+    height: 24px;
+  }
+}

package/es/modules/topPanel/styles/index.less

@@ -1,50 +1,50 @@
-.modules-event-top-panel {
-  &-form-event {
-    margin-bottom: 0;
-    & .ant-form-item-label {
-      padding-left: 24px !important;
-      font-weight: 500;
-    }
-    &-select {
-      width: 208px;
-      margin-left: 24px;
-      .biz-select-handle-input {
-        padding-left: 12px;
-      }
-    }
-    .ant-form-item-row .ant-form-item-control {
-      margin-bottom: 24px;
-      padding: 4px 0;
-    }
-    .ant-form-item-explain-error {
-      padding-left: 24px;
-    }
-  }
-  &-form-botton-box {
-    display: flex;
-    justify-content: flex-end;
-    margin-right: 24px;
-    > :nth-child(1) {
-      margin-right: 16px;
-      color: #fff;
-      background-color: #29bd52;
-      border-color: #29bd52;
-    }
-  }
-
-  &-label-hasIcon {
-    .bsicon {
-      cursor: pointer;
-    }
-  }
-}
-.hoverable-form-item {
-  .ant-form-item-control {
-    &:hover {
-      background: #e8efff !important;
-    }
-  }
-}
-.event---1 .ant-form-item-label {
-  padding-bottom: 4px !important;
-}
+.modules-event-top-panel {
+  &-form-event {
+    margin-bottom: 0;
+    & .ant-form-item-label {
+      padding-left: 24px !important;
+      font-weight: 500;
+    }
+    &-select {
+      width: 208px;
+      margin-left: 24px;
+      .biz-select-handle-input {
+        padding-left: 12px;
+      }
+    }
+    .ant-form-item-row .ant-form-item-control {
+      margin-bottom: 24px;
+      padding: 4px 0;
+    }
+    .ant-form-item-explain-error {
+      padding-left: 24px;
+    }
+  }
+  &-form-botton-box {
+    display: flex;
+    justify-content: flex-end;
+    margin-right: 24px;
+    > :nth-child(1) {
+      margin-right: 16px;
+      color: #fff;
+      background-color: #29bd52;
+      border-color: #29bd52;
+    }
+  }
+
+  &-label-hasIcon {
+    .bsicon {
+      cursor: pointer;
+    }
+  }
+}
+.hoverable-form-item {
+  .ant-form-item-control {
+    &:hover {
+      background: #e8efff !important;
+    }
+  }
+}
+.event---1 .ant-form-item-label {
+  padding-bottom: 4px !important;
+}

package/es/style/image/ring.svg

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
-<circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
-  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
-</circle>
-<circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
-  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
-</circle>
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
+  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
+</circle>
+<circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
+  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
+</circle>
 <!-- [ldio] generated by https://loading.io/ --></svg>

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;
@@ -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

@@ -82,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,
@@ -114,7 +114,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
           paddingLeft: '16px'
         }
       }, "\u4E8B\u4EF6"),
-      width: 200,
+      width: 180,
       dataIndex: 'eventName',
       key: 'eventName',
       ellipsis: true,
@@ -146,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)) {
@@ -341,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.9",
+  "version": "1.0.29-zhongyuanE.0",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "private": false,
@@ -41,7 +41,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.70-hxd.9",
+    "@zgfe/business-lib": "1.2.71-hxd.18",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -54,7 +54,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "48a2b56dbe96c460d80da5d6da84c8be8aff6bc7",
+  "gitHead": "e5b882402210cd86c7cb687e8bfa6711026c2ce1",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }