@zgfe/modules-dm 1.0.34-heyh.15 → 1.0.34-heyh.17

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

@@ -13,6 +13,7 @@ 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 { Fragment } from 'react';
+import moment from 'moment';
 var TextArea = Input.TextArea;
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
@@ -136,7 +137,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
     })
   }, /*#__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.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"), 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
@@ -222,7 +223,10 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
   }))), virtualDrawerType !== 'see' && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-formSubmit")
   }, /*#__PURE__*/React.createElement(Button, {
-    type: "default"
+    type: "default",
+    onClick: function onClick() {
+      return setCreateVirtualShow(false);
+    }
   }, "\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/eventGroupingDrawer.js

@@ -76,6 +76,8 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
           appId: getAppID(currentApp),
           ids: ids
         }
+      }).then(function () {
+        refresh();
       });
     }
     setIsDragDisabled(false);

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

@@ -221,7 +221,7 @@ var VirtualTablePlus = function VirtualTablePlus(props) {
     key: 'lastInsertTime',
     width: 187,
     render: function render(text) {
-      return /*#__PURE__*/React.createElement("div", null, moment(text).format('YYYY-MM-DD HH:mm:ss'));
+      return /*#__PURE__*/React.createElement("div", null, text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '');
     }
   }, {
     title: '描述',

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

@@ -408,6 +408,7 @@
       color: #021429;
       span {
         width: 84px;
+        min-width: 84px;
         color: #5f6085;
         text-align: right;
       }

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.js

@@ -229,13 +229,13 @@ export var eventListHandle = function eventListHandle(data) {
     item.checked = false;
     item.open = false;
     if (item.eventList.length > 0) {
-      if (!_open) {
-        _open = true;
-        item.open = true;
-      }
       item.eventList = item.eventList.filter(function (_item) {
         return _item.is_delete === 0;
       });
+      if (item.eventList.length > 0 && !_open) {
+        _open = true;
+        item.open = true;
+      }
     }
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.15",
+  "version": "1.0.34-heyh.17",
   "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": "d39a1d41ee62eaa3659f148c7a93ef5c0fe544c5",
+  "gitHead": "502b39d611bc58bef31515cedd839f29622fd2fb",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }