@zgfe/modules-dm 1.0.34-heyh.28 → 1.0.34-heyh.30

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

@@ -190,6 +190,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
       message: '仅能输入英文、符号、数字'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u8F93\u5165\u865A\u62DF\u4E8B\u4EF6\u540D\u79F0",
     maxLength: 20,
     disabled: virtualDrawerType === 'edit'
   })), /*#__PURE__*/React.createElement(Form.Item, {
@@ -200,6 +201,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
       message: '请输入虚拟事件别名'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u8F93\u5165\u865A\u62DF\u4E8B\u4EF6\u522B\u540D",
     maxLength: 20
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u7EC4",

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

@@ -110,6 +110,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
       return;
     }
     Modal.confirm({
+      wrapClassName: 'dm-modal-confirm',
       centered: true,
       title: '提示',
       content: '是否确认删除？',
@@ -190,7 +191,6 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
   };
   var eventMoveChange = function eventMoveChange() {
     if (requestMove) {
-      console.log(11111111);
       return;
     }
     requestMove = true;
@@ -315,7 +315,10 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
     className: "".concat(classPrefix, "-top-box")
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u4E8B\u4EF6\u540D\u79F0\u6216\u522B\u540D",
-    onChange: onSearchChange
+    onChange: onSearchChange,
+    prefix: /*#__PURE__*/React.createElement(IconFont, {
+      type: "sousuo"
+    })
   }), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     size: "small",

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

@@ -122,6 +122,7 @@ var TablePlus = function TablePlus(props) {
     });
     if (!deteleFlag) return message.error('分组内存在事件，无法删除');
     Modal.confirm({
+      wrapClassName: 'dm-modal-confirm',
       centered: true,
       title: '是否确认删除？',
       okText: '确认',
@@ -171,6 +172,7 @@ var TablePlus = function TablePlus(props) {
   };
   var eventDelModal = function eventDelModal(eventId, text) {
     Modal.confirm({
+      wrapClassName: 'dm-modal-confirm',
       centered: true,
       title: '是否确认删除？',
       content: text,
@@ -215,7 +217,7 @@ var TablePlus = function TablePlus(props) {
     }
     request(apis.updateEventInfo, {
       method: 'post',
-      params: _objectSpread({
+      data: _objectSpread({
         appId: getAppID(currentApp),
         eventId: record.event_id
       }, _temp)

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

@@ -62,6 +62,7 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
   // 删除分组
   var eventNameDel = function eventNameDel(eventGroupId) {
     Modal.confirm({
+      wrapClassName: 'dm-modal-confirm',
       centered: true,
       title: '是否确认删除？',
       okText: '确认',
@@ -87,6 +88,7 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
   // 删除事件
   var eventItemDel = function eventItemDel(name) {
     Modal.confirm({
+      wrapClassName: 'dm-modal-confirm',
       centered: true,
       title: '是否确认删除？',
       content: '删除后，将停止采集该事件数据，也将不在分析平台中显示！',

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

@@ -404,6 +404,7 @@
   }
   &-add {
     color: #165dff;
+    cursor: pointer;
     &-icon {
       margin-right: 8px;
       font-weight: 900;
@@ -435,8 +436,8 @@
   &-eventDataBox {
     margin-top: 24px;
     padding-bottom: 24px;
-    > :nth-child(2) {
-      margin-top: 8px;
+    > :nth-child(1) {
+      color: #5f6085;
     }
     > :nth-child(1)::before {
       display: inline-block;
@@ -447,6 +448,10 @@
       line-height: 1;
       content: '*';
     }
+    > :nth-child(2) {
+      margin-top: 8px;
+      color: #67727f;
+    }
   }
   &-eventDataBox.see {
     > :nth-child(1) {
@@ -457,10 +462,11 @@
     }
   }
   &-formList {
-    margin-top: 24px;
+    margin-top: 16px;
     .ant-form-item {
       width: 100%;
       max-width: 100%;
+      margin-bottom: 16px !important;
       .ant-col {
         width: 100%;
         max-width: 100%;
@@ -509,6 +515,9 @@
           gap: 8px;
           align-items: center;
           justify-content: start;
+          > :nth-child(1) {
+            color: #9AA1A9;
+          }
           > :nth-child(2) {
             font-weight: 500;
           }
@@ -574,10 +583,16 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    .ant-input {
+    .ant-btn {
+      height: 32px;
+    }
+    .ant-input-affix-wrapper {
       width: 374px;
       border: none;
     }
+    .ant-input-prefix {
+      margin-right: 10px;
+    }
   }
   .ant-drawer-content,
   .ant-drawer-wrapper-body {
@@ -761,3 +776,13 @@
   cursor: not-allowed !important;
   user-select: none;
 }
+
+// dm项目中modal-confirm公用的样式
+.dm-modal-confirm {
+  .ant-modal-confirm-btns {
+    .ant-btn-primary {
+      margin-left: 16px !important;
+      background: #165dff;
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.28",
+  "version": "1.0.34-heyh.30",
   "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": "8e420eed07c0b2c21a18d58d78d864d26f0c1efc",
+  "gitHead": "a392cf77313b4c7a22c4e52c3dbb4c967353a53d",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }