@arim-aisdc/public-components 0.0.9 → 0.0.11

package/dist/components/TableMax/TableBody/index.d.ts

@@ -14,7 +14,6 @@ type TableBodyPropsType = {
     canFilter: boolean;
     canSelection: boolean;
     selectionWithoutChecked?: boolean;
-    tableBodyHeight: number;
     bodyContentHeight: number;
     tableContainerWidth: number;
     selectedRowDragging: boolean;
@@ -53,5 +52,5 @@ type TableBodyPropsType = {
     };
     dragBeforeStart: (datas: any) => boolean;
 };
-declare const TableBody: ({ table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableBodyHeight, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, hasVerticalScrollBar, datas, emptyDataHeight, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, pinShadowVisible, dragBeforeStart, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const TableBody: ({ table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, hasVerticalScrollBar, datas, emptyDataHeight, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, pinShadowVisible, dragBeforeStart, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
 export default TableBody;

package/dist/components/TableMax/TableBody/index.js

@@ -12,7 +12,6 @@ import { useDrop } from 'react-dnd';
 import { CustomDragLayer } from "../components/CustomDragerLayer";
 // import RowContent from "../components/RowContent";
 
-import { useEffect } from 'react';
 import { createPortal } from 'react-dom';
 import Row from "./Row";
 import "./index.less";
@@ -31,7 +30,6 @@ var TableBody = function TableBody(_ref) {
     onSelectChange = _ref.onSelectChange,
     canSelection = _ref.canSelection,
     selectionWithoutChecked = _ref.selectionWithoutChecked,
-    tableBodyHeight = _ref.tableBodyHeight,
     tableContainerWidth = _ref.tableContainerWidth,
     selectedRowDragging = _ref.selectedRowDragging,
     setSelectedRowDragging = _ref.setSelectedRowDragging,
@@ -239,9 +237,11 @@ var TableBody = function TableBody(_ref) {
     }
     return EmptyContent();
   };
-  useEffect(function () {
-    console.log(tableBodyHeight, 'tableBodyHeight*******************');
-  }, [tableBodyHeight]);
+
+  // useEffect(() => {
+  //   console.log(tableBodyHeight, 'tableBodyHeight*******************');
+  // }, [tableBodyHeight]);
+
   return (
     /*#__PURE__*/
     // 修复筛选数据为空时，滚动条丢失

package/dist/components/TableMax/TableMax.js

@@ -81,8 +81,7 @@ var TableMax = function TableMax(_ref) {
     _ref$showSizeChanger = _ref.showSizeChanger,
     showSizeChanger = _ref$showSizeChanger === void 0 ? true : _ref$showSizeChanger,
     changePagination = _ref.changePagination,
-    _ref$defaultScrollY = _ref.defaultScrollY,
-    defaultScrollY = _ref$defaultScrollY === void 0 ? 600 : _ref$defaultScrollY,
+    defaultScrollY = _ref.defaultScrollY,
     _ref$columnResizeMode = _ref.columnResizeMode,
     columnResizeMode = _ref$columnResizeMode === void 0 ? 'onChange' : _ref$columnResizeMode,
     rowKey = _ref.rowKey,
@@ -367,18 +366,19 @@ var TableMax = function TableMax(_ref) {
     var _tableHeaderRef$curre;
     setTableHeadHeight(tableHeaderRef === null || tableHeaderRef === void 0 || (_tableHeaderRef$curre = tableHeaderRef.current) === null || _tableHeaderRef$curre === void 0 ? void 0 : _tableHeaderRef$curre.clientHeight);
   }, [tableHeaderRef === null || tableHeaderRef === void 0 || (_tableHeaderRef$curre2 = tableHeaderRef.current) === null || _tableHeaderRef$curre2 === void 0 ? void 0 : _tableHeaderRef$curre2.clientHeight, enableFilters]);
+  var bodyContentHeight = useMemo(function () {
+    return datas.length * Number(rowHeight);
+  }, [datas.length, rowHeight]);
 
   /**table-body高度 */
   useEffect(function () {
     var _tableContentRef$curr, _tableContentRef$curr2;
     var horizontalScrollHeight = table.getTotalSize() > (tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.offsetWidth) ? 10 : 0;
-    setTableBodyHeight(autoHeight ? (tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 ? void 0 : _tableContentRef$curr2.clientHeight) - tableHeadHeight - horizontalScrollHeight : defaultScrollY - tableHeadHeight - horizontalScrollHeight);
-  }, [table.getTotalSize(), defaultScrollY, autoHeight, tableContentRef === null || tableContentRef === void 0 ? void 0 : tableContentRef.current, tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr3 = tableContentRef.current) === null || _tableContentRef$curr3 === void 0 ? void 0 : _tableContentRef$curr3.clientHeight, tableHeadHeight]);
+    setTableBodyHeight(autoHeight ? (tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 ? void 0 : _tableContentRef$curr2.clientHeight) - tableHeadHeight - horizontalScrollHeight : defaultScrollY ? defaultScrollY - tableHeadHeight - horizontalScrollHeight : bodyContentHeight);
+  }, [table.getTotalSize(), defaultScrollY, autoHeight, tableContentRef === null || tableContentRef === void 0 ? void 0 : tableContentRef.current, tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr3 = tableContentRef.current) === null || _tableContentRef$curr3 === void 0 ? void 0 : _tableContentRef$curr3.clientHeight, tableHeadHeight, bodyContentHeight]);
 
   /**table-body-content 高度 */
-  var bodyContentHeight = useMemo(function () {
-    return datas.length * Number(rowHeight);
-  }, [datas.length, rowHeight]);
+
   var hasVerticalScrollBar = useMemo(function () {
     return tableBodyHeight - bodyContentHeight + 10 < 0;
   }, [tableBodyHeight, bodyContentHeight]);
@@ -967,7 +967,7 @@ var TableMax = function TableMax(_ref) {
     selectionWithoutChecked: selectionWithoutChecked,
     // scroll,
     // setScroll,
-    tableBodyHeight: tableBodyHeight,
+    // tableBodyHeight,
     // tableHeadHeight,
     // setTableHeadHeight,
     bodyContentHeight: bodyContentHeight,
@@ -1126,7 +1126,7 @@ var TableMax = function TableMax(_ref) {
             className: "table-center",
             ref: tableContentRef,
             style: {
-              height: !autoHeight ? defaultScrollY : 'fix-content'
+              height: !autoHeight && defaultScrollY ? defaultScrollY : 'fix-content'
             },
             children: [/*#__PURE__*/_jsx("div", {
               ref: tableHeaderRef,

package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts

@@ -1,10 +1,10 @@
-export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",
@@ -49,6 +49,7 @@
     "@tanstack/react-table": "^8.9.1",
     "ahooks": "^3.7.8",
     "css-vars-ponyfill": "^2.4.8",
+    "f": "^1.4.0",
     "fs": "^0.0.1-security",
     "lodash": "^4.17.21",
     "path": "^0.12.7",
@@ -90,4 +91,4 @@
   "authors": [
     "na.xu2278@foxmail.com"
   ]
-}
+}