@zgfe/modules-dm 1.0.34-heyh.16 → 1.0.34-heyh.18

package/es/components/demo.js

@@ -16,7 +16,7 @@ var DemoWrapper2 = function DemoWrapper2(props) {
     }
   }, /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 209
+    defaultApp: 279
   }, props.children)));
 };
 export default DemoWrapper2;

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

@@ -11,13 +11,14 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { Input, Button, Select, Drawer, Form, message } from 'antd';
+import { Input, Button, Select, Drawer, Form, message, Modal } from 'antd';
 import { Fragment } from 'react';
+import moment from 'moment';
 var TextArea = Input.TextArea;
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
 import React, { useContext, useState } from 'react';
-import { eventJsonHandle, getDelectAttributesData, getSubmitHandleData, getAppID } from '../../../utils';
+import { eventJsonHandle, getDelectAttributesData, getSubmitHandleData, getAppID, getVirtualContentChange } from '../../../utils';
 import EventFilter from './eventFilter';
 import SelectAttributes from './selectAttributes';
 import _ from 'lodash';
@@ -33,31 +34,36 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     _useState2 = _slicedToArray(_useState, 2),
     formSubmit = _useState2[0],
     setFormSubmit = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    formSubmitData = _useState4[0],
+    setFormSubmitData = _useState4[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     eventGroupList = _useContext.eventGroupList;
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectAttributesShow = _useState4[0],
-    setSelectAttributesShow = _useState4[1];
-  var _useState5 = useState({}),
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    selectAttributesData = _useState6[0],
-    setSelectAttributesData = _useState6[1];
+    selectAttributesShow = _useState6[0],
+    setSelectAttributesShow = _useState6[1];
   var _useState7 = useState({}),
     _useState8 = _slicedToArray(_useState7, 2),
-    submitData = _useState8[0],
-    setSubmitData = _useState8[1];
-  var _useState9 = useState([]),
+    selectAttributesData = _useState8[0],
+    setSelectAttributesData = _useState8[1];
+  var _useState9 = useState({}),
     _useState10 = _slicedToArray(_useState9, 2),
-    selectList = _useState10[0],
-    setSelectList = _useState10[1];
-  var onValuesChange = function onValuesChange(data, allData) {
+    submitData = _useState10[0],
+    setSubmitData = _useState10[1];
+  var _useState11 = useState([]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    selectList = _useState12[0],
+    setSelectList = _useState12[1];
+  var onValuesChange = function onValuesChange(_, allData) {
     var _selectList = [];
     allData.eventJson.map(function (item) {
       if (item === null || item === void 0 ? void 0 : item.eventId) _selectList.push(item.eventId);
     });
     setSelectList(_selectList);
+    setFormSubmitData(allData);
     setFormSubmit(eventJsonHandle(allData));
   };
   // 保存
@@ -86,6 +92,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
         }, data)
       }).then(function (res) {
         if ((res === null || res === void 0 ? void 0 : res.code) === '100000' && res.data === 1) {
+          message.success('编辑成功');
           refresh();
           setCreateVirtualShow(false);
         } else {
@@ -101,6 +108,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
         }, data)
       }).then(function (res) {
         if ((res === null || res === void 0 ? void 0 : res.code) === '100000' && res.data === 1) {
+          message.success('创建成功');
           refresh();
           setCreateVirtualShow(false);
         } else {
@@ -109,6 +117,29 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
       });
     }
   };
+  var onClose = function onClose() {
+    if (virtualDrawerType === "edit") {
+      if (formSubmit && getVirtualContentChange(_.cloneDeep(editVirtualEventData), _.cloneDeep(formSubmitData))) {
+        Modal.confirm({
+          centered: true,
+          title: '内容发生了修改，请确认是否保存修改内容',
+          okText: '确认',
+          cancelText: '取消',
+          maskClosable: false,
+          onOk: function onOk() {
+            onFinish(formSubmitData);
+          },
+          onCancel: function onCancel() {
+            setCreateVirtualShow(false);
+          }
+        });
+      } else {
+        setCreateVirtualShow(false);
+      }
+    } else {
+      setCreateVirtualShow(false);
+    }
+  };
   var editGroupOptions = function editGroupOptions(eventGroupId) {
     var text = '';
     groupOptions.map(function (item) {
@@ -124,19 +155,15 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     title: "".concat(virtualDrawerType === 'edit' ? '编辑' : virtualDrawerType === 'see' ? '查看' : '创建', "\u865A\u62DF\u4E8B\u4EF6"),
     placement: "right",
     destroyOnClose: true,
-    onClose: function onClose() {
-      return setCreateVirtualShow(false);
-    },
+    onClose: onClose,
     open: createVirtualShow,
     extra: /*#__PURE__*/React.createElement(IconFont, {
       type: "qingchu",
-      onClick: function onClick() {
-        setCreateVirtualShow(false);
-      }
+      onClick: onClose
     })
   }, /*#__PURE__*/React.createElement(Fragment, null, virtualDrawerType === 'see' && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-see-box")
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u540D\u79F0"), editVirtualEventData.eventName), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u522B\u540D"), editVirtualEventData.aliasName), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u5206\u7EC4"), editGroupOptions(editVirtualEventData.eventGroupId)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u5907\u6CE8"), editVirtualEventData.description), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u521B\u5EFA\u4EBA"), editVirtualEventData.createUser), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u521B\u5EFA\u65F6\u95F4"), editVirtualEventData.insertTime), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u66F4\u65B0\u65F6\u95F4"), editVirtualEventData.updateTime)), /*#__PURE__*/React.createElement(Form, {
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u540D\u79F0"), editVirtualEventData.eventName), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u522B\u540D"), editVirtualEventData.aliasName), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u5206\u7EC4"), editGroupOptions((editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.groupId) === null ? -1 : editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.groupId)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u5907\u6CE8"), editVirtualEventData.description), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u521B\u5EFA\u4EBA"), editVirtualEventData.createUser), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u521B\u5EFA\u65F6\u95F4"), moment(editVirtualEventData.insertTime).format('YYYY-MM-DD HH:mm:ss')), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u66F4\u65B0\u65F6\u95F4"), moment(editVirtualEventData.updateTime).format('YYYY-MM-DD HH:mm:ss'))), /*#__PURE__*/React.createElement(Form, {
     name: "basic",
     labelCol: {
       span: 2
@@ -145,7 +172,8 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
       span: 16
     },
     initialValues: _objectSpread(_objectSpread({}, editVirtualEventData), {}, {
-      desc: editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.description
+      desc: editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.description,
+      eventGroupId: (editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.groupId) === null || (editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.groupId) === undefined ? -1 : editVirtualEventData === null || editVirtualEventData === void 0 ? void 0 : editVirtualEventData.groupId
     }),
     onFinish: onFinish,
     onValuesChange: onValuesChange,
@@ -177,10 +205,13 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     name: "eventGroupId"
   }, /*#__PURE__*/React.createElement(Select, {
     defaultValue: -1,
-    options: groupOptions
+    options: groupOptions.filter(function (item) {
+      return item.value !== -999;
+    })
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5907\u6CE8",
-    name: "desc"
+    name: "desc",
+    className: "".concat(classPrefix, "-desc")
   }, /*#__PURE__*/React.createElement(TextArea, {
     rows: 4,
     placeholder: "\u8BF7\u8F93\u5165\u5907\u6CE8",
@@ -222,7 +253,8 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
   }))), virtualDrawerType !== 'see' && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-formSubmit")
   }, /*#__PURE__*/React.createElement(Button, {
-    type: "default"
+    type: "default",
+    onClick: onClose
   }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     htmlType: "submit",

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

@@ -60,6 +60,10 @@ var EventFilter = function EventFilter(props) {
       message.error('最多可添加5条属性筛选');
       return;
     }
+    if (selectList.length <= 0) {
+      message.error('请选择事件');
+      return;
+    }
     setIsAdd(true);
     setTimeout(function () {
       conditionRef.current.add();
@@ -118,7 +122,7 @@ var EventFilter = function EventFilter(props) {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 5 ? 'disable' : ''),
+    className: "".concat(count < 5 && selectList.length > 0 ? '' : 'disable'),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();

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

@@ -154,7 +154,7 @@ var TablePlus = function TablePlus(props) {
         }).then(function (res) {
           // 该事件在虚拟事件中有使用
           if (res.data === 1) {
-            eventDelModal(record.event_id, '检测到该事件在虚拟事件中使用');
+            eventDelModal(record.event_id, '检测到该事件在虚拟事件中使用, 删除后，将停止采集该事件数据，也将不在分析平台中显示！');
           } else {
             eventDelModal(record.event_id, '删除后，将停止采集该事件数据，也将不在分析平台中显示！');
           }

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

@@ -391,6 +391,17 @@
 }
 
 .create-virtual-drawer {
+  #basic {
+    padding-bottom: 100px;
+    .ant-input {
+      border: none;
+    }
+  }
+  &-desc {
+    .ant-form-item-control {
+      max-width: 100%;
+    }
+  }
   &-add {
     color: #165dff;
     &-icon {
@@ -408,6 +419,7 @@
       color: #021429;
       span {
         width: 84px;
+        min-width: 84px;
         color: #5f6085;
         text-align: right;
       }
@@ -426,6 +438,15 @@
     > :nth-child(2) {
       margin-top: 8px;
     }
+    > :nth-child(1)::before {
+      display: inline-block;
+      margin-right: 4px;
+      color: #ff4d4f;
+      font-size: 14px;
+      font-family: SimSun, sans-serif;
+      line-height: 1;
+      content: '*';
+    }
   }
   &-eventDataBox.see {
     > :nth-child(1) {
@@ -448,10 +469,15 @@
   }
   &-formSubmit {
     position: absolute;
-    right: 24px;
-    bottom: 24px;
+    background: #fff;
+    width: 100%;
+    border-top: 1px solid #F2F3F4;
+    right: 0;
+    bottom: 0;
+    padding: 24px;
     display: flex;
-    gap: 8px;
+    gap: 16px;
+    justify-content: end;
   }
 }
 
@@ -582,13 +608,13 @@
     }
   }
   .ant-modal-confirm-title {
-    display: inline!important;
-    color: #021429!important;
+    display: inline !important;
+    color: #021429 !important;
     font-weight: 500;
-    font-size: 24px!important;
+    font-size: 24px !important;
   }
   .ant-modal-confirm-content {
-    margin-top: 20px!important;
+    margin-top: 20px !important;
   }
 }
 

package/es/modules/dataCollection/types.d.ts

@@ -22,6 +22,7 @@ export interface eventJsonProps {
 }
 export interface VirtualEventProps extends VirtualEventBase {
     eventGroupId: number;
+    groupId?: number;
     eventJson: eventJsonProps[];
     id: number;
 }

package/es/modules/dataCollection/virtualEventList.js

@@ -218,10 +218,6 @@ var VirtualEventList = function VirtualEventList() {
       message.error('请输入分组名称');
       return;
     }
-    if (eventNameInput.length > 20) {
-      message.error('名称不可超过20字符');
-      return;
-    }
     request(apis.upsertEventGroup, {
       method: 'post',
       data: {
@@ -329,6 +325,7 @@ var VirtualEventList = function VirtualEventList() {
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u8BF7\u8F93\u5165\u5206\u7EC4\u540D",
     value: eventNameInput,
+    maxLength: 20,
     onChange: function onChange(e) {
       return setEventNameInput(e.currentTarget.value);
     }

package/es/utils/index.d.ts

@@ -1,3 +1,7 @@
+/**
+ * 虚拟事件编辑 判断内容是否有改动；有改动返回true
+ */
+export declare const getVirtualContentChange: (oldData: any, newData: any) => boolean;
 /**
  * 虚拟事件属性超过100个，选择属性后的回调，处理提交数据
  */
@@ -43,6 +47,7 @@ export declare const groupListSort: (result: any, groupingData: any, setGrouping
  */
 export declare const eventListHandle: (data: any) => void;
 export declare const getAppID: (currentApp: any) => any;
+export declare const nullToEmptyString: (data: any) => any;
 /**
  * 获取第一个表格的可视化高度
  * @param {*} extraHeight 额外的高度(表格底部的内容高度 Number类型,默认为74)

package/es/utils/index.js

@@ -1,3 +1,24 @@
+/**
+ * 虚拟事件编辑 判断内容是否有改动；有改动返回true
+ */
+export var getVirtualContentChange = function getVirtualContentChange(oldData, newData) {
+  if (oldData.aliasName != newData.aliasName) {
+    return true;
+  }
+  if (oldData.eventName != newData.eventName) {
+    return true;
+  }
+  if (oldData.groupId != newData.eventGroupId) {
+    return true;
+  }
+  if (nullToEmptyString(oldData.description) != nullToEmptyString(newData.desc)) {
+    return true;
+  }
+  if (JSON.stringify(oldData.eventJson) !== JSON.stringify(newData.eventJson)) {
+    return true;
+  }
+  return false;
+};
 /**
  * 虚拟事件属性超过100个，选择属性后的回调，处理提交数据
  */
@@ -248,6 +269,13 @@ export var getAppID = function getAppID(currentApp) {
     return currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId;
   }
 };
+// null 或 undefined 转为 空字符串
+export var nullToEmptyString = function nullToEmptyString(data) {
+  if (data === null || data === undefined) {
+    return '';
+  }
+  return data;
+};
 /**
  * 获取第一个表格的可视化高度
  * @param {*} extraHeight 额外的高度(表格底部的内容高度 Number类型,默认为74)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.16",
+  "version": "1.0.34-heyh.18",
   "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": "bd36e8d459d8fe9a60f17caa03944a8aef5e46a8",
+  "gitHead": "94b69acf9ad557c01e8b1aaf72c99257b79d1bbd",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }