@zgfe/modules-dm 1.0.34-heyh.38 → 1.0.34-heyh.39

package/es/modules/dataCollection/collectionEventList.js

@@ -361,7 +361,13 @@ var CollectionEventList = function CollectionEventList(props) {
     defaultValue: -999,
     className: "top-select",
     onChange: handleSelectChange,
-    options: groupOptions
+    options: groupOptions,
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#5f6085'
+      }
+    })
   }), /*#__PURE__*/React.createElement(Input, {
     className: "top-input",
     onChange: eventNameChange,

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

@@ -38,7 +38,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     formSubmitData = _useState4[0],
     setFormSubmitData = _useState4[1];
-  var attrMaxLength = 100;
+  var attrMaxLength = 10;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     eventGroupList = _useContext.eventGroupList;
@@ -210,6 +210,12 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     defaultValue: -1,
     options: groupOptions.filter(function (item) {
       return item.value !== -999;
+    }),
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#5f6085'
+      }
     })
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5907\u6CE8",

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

@@ -64,4 +64,9 @@
       cursor: pointer;
     }
   }
+  .delete-box:hover {
+    .shanchu {
+      color: #FB5547;
+    }
+  }
 }

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

@@ -338,7 +338,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
         return eventShowOrHidden(1, item.groupId);
       }
     }, "\u9690\u85CF")), item.groupName && /*#__PURE__*/React.createElement("span", {
-      className: 'handle',
+      className: 'handle-delete',
       onClick: function onClick() {
         return groupDelete(item.groupId);
       }

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

@@ -18,6 +18,17 @@
       padding: 3px 20px 20px 20px !important;
     }
   }
+  .ant-radio-group {
+    > :nth-child(1) {
+      border-radius: 4px 0px 0px 4px;
+    }
+    > :last-child {
+      border-radius: 0px 4px 4px 0px;
+    }
+  }
+  .ant-radio-button-wrapper-checked {
+    background: #e8efff;
+  }
 }
 
 .attr-list,
@@ -61,7 +72,7 @@
       width: 264px;
       margin-right: 12px;
       .ant-input-prefix {
-        margin-right: 20px;
+        margin-right: 8px;
       }
     }
     .top-total {
@@ -88,8 +99,8 @@
   }
   .table-plus {
     &-table {
-      border-radius: 8px!important;
       overflow: hidden;
+      border-radius: 8px !important;
       .ant-table {
         .ant-table-thead {
           > tr > th {
@@ -97,7 +108,7 @@
             padding: 0 16px;
           }
         }
-        .ant-table-body{
+        .ant-table-body {
           min-height: 300px;
         }
         .ant-table-tbody {
@@ -314,6 +325,11 @@
 }
 
 .attr-list {
+  .ant-table {
+    overflow: hidden;
+    border: 1px solid #ecedf0;
+    border-radius: 8px;
+  }
   .attr-name {
     display: flex;
     .attr-name-text {
@@ -517,7 +533,7 @@
         gap: 12px;
         align-items: center;
         justify-content: start;
-        .fangxiangshang{
+        .fangxiangshang {
           transform: rotateZ(90deg);
         }
         > :nth-child(1) {
@@ -534,8 +550,8 @@
           .zhongmingming {
             cursor: pointer;
           }
-          .zhongmingming:hover{
-            color: #165DFF;
+          .zhongmingming:hover {
+            color: #165dff;
           }
         }
         > :last-child {
@@ -551,8 +567,11 @@
           font-size: 18px !important;
           cursor: pointer;
         }
-        .handle:hover{
-          color: #165DFF;
+        .handle:hover {
+          color: #165dff;
+        }
+        .handle-delete:hover {
+          color: #fb5547;
         }
       }
     }
@@ -598,10 +617,10 @@
     }
   }
   &-top-box {
-    margin-top: -8px;
     display: flex;
     align-items: center;
     justify-content: space-between;
+    margin-top: -8px;
     .ant-btn {
       height: 32px;
     }
@@ -613,7 +632,7 @@
       margin-right: 10px;
     }
   }
-  .ant-drawer-content-wrapper{
+  .ant-drawer-content-wrapper {
     overflow-x: hidden;
   }
   .ant-drawer-content,

package/es/modules/dataCollection/virtualEventList.js

@@ -250,7 +250,13 @@ var VirtualEventList = function VirtualEventList() {
     defaultValue: -999,
     className: "top-select",
     onChange: handleSelectChange,
-    options: groupOptions
+    options: groupOptions,
+    suffixIcon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "xiangxia",
+      style: {
+        color: '#5f6085'
+      }
+    })
   }), /*#__PURE__*/React.createElement(Input, {
     className: "top-input",
     onChange: eventNameChange,

package/es/utils/index.js

@@ -70,7 +70,7 @@ export var getSubmitHandleData = function getSubmitHandleData(selectAttributes,
     if (eventAttr.hasOwnProperty(item.eventId)) {
       item.attrs = eventAttr[item.eventId];
     } else {
-      item.attrs = [];
+      item.attrs = [""];
     }
   });
   return submitData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.38",
+  "version": "1.0.34-heyh.39",
   "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": "06acb84ca034ffb803304794e7f96f3e12ae2bad",
+  "gitHead": "a21129d7374e4a3c1ff37184f29a06bc3b9cb6fe",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }