@zgfe/modules-dm 1.0.34-heyh.35 → 1.0.34-heyh.37

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

@@ -3,6 +3,7 @@ import React from 'react';
 import { eventChecked } from '../../../utils';
 import _ from 'lodash';
 var EventItem = function EventItem(props) {
+  var classPrefix = 'EventItem';
   var componnetData = props.componnetData,
     componnetIndex = props.componnetIndex,
     groupId = props.groupId,
@@ -21,6 +22,9 @@ var EventItem = function EventItem(props) {
     }
     return /*#__PURE__*/React.createElement(Tooltip, {
       title: "".concat(item.owner === 'zg_vtl' ? '虚拟事件' : '元事件', " | ").concat(name),
+      getPopupContainer: function getPopupContainer() {
+        return document.getElementById("".concat(EventItem, "-").concat(componnetIndex));
+      },
       key: index
     }, /*#__PURE__*/React.createElement(Checkbox, {
       className: "checkbox-item ".concat(item.event_hidden ? 'event-hidden' : '', " column-").concat(groupId),
@@ -35,7 +39,8 @@ var EventItem = function EventItem(props) {
     setGroupingData(_.cloneDeep(eventChecked(groupId, eventId, groupingData)));
   };
   return /*#__PURE__*/React.createElement("div", {
-    key: componnetIndex
+    key: componnetIndex,
+    id: "".concat(EventItem, "-").concat(componnetIndex)
   }, componnetData.map(function (item, index) {
     if (item.searchShow === 1) {
       return SortableItem({

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

@@ -607,6 +607,9 @@
       margin-right: 10px;
     }
   }
+  .ant-drawer-content-wrapper{
+    overflow-x: hidden;
+  }
   .ant-drawer-content,
   .ant-drawer-wrapper-body {
     overflow: hidden !important;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.34-heyh.35",
+  "version": "1.0.34-heyh.37",
   "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": "04e765ffd61b47440138e47139d94895f3ea3454",
+  "gitHead": "43564b10b4a9bef8753d0c48e09d2158a17362c6",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

package/es/modules/dataCollection/components/sortableComponnet copy.d.ts

@@ -1,3 +0,0 @@
-import React from 'react';
-declare const SortableComponnet: React.FC<any>;
-export default SortableComponnet;

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

@@ -1,121 +0,0 @@
-import { BizGlobalDataContext } from '@zgfe/business-lib';
-import { Checkbox, Tooltip } from 'antd';
-import request from '../../../utils/ajax';
-import apis from '../../../constants/api';
-import React, { useContext } from 'react';
-import { getAppID, eventChecked } from '../../../utils';
-import { arrayMoveImmutable } from 'array-move';
-import _ from 'lodash';
-import { SortableContainer, SortableElement } from 'react-sortable-hoc';
-var SortableComponnet = function SortableComponnet(props) {
-  var classPrefix = 'sortable-componnet';
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
-  var componnetData = props.componnetData,
-    componnetIndex = props.componnetIndex,
-    groupId = props.groupId,
-    groupingData = props.groupingData,
-    setGroupingData = props.setGroupingData,
-    refresh = props.refresh,
-    searchData = props.searchData;
-  // 需要拖动的元素的容器
-  var SortableItem = SortableElement(function (data) {
-    var _data$value = data.value,
-      item = _data$value.item,
-      index = _data$value.index;
-    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);
-      }
-    }, name));
-  });
-  // 不可拖动的元素（未分组数据）
-  var SortableItemNotDrag = function SortableItemNotDrag(data) {
-    var item = data.item,
-      index = data.index;
-    var name = item.alias_name ? "".concat(item.alias_name, "(").concat(item.event_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);
-      }
-    }, name));
-  };
-  // const onScroll = (e: React.UIEvent<HTMLElement, UIEvent>) => {
-  //   if (e.currentTarget.scrollHeight - e.currentTarget.scrollTop === 400) {
-  //   }
-  // };
-  // 整个元素排序的容器
-  var SortableList = SortableContainer(function () {
-    return /*#__PURE__*/React.createElement("div", {
-      key: componnetIndex
-    }, componnetData.map(function (item, index) {
-      if (item.searchShow === 1) {
-        if (groupId !== -1 && searchData === '') {
-          return /*#__PURE__*/React.createElement(SortableItem, {
-            key: "item-".concat(index),
-            index: index,
-            value: {
-              item: item,
-              index: index
-            }
-          });
-        } else {
-          return SortableItemNotDrag({
-            item: item,
-            index: index
-          });
-        }
-      } else {
-        return null;
-      }
-    }));
-  });
-  var onChangeItem = function onChangeItem(groupId, eventId) {
-    setGroupingData(_.cloneDeep(eventChecked(groupId, eventId, groupingData)));
-  };
-  var onSortEnd = function onSortEnd(data) {
-    var oldIndex = data.oldIndex,
-      newIndex = data.newIndex;
-    var eventList = arrayMoveImmutable(componnetData, oldIndex, newIndex);
-    var ids = [];
-    eventList.map(function (item) {
-      ids.push(item.event_id);
-    });
-    groupingData.map(function (item) {
-      if (item.groupId === groupId) {
-        item.eventList = eventList;
-      }
-    });
-    setGroupingData(_.cloneDeep(groupingData));
-    request(apis.orderEvent, {
-      method: 'post',
-      data: {
-        appId: getAppID(currentApp),
-        groupId: groupId,
-        ids: ids.join(',')
-      }
-    }).then(function () {
-      refresh();
-    });
-  };
-  return /*#__PURE__*/React.createElement(SortableList, {
-    distance: 5,
-    axis: 'xy',
-    helperClass: "".concat(classPrefix, "-sortableList"),
-    onSortEnd: onSortEnd
-  });
-};
-export default SortableComponnet;