@zgfe/modules-dm 1.0.34-heyh.32 → 1.0.34-heyh.34

package/es/modules/dataCollection/components/eventFilter/index.js

@@ -102,7 +102,7 @@ var EventFilter = function EventFilter(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-eventSelector")
+    className: "".concat(classPrefix, "-eventSelector ").concat(count > 0 ? 'hasattr' : '')
   }, /*#__PURE__*/React.createElement("div", null, index + 1), /*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: false,
     showBuiltInTarget: false,

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

@@ -15,8 +15,6 @@
   }
   &-eventSelector {
     display: flex;
-    margin-bottom: 4px;
-    padding-bottom: 4px;
     > :nth-child(1) {
       width: 20px;
       height: 20px;
@@ -46,6 +44,10 @@
       cursor: not-allowed !important;
     }
   }
+  &-eventSelector.hasattr {
+    margin-bottom: 4px;
+    padding-bottom: 4px;
+  }
   .delete-box {
     position: absolute;
     top: -32px;
@@ -59,6 +61,7 @@
       bottom: 5px;
       left: 11px;
       font-size: 17px !important;
+      cursor: pointer;
     }
   }
 }

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

@@ -321,21 +321,24 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
       title: null,
       content: moveContent
     }, /*#__PURE__*/React.createElement("span", {
-      className: "".concat(groupingData.length > 1 ? '' : 'not-operable'),
+      className: "handle ".concat(groupingData.length > 1 ? '' : 'not-operable'),
       onClick: function onClick() {
         if (groupingData.length > 1) {
           eventMove(item.groupId);
         }
       }
     }, "\u79FB\u52A8")), /*#__PURE__*/React.createElement("span", {
+      className: 'handle',
       onClick: function onClick() {
         return eventShowOrHidden(0, item.groupId);
       }
     }, "\u663E\u793A"), /*#__PURE__*/React.createElement("span", {
+      className: 'handle',
       onClick: function onClick() {
         return eventShowOrHidden(1, item.groupId);
       }
     }, "\u9690\u85CF")), item.groupName && /*#__PURE__*/React.createElement("span", {
+      className: 'handle',
       onClick: function onClick() {
         return groupDelete(item.groupId);
       }
@@ -385,7 +388,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     className: classPrefix,
     width: 700,
-    title: /*#__PURE__*/React.createElement("div", null, "\u4E8B\u4EF6\u5206\u7EC4\u7BA1\u7406", /*#__PURE__*/React.createElement("span", null, "\u7EDF\u4E00\u7BA1\u7406\u57CB\u70B9\u4E8B\u4EF6\u548C\u865A\u62DF\u4E8B\u4EF6\u4E1A\u52A1\u5206\u7EC4\uFF0C\u652F\u6301\u5BF9\u4E8B\u4EF6\u8C03\u6574\u6392\u5E8F\u548C\u9690\u85CF")),
+    title: /*#__PURE__*/React.createElement("div", null, "\u4E8B\u4EF6\u5206\u7EC4\u7BA1\u7406", /*#__PURE__*/React.createElement("span", null, "\u7EDF\u4E00\u7BA1\u7406\u57CB\u70B9\u4E8B\u4EF6\u548C\u865A\u62DF\u4E8B\u4EF6\u4E1A\u52A1\u5206\u7EC4\uFF0C\u4EC5\u5C55\u793A\u6709\u6570\u636E\u4E0A\u62A5\u7684\u4E8B\u4EF6")),
     placement: "right",
     onClose: function onClose() {
       setEventGroupingShow(false);

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

@@ -9,6 +9,7 @@ var EventItem = function EventItem(props) {
     groupingData = props.groupingData,
     setGroupingData = props.setGroupingData,
     searchData = props.searchData;
+  console.log('componnetData', componnetData);
   var SortableItem = function SortableItem(data) {
     var item = data.item,
       index = data.index;

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

@@ -1,7 +1,7 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 .data-collection {
   position: relative;
-  height: 100%;
+  height: calc(100vh - 78px);
   padding: 24px;
   background: #fff;
   border-radius: 8px;
@@ -77,7 +77,7 @@
       top: 0;
       right: 0;
       display: flex;
-      gap: 8px;
+      gap: 16px;
       line-height: 100%;
       > :nth-child(2),
       > :nth-child(3) {
@@ -88,6 +88,8 @@
   }
   .table-plus {
     &-table {
+      border-radius: 8px!important;
+      overflow: hidden;
       .ant-table {
         .ant-table-thead {
           > tr > th {
@@ -451,6 +453,7 @@
     > :nth-child(2) {
       margin-top: 8px;
       color: #67727f;
+      font-size: 12px;
     }
   }
   &-eventDataBox.see {
@@ -481,7 +484,8 @@
     gap: 16px;
     justify-content: end;
     width: 100%;
-    padding: 24px;
+    padding: 16px;
+    padding-right: 24px;
     background: #fff;
     border-top: 1px solid #f2f3f4;
   }
@@ -524,6 +528,9 @@
           .zhongmingming {
             cursor: pointer;
           }
+          .zhongmingming:hover{
+            color: #165DFF;
+          }
         }
         > :last-child {
           color: #9aa1a9;
@@ -538,6 +545,9 @@
           font-size: 18px !important;
           cursor: pointer;
         }
+        .handle:hover{
+          color: #165DFF;
+        }
       }
     }
     &-content {
@@ -558,6 +568,7 @@
           margin: 0;
           padding: 9px 0 9px 16px;
           background: #fafafb;
+          border-radius: 4px;
           .ant-checkbox {
             margin-top: -6px;
           }
@@ -581,6 +592,7 @@
     }
   }
   &-top-box {
+    margin-top: -8px;
     display: flex;
     align-items: center;
     justify-content: space-between;

package/es/utils/index.js

@@ -237,7 +237,6 @@ export var eventListHandle = function eventListHandle(data) {
   data.map(function (item) {
     item.checked = false;
     item.open = false;
-    item.count = item.eventList.length;
     if (item.eventList.length > 0) {
       item.eventList = item.eventList.filter(function (_item) {
         _item.searchShow = 1;
@@ -248,6 +247,7 @@ export var eventListHandle = function eventListHandle(data) {
         item.open = true;
       }
     }
+    item.count = item.eventList.length;
   });
   return data;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.32",
+  "version": "1.0.34-heyh.34",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "cfe4a63f7e2d58c69febec65e2573d99e0af49a7",
+  "gitHead": "d73397ddb1b75f3cf14d3d11231390c2fe03b1a6",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }