@zgfe/modules-dm 1.0.34-heyh.8 → 1.0.34-heyh.9

package/es/modules/dataCollection/components/createVirtualDrawer.js

@@ -152,7 +152,8 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
       message: '仅能输入英文、符号、数字'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
-    maxLength: 50
+    maxLength: 20,
+    disabled: virtualDrawerType === 'edit'
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u522B\u540D",
     name: "aliasName",
@@ -161,7 +162,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
       message: '请输入虚拟事件名称'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
-    maxLength: 50
+    maxLength: 20
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u7EC4",
     name: "eventGroupId"

package/es/modules/dataCollection/components/eventGroupingDrawer.js

@@ -10,7 +10,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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
+import { BizGlobalDataContext, IconFont, BizLoading } from '@zgfe/business-lib';
 import { Input, Modal, message, Drawer, Popover, Checkbox, Select, Button } from 'antd';
 import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
 import request from '../../../utils/ajax';
@@ -33,7 +33,12 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     isDragDisabled = _useState4[0],
     setIsDragDisabled = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
   var queryList = function queryList() {
+    setLoading(true);
     request(apis.queryCollectionEventList, {
       method: 'post',
       data: {
@@ -46,6 +51,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         eventListHandle(res.data);
         setGroupingData(res.data);
       }
+      setLoading(false);
     });
   };
   useEffect(function () {
@@ -117,26 +123,26 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }
   };
   // 移动
-  var _useState5 = useState(undefined),
-    _useState6 = _slicedToArray(_useState5, 2),
-    eventMoveShow = _useState6[0],
-    setEventMoveShow = _useState6[1];
-  var _useState7 = useState(-1),
+  var _useState7 = useState(undefined),
     _useState8 = _slicedToArray(_useState7, 2),
-    eventMoveChangeId = _useState8[0],
-    setEventMoveChangeId = _useState8[1];
-  var _useState9 = useState([]),
+    eventMoveShow = _useState8[0],
+    setEventMoveShow = _useState8[1];
+  var _useState9 = useState(-1),
     _useState10 = _slicedToArray(_useState9, 2),
-    eventMoveOption = _useState10[0],
-    setEventMoveOption = _useState10[1];
-  var _useState11 = useState(0),
+    eventMoveChangeId = _useState10[0],
+    setEventMoveChangeId = _useState10[1];
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    eventMoveLength = _useState12[0],
-    setEventMoveLength = _useState12[1];
-  var _useState13 = useState(''),
+    eventMoveOption = _useState12[0],
+    setEventMoveOption = _useState12[1];
+  var _useState13 = useState(0),
     _useState14 = _slicedToArray(_useState13, 2),
-    eventMoveIds = _useState14[0],
-    setEventMoveIds = _useState14[1];
+    eventMoveLength = _useState14[0],
+    setEventMoveLength = _useState14[1];
+  var _useState15 = useState(''),
+    _useState16 = _slicedToArray(_useState15, 2),
+    eventMoveIds = _useState16[0],
+    setEventMoveIds = _useState16[1];
   var eventMove = function eventMove(groupId) {
     var data = eventMoveData(groupId, groupingData, setGroupingData);
     setEventMoveOption(data.groupingOption);
@@ -193,18 +199,18 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     }, "\u786E\u5B9A")));
   };
   // 创建分组 & 修改分组名
-  var _useState15 = useState(null),
-    _useState16 = _slicedToArray(_useState15, 2),
-    createOrEditGrpup = _useState16[0],
-    setCreateOrEditGrpup = _useState16[1];
-  var _useState17 = useState(-1),
+  var _useState17 = useState(null),
     _useState18 = _slicedToArray(_useState17, 2),
-    grpupModalSelectGrpupId = _useState18[0],
-    setGrpupModalSelectGrpupId = _useState18[1];
-  var _useState19 = useState(''),
+    createOrEditGrpup = _useState18[0],
+    setCreateOrEditGrpup = _useState18[1];
+  var _useState19 = useState(-1),
     _useState20 = _slicedToArray(_useState19, 2),
-    grpupNameInput = _useState20[0],
-    setGrpupNameInput = _useState20[1];
+    grpupModalSelectGrpupId = _useState20[0],
+    setGrpupModalSelectGrpupId = _useState20[1];
+  var _useState21 = useState(''),
+    _useState22 = _slicedToArray(_useState21, 2),
+    grpupNameInput = _useState22[0],
+    setGrpupNameInput = _useState22[1];
   var GrpupModalHandle = function GrpupModalHandle() {
     if (grpupNameInput === '') {
       message.error('请填写分组名');
@@ -262,6 +268,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         setEventMoveShow(undefined);
       }
     }))
+  }, /*#__PURE__*/React.createElement(BizLoading, {
+    spinning: loading
   }, /*#__PURE__*/React.createElement(DragDropContext, {
     onDragEnd: onDragEnd
   }, groupingData.map(function (item, index) {
@@ -350,7 +358,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         }))));
       }));
     });
-  }))), /*#__PURE__*/React.createElement(Modal, {
+  })))), /*#__PURE__*/React.createElement(Modal, {
     wrapClassName: "create-or-edit-grpup-modal",
     title: "".concat(createOrEditGrpup === 'create' ? '创建分组' : '修改分组名'),
     bodyStyle: {

package/es/modules/dataCollection/components/tablePlus.js

@@ -411,7 +411,9 @@ var TablePlus = function TablePlus(props) {
         }, record.alias_name),
         trigger: "hover",
         placement: "top"
-      }, /*#__PURE__*/React.createElement("div", null, record.alias_name)), /*#__PURE__*/React.createElement(IconFont, {
+      }, /*#__PURE__*/React.createElement("div", {
+        className: 'alias_name_text'
+      }, record.alias_name)), /*#__PURE__*/React.createElement(IconFont, {
         className: "edit-alias-name",
         onClick: function onClick() {
           setAliasNameInput(record.alias_name);

package/es/modules/dataCollection/components/virtualTablePlus.js

@@ -192,7 +192,9 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
     key: 'aliasName',
     width: 167,
     render: function render(_, record) {
-      return /*#__PURE__*/React.createElement(Popover, {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "alias_name"
+      }, /*#__PURE__*/React.createElement(Popover, {
         content: /*#__PURE__*/React.createElement("div", {
           style: {
             width: '200px',
@@ -201,7 +203,9 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
         }, record.aliasName),
         trigger: "hover",
         placement: "top"
-      }, /*#__PURE__*/React.createElement("div", null, record.aliasName));
+      }, /*#__PURE__*/React.createElement("div", {
+        className: 'alias_name_text'
+      }, record.aliasName)));
     }
   }, {
     title: '首次上报时间',
@@ -223,12 +227,40 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
     title: '描述',
     dataIndex: 'description',
     key: 'description',
-    width: 187
+    width: 187,
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Popover, {
+        content: /*#__PURE__*/React.createElement("div", {
+          style: {
+            width: '200px',
+            wordBreak: 'break-all'
+          }
+        }, text),
+        trigger: "hover",
+        placement: "top"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: 'description'
+      }, text)));
+    }
   }, {
     title: '包含埋点事件',
     dataIndex: 'bindEvent',
     key: 'bindEvent',
-    width: 187
+    width: 187,
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Popover, {
+        content: /*#__PURE__*/React.createElement("div", {
+          style: {
+            width: '200px',
+            wordBreak: 'break-all'
+          }
+        }, text),
+        trigger: "hover",
+        placement: "top"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: 'bind-event'
+      }, text)));
+    }
   }, {
     title: '创建人',
     dataIndex: 'createUser',

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

@@ -115,10 +115,6 @@
         word-break: break-all;
         background: red;
       }
-      .alias_name {
-        border: none;
-        cursor: pointer;
-      }
       .ant-input:focus,
       .ant-input-focused {
         background-color: #fff !important;
@@ -260,6 +256,16 @@
       }
       .alias_name {
         display: flex;
+        border: none;
+        cursor: pointer;
+        .alias_name_text {
+          display: -webkit-box;
+          max-width: 167px;
+          overflow: hidden;
+          cursor: pointer;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 1;
+        }
         .edit-alias-name {
           display: none;
           margin-left: 10px;
@@ -269,6 +275,15 @@
           color: @primary-color;
         }
       }
+      .bind-event,
+      .description {
+        display: -webkit-box;
+        max-width: 180px;
+        overflow: hidden;
+        cursor: pointer;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+      }
       .ant-table-row:hover {
         .collect-icon {
           opacity: 1;
@@ -488,6 +503,12 @@
           width: 25%;
           .ant-checkbox + span {
             user-select: none;
+            display: -webkit-box;
+            max-width: 100%;
+            overflow: hidden;
+            cursor: pointer;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
           }
         }
       }
@@ -578,6 +599,65 @@
 }
 
 .select-attributes {
+  &-box {
+    display: flex;
+    width: 616px;
+    height: 380px;
+    background: #fff;
+    border-radius: 10px;
+    box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
+    &-left {
+      display: flex;
+      flex-direction: column;
+      width: 205px;
+      height: 380px;
+      padding: 8px;
+      overflow-y: auto;
+      box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
+      > div {
+        display: flex;
+        justify-content: space-between;
+        padding: 6px 12px;
+      }
+      .active {
+        color: #fff;
+        background: #165dff;
+        border-radius: 4px;
+        > :nth-child(2) {
+          padding: 0px 4px;
+          border: 1px solid #fff;
+          border-radius: 10px;
+        }
+      }
+    }
+    &-right {
+      width: 100%;
+      height: 380px;
+      padding: 8px;
+      > :nth-child(2) {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+        align-items: flex-start;
+        width: 100%;
+        height: 320px;
+        margin-top: 8px;
+        overflow-y: auto;
+        > div {
+          display: flex;
+          flex-shrink: 0;
+          gap: 10px;
+          align-items: center;
+          align-self: stretch;
+          height: 32px;
+          padding: 0px 16px;
+        }
+        .active {
+          background: #e8efff;
+        }
+      }
+    }
+  }
   &-select {
     .ant-select-dropdown {
       display: none !important;
@@ -602,66 +682,6 @@
   }
 }
 
-.select-attributes-box {
-  display: flex;
-  width: 616px;
-  height: 380px;
-  background: #fff;
-  border-radius: 10px;
-  box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
-  &-left {
-    display: flex;
-    flex-direction: column;
-    width: 205px;
-    height: 380px;
-    padding: 8px;
-    overflow-y: auto;
-    box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
-    > div {
-      display: flex;
-      justify-content: space-between;
-      padding: 6px 12px;
-    }
-    .active {
-      color: #fff;
-      background: #165dff;
-      border-radius: 4px;
-      > :nth-child(2) {
-        padding: 0px 4px;
-        border: 1px solid #fff;
-        border-radius: 10px;
-      }
-    }
-  }
-  &-right {
-    width: 100%;
-    height: 380px;
-    padding: 8px;
-    > :nth-child(2) {
-      display: flex;
-      flex-direction: column;
-      gap: 8px;
-      align-items: flex-start;
-      width: 100%;
-      height: 320px;
-      margin-top: 8px;
-      overflow-y: auto;
-      > div {
-        display: flex;
-        flex-shrink: 0;
-        gap: 10px;
-        align-items: center;
-        align-self: stretch;
-        height: 32px;
-        padding: 0px 16px;
-      }
-      .active {
-        background: #e8efff;
-      }
-    }
-  }
-}
-
 .sortable-componnet-sortableList {
   z-index: 9999;
 }

package/es/modules/dataCollection/virtualEventList.js

@@ -51,7 +51,7 @@ var VirtualEventList = function VirtualEventList() {
     _useState10 = _slicedToArray(_useState9, 2),
     pageNumber = _useState10[0],
     setPageNumber = _useState10[1];
-  var _useState11 = useState(10),
+  var _useState11 = useState(20),
     _useState12 = _slicedToArray(_useState11, 2),
     pageSize = _useState12[0],
     setPageSize = _useState12[1];
@@ -298,8 +298,9 @@ var VirtualEventList = function VirtualEventList() {
       textAlign: 'right'
     },
     showQuickJumper: true,
-    showSizeChanger: total > 10,
+    showSizeChanger: total > pageSize,
     defaultCurrent: 1,
+    defaultPageSize: pageSize,
     current: pageNumber,
     total: total,
     onChange: onPaginationChange

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.8",
+  "version": "1.0.34-heyh.9",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -52,7 +52,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "4ca76aeae40292e76792d097506126970af21364",
+  "gitHead": "8794a4cab7a3ae235aa723c9c0ea99e812bd9157",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }