@zgfe/modules-dm 1.0.2-dm.32 → 1.0.2-dm.34

package/es/modules/dataCollection/collectionEventList.js

@@ -123,7 +123,12 @@ var CollectionEventList = function CollectionEventList(props) {
     setTotal(_tempTotal);
     setTotalBasics(_tempTotal);
     setgroupOptions(_tempGroupOptions);
-    !refreshFlag && setTableHandleData(_tempArr);
+
+    if (!refreshFlag) {
+      setPageNumber(1);
+      setTableHandleData(_tempArr);
+    }
+
     setTableHandleDataBasics(_tempArr);
     setLoading(false);
   }; // 刷新数据
@@ -222,6 +227,12 @@ var CollectionEventList = function CollectionEventList(props) {
       filterTypeData = _useState18[0],
       setfilterTypeData = _useState18[1];
 
+  var _useState19 = useState([]),
+      _useState20 = _slicedToArray(_useState19, 2),
+      groupData = _useState20[0],
+      setGroupData = _useState20[1]; // 分组数据操作条
+
+
   useEffect(function () {
     // console.log('filterTypeData', filterTypeData);
     // 判断不同type的筛选条件
@@ -244,10 +255,15 @@ var CollectionEventList = function CollectionEventList(props) {
       }
     };
 
+    var _groupData = [];
     var clearEmptyGroupFlag = false; // 多条件同时筛选
 
     var _tableHandleData = [];
     tableHandleDataBasics.map(function (item) {
+      if (item.groupId != undefined) {
+        _groupData.push(item);
+      }
+
       var falg = true;
       filterTypeData.map(function (filterItem) {
         if (!_judgeFun(item, filterItem)) {
@@ -257,6 +273,7 @@ var CollectionEventList = function CollectionEventList(props) {
       });
       falg && _tableHandleData.push(item);
     });
+    setGroupData(_groupData);
     var total = 0;
 
     _tableHandleData.map(function (item) {
@@ -282,7 +299,10 @@ var CollectionEventList = function CollectionEventList(props) {
       });
 
       return _data;
-    };
+    }; // console.log('_tableHandleData_tableHandleData', _tableHandleData);
+
+
+    setPageNumber(1);
 
     if (!clearEmptyGroupFlag) {
       setTableHandleData(_tableHandleData);
@@ -330,42 +350,42 @@ var CollectionEventList = function CollectionEventList(props) {
     }
   };
 
-  var _useState19 = useState(false),
-      _useState20 = _slicedToArray(_useState19, 2),
-      eventAttrListShow = _useState20[0],
-      setEventAttrListShow = _useState20[1];
-
-  var _useState21 = useState(),
+  var _useState21 = useState(false),
       _useState22 = _slicedToArray(_useState21, 2),
-      eventAttrsData = _useState22[0],
-      setEventAttrsData = _useState22[1];
+      eventAttrListShow = _useState22[0],
+      setEventAttrListShow = _useState22[1];
+
+  var _useState23 = useState(),
+      _useState24 = _slicedToArray(_useState23, 2),
+      eventAttrsData = _useState24[0],
+      setEventAttrsData = _useState24[1];
 
   var eventAttrDataHandle = function eventAttrDataHandle(data) {
     setEventAttrsData(data);
     setEventAttrListShow(true);
   };
 
-  var _useState23 = useState(1),
-      _useState24 = _slicedToArray(_useState23, 2),
-      pageNumber = _useState24[0],
-      setPageNumber = _useState24[1];
-
-  var _useState25 = useState(0),
+  var _useState25 = useState(1),
       _useState26 = _slicedToArray(_useState25, 2),
-      pageNumberIng = _useState26[0],
-      setpageNumberIng = _useState26[1];
+      pageNumber = _useState26[0],
+      setPageNumber = _useState26[1];
 
-  var _useState27 = useState(10),
+  var _useState27 = useState(0),
       _useState28 = _slicedToArray(_useState27, 2),
-      pageSize = _useState28[0],
-      setPageSize = _useState28[1];
+      pageNumberIng = _useState28[0],
+      setpageNumberIng = _useState28[1];
 
-  var _useState29 = useState([]),
+  var _useState29 = useState(10),
       _useState30 = _slicedToArray(_useState29, 2),
-      tableRenderData = _useState30[0],
-      setTableRenderData = _useState30[1]; // useEffect(() => {
+      pageSize = _useState30[0],
+      setPageSize = _useState30[1];
+
+  var _useState31 = useState([]),
+      _useState32 = _slicedToArray(_useState31, 2),
+      tableRenderData = _useState32[0],
+      setTableRenderData = _useState32[1]; // useEffect(() => {
   //   console.log('tableHandleData', tableHandleData);
-  //   if (tableHandleData.length <= 0) {
+  //   if (tableHandleData.length <= 0) { //待完善，收藏为空会有显示问题
   //     return;
   //   }
   //   if (pageNumber == pageNumberIng) {
@@ -400,10 +420,6 @@ var CollectionEventList = function CollectionEventList(props) {
     setPageNumber(1);
   }, [tableHandleData]);
   useEffect(function () {
-    if (tableHandleData.length <= 0) {
-      return;
-    }
-
     var paginationData = [];
     var arr = [];
     var count = 0;
@@ -427,7 +443,17 @@ var CollectionEventList = function CollectionEventList(props) {
       arr = [];
     }
 
-    setTableRenderData(paginationData[pageNumber - 1]);
+    var _renderData = paginationData[pageNumber - 1]; // console.log('_renderData', pageNumber, pageSize, tableHandleData, _renderData);
+
+    if (_renderData && _renderData.length > 0 && _renderData[0].groupId == undefined) {
+      groupData.map(function (item) {
+        if (item.groupId == _renderData[0]._groupId) {
+          _renderData.unshift(item);
+        }
+      });
+    }
+
+    setTableRenderData(_renderData);
   }, [pageNumber, pageSize, tableHandleData]); // 分页处理
 
   var onPaginationChange = function onPaginationChange(pageNumber, pageSize) {
@@ -441,8 +467,6 @@ var CollectionEventList = function CollectionEventList(props) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement("div", {
-    className: eventAttrListShow ? 'hidden-box' : ''
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-top-box")
   }, groupOptions.length > 0 && /*#__PURE__*/React.createElement(Select, {
@@ -483,7 +507,8 @@ var CollectionEventList = function CollectionEventList(props) {
     queryPlanData: props.queryPlanData,
     eventAttrDataHandle: eventAttrDataHandle,
     // pageSizeChange={pageSizeChange}
-    total: total
+    total: total,
+    groupData: groupData
   }), /*#__PURE__*/React.createElement(Pagination, {
     style: {
       textAlign: 'right'
@@ -493,7 +518,7 @@ var CollectionEventList = function CollectionEventList(props) {
     current: pageNumber,
     total: total,
     onChange: onPaginationChange
-  })), /*#__PURE__*/React.createElement(Drawer, {
+  }), /*#__PURE__*/React.createElement(Drawer, {
     className: "".concat(classPrefix, "-drawer"),
     width: '70%',
     placement: "right",

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

@@ -1,6 +1,7 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 .data-collection {
   position: relative;
+  height: 100%;
   margin-right: 24px;
   padding: 24px;
   padding-top: 10px;

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

@@ -31,6 +31,7 @@ interface TablePlusType {
     loading: boolean;
     pageSizeChange?: Function;
     total: number;
+    groupData: DataType[];
 }
 declare const TablePlus: React.FC<TablePlusType>;
 export default TablePlus;

package/es/modules/dataCollection/tablePlus.js

@@ -306,9 +306,7 @@ var TablePlus = function TablePlus(props) {
   };
 
   var groupPopoverContent = function groupPopoverContent(data, type) {
-    var count = 0;
-    var element = tableHandleData.map(function (item, index) {
-      item.groupId != undefined ? count++ : null;
+    var element = props.groupData.map(function (item, index) {
       if (type == 'copy' && item.groupId == -1) return null; // 复制到组，移出未分组
 
       return item.groupId != undefined && item.groupId != data.groupId ? /*#__PURE__*/React.createElement("div", {
@@ -321,10 +319,9 @@ var TablePlus = function TablePlus(props) {
         },
         key: index
       }, item.groupId == -1 ? '未分组' : item.groupName) : null;
-    }); // console.log(element, count);
-    // 复制分组时：除未分组外，如只有一个分组，则不展示复制分组
+    }); // 复制分组时：除未分组外，如只有一个分组，则不展示复制分组
 
-    return count <= 2 && type == 'copy' ? null : element;
+    return props.groupData.length < 2 && type == 'copy' ? null : element;
   };
 
   var columns = [{

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

@@ -1,11 +1,8 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 .plan-list {
   position: relative;
-  // width: calc(100% - 264px);
   height: 100%;
-  margin-top: 16px;
   margin-right: 24px;
-  margin-bottom: 24px;
   padding: 20px 24px 24px 24px;
   background: #fff;
   border-radius: 8px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.32",
+  "version": "1.0.2-dm.34",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "license": "ISC",
@@ -53,7 +53,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "11915ab68a51bf44cc8716916c571dd08955493a",
+  "gitHead": "d39265a9381367b86616e018ed05011ec7e0066e",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }