@zgfe/modules-dm 1.0.34-heyh.2 → 1.0.34-heyh.8

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

@@ -11,7 +11,7 @@ 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 } from 'antd';
+import { Input, Button, Select, Drawer, Form, message } from 'antd';
 import { Fragment } from 'react';
 var TextArea = Input.TextArea;
 import request from '../../../utils/ajax';
@@ -76,9 +76,11 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
           platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform
         }, data)
       }).then(function (res) {
-        if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
+        if ((res === null || res === void 0 ? void 0 : res.code) === '100000' && res.data === 1) {
           refresh();
           setCreateVirtualShow(false);
+        } else {
+          message.error(res === null || res === void 0 ? void 0 : res.msg);
         }
       });
     } else {
@@ -89,9 +91,11 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
           platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform
         }, data)
       }).then(function (res) {
-        if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
+        if ((res === null || res === void 0 ? void 0 : res.code) === '100000' && res.data === 1) {
           refresh();
           setCreateVirtualShow(false);
+        } else {
+          message.error(res === null || res === void 0 ? void 0 : res.msg);
         }
       });
     }
@@ -107,7 +111,7 @@ var CreateVirtualDrawer = function CreateVirtualDrawer(props) {
   };
   return /*#__PURE__*/React.createElement(Drawer, {
     className: classPrefix,
-    width: '60%',
+    width: 700,
     title: "".concat(virtualDrawerType === 'edit' ? '编辑' : virtualDrawerType === 'see' ? '查看' : '创建', "\u865A\u62DF\u4E8B\u4EF6"),
     placement: "right",
     destroyOnClose: true,

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

@@ -240,7 +240,7 @@ var EventGroupingDrawer = function EventGroupingDrawer(props) {
   };
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     className: classPrefix,
-    width: '60%',
+    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")),
     placement: "right",
     onClose: function onClose() {

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

@@ -125,7 +125,7 @@ var SelectAttributes = function SelectAttributes(props) {
   }, [searchValue]);
   // 渲染属性列表
   var selectAttributesRender = function selectAttributesRender() {
-    return selectAttributesData.map(function (item, index) {
+    return selectAttributesData.map(function (item) {
       if (item.id === selectEventId) {
         return item.attrList.map(function (_item) {
           return attrShowList.indexOf(_item.label) !== -1 ? /*#__PURE__*/React.createElement("div", {
@@ -145,8 +145,11 @@ var SelectAttributes = function SelectAttributes(props) {
     title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
       type: "tishi1"
     }), "\u63D0\u793A", /*#__PURE__*/React.createElement(IconFont, {
-      type: "qingchu"
+      type: "qingchu",
+      onClick: handleCancel
     })),
+    wrapClassName: "".concat(classPrefix, "-modal-box"),
+    closeIcon: null,
     open: selectAttributesShow,
     onOk: handleOk,
     onCancel: handleCancel

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

@@ -1,5 +1,5 @@
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-import { Checkbox } from 'antd';
+import { Checkbox, Tooltip } from 'antd';
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
 import React, { useContext } from 'react';
@@ -21,27 +21,35 @@ var SortableComponnet = function SortableComponnet(props) {
     var _data$value = data.value,
       item = _data$value.item,
       index = _data$value.index;
-    return /*#__PURE__*/React.createElement(Checkbox, {
+    var name = item.alias_name ? item.alias_name : item.event_name;
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      title: "".concat(item.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(name),
+      key: index
+    }, /*#__PURE__*/React.createElement(Checkbox, {
       className: "checkbox-item ".concat(item.event_hidden ? 'event-hidden' : '', " column-").concat(groupId),
       checked: item.checked,
       key: index,
       onChange: function onChange() {
         return onChangeItem(groupId, item.event_id);
       }
-    }, item.alias_name ? item.alias_name : item.event_name);
+    }, name));
   });
   // 不可拖动的元素（未分组数据）
   var SortableItemNotDrag = function SortableItemNotDrag(data) {
     var item = data.item,
       index = data.index;
-    return /*#__PURE__*/React.createElement(Checkbox, {
+    var name = item.alias_name ? item.alias_name : item.event_name;
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      title: "".concat(item.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(name),
+      key: index
+    }, /*#__PURE__*/React.createElement(Checkbox, {
       className: "checkbox-item ".concat(item.event_hidden ? 'event-hidden' : '', " column-").concat(groupId),
       checked: item.checked,
       key: index,
       onChange: function onChange() {
         return onChangeItem(groupId, item.event_id);
       }
-    }, item.alias_name ? item.alias_name : item.event_name);
+    }, name));
   };
   // 整个元素排序的容器
   var SortableList = SortableContainer(function () {

package/es/modules/dataCollection/index.js

@@ -72,7 +72,7 @@ var DataCollection = function DataCollection(props) {
     }
   }, authority[100020] && /*#__PURE__*/React.createElement(Radio.Button, {
     value: 1
-  }, "\u57CB\u70B9\u4E8B\u4EF6"), /*#__PURE__*/React.createElement(Radio.Button, {
+  }, "\u5143\u4E8B\u4EF6"), /*#__PURE__*/React.createElement(Radio.Button, {
     value: 3
   }, "\u865A\u62DF\u4E8B\u4EF6"), authority[100021] && /*#__PURE__*/React.createElement(Radio.Button, {
     value: 2

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

@@ -486,11 +486,10 @@
         width: 100%;
         .checkbox-item {
           width: 25%;
+          .ant-checkbox + span {
+            user-select: none;
+          }
         }
-        // width: 25%;
-        // .ant-checkbox {
-        //   top: 0em;
-        // }
       }
       .checkbox-item {
         display: flex;
@@ -584,6 +583,23 @@
       display: none !important;
     }
   }
+  &-modal-box {
+    .ant-modal-close-x {
+      display: none;
+    }
+    .ant-modal-title {
+      position: relative;
+      .tishi1 {
+        margin-right: 8px;
+        color: #fd9f41;
+      }
+      .qingchu {
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
+    }
+  }
 }
 
 .select-attributes-box {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.2",
+  "version": "1.0.34-heyh.8",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -40,7 +40,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.98",
+    "@zgfe/business-lib": "1.2.3-heyh.1",
     "antd": "4.24.10",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -52,7 +52,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "9946c9d4ac13d31bfa3be622e1b5eae0a9447402",
+  "gitHead": "4ca76aeae40292e76792d097506126970af21364",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }