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

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

@@ -312,7 +312,7 @@
     height: 20px;
     .ant-drawer-close {
       position: absolute;
-      right: 24px;
+      right: 6px;
     }
   }
   .ant-drawer-mask {

package/es/modules/dataCollection/tablePlus.js

@@ -21,10 +21,10 @@ import { Input, Table, Select, message, Modal, Popover, Checkbox } from 'antd';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
 var Option = Select.Option;
-import React, { useState, useContext } from 'react';
+import React, { useEffect, useState, useContext } from 'react';
 import './styles/index.less';
 import _ from 'lodash';
-import { getAppID } from '../../utils';
+import { getAppID, getTableScroll } from '../../utils';
 import { DmContext } from '../../store';
 
 var TablePlus = function TablePlus(props) {
@@ -636,13 +636,24 @@ var TablePlus = function TablePlus(props) {
   //   pageNumber != 1 && props.pageSizeChange(pageNumber);
   // }, [pageNumber]);
 
+  var _useState13 = useState(''),
+      _useState14 = _slicedToArray(_useState13, 2),
+      scrollY = _useState14[0],
+      setScrollY = _useState14[1]; //页面加载完成后才能获取到对应的元素及其位置
+
+
+  useEffect(function () {
+    var _Y = getTableScroll(); // console.log('_Y', _Y);
+
+
+    setScrollY(_Y);
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(Table, {
     className: "".concat(classPrefix, "-table"),
-    style: {
-      minHeight: '640px'
-    },
+    id: "tablePlus",
+    // style={{ minHeight: '640px' }}
     columns: columns,
     rowKey: "key",
     loading: props.loading,
@@ -652,7 +663,7 @@ var TablePlus = function TablePlus(props) {
     },
     scroll: {
       x: 1300,
-      y: 550
+      y: scrollY
     },
     pagination: false,
     sticky: true

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

@@ -17,7 +17,7 @@
 .data-manage {
   position: relative;
   display: flex;
-  height: 100%;
+  // height: 100%;
   background: #f5f5f5;
   .tabs-box {
     position: relative;
@@ -61,7 +61,7 @@
     .zhidie-botton {
       position: absolute;
       bottom: 0;
-      left: 0;
+      left: -10px;
       width: 100%;
       height: 40px;
       font-size: 24px !important;
@@ -72,9 +72,9 @@
     }
   }
   .tabs-collapsed {
-    min-width: 80px;
+    min-width: 48px;
     .tabs {
-      min-width: 80px;
+      min-width: 48px;
       .tab {
         text-align: center;
         .bsicon {

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

@@ -86,7 +86,7 @@
       height: 20px;
       .ant-drawer-close {
         position: absolute;
-        right: 24px;
+        right: 6px;
       }
     }
     .ant-drawer-mask {
@@ -117,7 +117,6 @@
     position: relative;
     display: flex;
     margin-top: -8px;
-    margin-bottom: 8px;
     .input-waring {
       position: absolute;
       bottom: -30px;
@@ -130,6 +129,8 @@
     .plan-name-div {
       display: flex;
       height: 32px;
+      margin-top: -10px;
+      margin-bottom: -8px;
       color: #242541;
       font-weight: 500;
       font-size: 16px;

package/es/utils/index.d.ts

@@ -1 +1,7 @@
 export declare const getAppID: (currentApp: any) => any;
+/**
+ * 获取第一个表格的可视化高度
+ * @param {*} extraHeight 额外的高度(表格底部的内容高度 Number类型,默认为74)
+ * @param {*} id 当前页面中有多个table时需要制定table的id
+ */
+export declare function getTableScroll(extraHeight?: any, id?: any): string;

package/es/utils/index.js

@@ -6,4 +6,38 @@ export var getAppID = function getAppID(currentApp) {
   } else {
     return currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId;
   }
-};
+};
+/**
+ * 获取第一个表格的可视化高度
+ * @param {*} extraHeight 额外的高度(表格底部的内容高度 Number类型,默认为74)
+ * @param {*} id 当前页面中有多个table时需要制定table的id
+ */
+
+export function getTableScroll(extraHeight, id) {
+  if (typeof extraHeight == 'undefined') {
+    //  默认底部分页64 + 边距10
+    extraHeight = 74;
+  }
+
+  var tHeader = null;
+
+  if (id) {
+    var _document$getElementB;
+
+    tHeader = document.getElementById(id) ? (_document$getElementB = document.getElementById(id)) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.getElementsByClassName('ant-table-thead')[0] : null;
+  } else {
+    tHeader = document.getElementsByClassName('ant-table-thead')[0];
+  } //表格内容距离顶部的距离
+
+
+  var tHeaderBottom = 0;
+
+  if (tHeader) {
+    tHeaderBottom = tHeader.getBoundingClientRect().bottom;
+  } //窗体高度-表格内容顶部的高度-表格内容底部的高度
+  // let height = document.body.clientHeight - tHeaderBottom - extraHeight
+
+
+  var height = "calc(100vh - ".concat(tHeaderBottom + extraHeight, "px)");
+  return height;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.2-dm.34",
+  "version": "1.0.2-dm.35",
   "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": "d39265a9381367b86616e018ed05011ec7e0066e",
+  "gitHead": "5c9fedd7dfaed1615046c3519a175c5dd7aa352c",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }