@arim-aisdc/public-components 2.3.5 → 2.3.6

package/dist/components/BaseInfo/BaseInfo.d.ts

@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
     value: any;
     field: string;
     label?: string;
-    text: string | JSX.Element | Element;
+    text: string | Element | JSX.Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/TableMax/TableMax.js

@@ -54,7 +54,7 @@ var getCurrentRouterName = function getCurrentRouterName() {
   return window.location.pathname.slice(1);
 };
 var TableMax = function TableMax(_ref) {
-  var _JSON$parse, _tableContentRef$curr;
+  var _JSON$parse, _tableContentRef$curr, _tableContentRef$curr2;
   var tableId = _ref.tableId,
     originColumns = _ref.columns,
     _ref$datas = _ref.datas,
@@ -187,6 +187,10 @@ var TableMax = function TableMax(_ref) {
     request = _ref.request,
     onEditValueChange = _ref.onEditValueChange;
   var tableMaxRef = useRef(null);
+  // 表格元素
+  var tableContentRef = useRef(null);
+  var tableHeaderRef = useRef(null);
+  var tableBodyRef = useRef(null);
   var _useTranslation = useTranslation(),
     _useTranslation2 = _slicedToArray(_useTranslation, 1),
     t = _useTranslation2[0];
@@ -283,7 +287,7 @@ var TableMax = function TableMax(_ref) {
     columnPinning = _useState20[0],
     setColumnPinning = _useState20[1];
   var _useColumnWidth = useColumnWidth({
-      tableMaxRef: tableMaxRef,
+      tableContentRef: tableContentRef,
       tableId: tableId,
       tableKeyPrefixCls: tableKeyPrefixCls,
       columnVisibleConfig: columnVisibleConfig,
@@ -294,6 +298,7 @@ var TableMax = function TableMax(_ref) {
     onColumnSizingChange = _useColumnWidth.onColumnSizingChange,
     tableContainerWidth = _useColumnWidth.tableContainerWidth,
     handleVisibleConfigChange = _useColumnWidth.handleVisibleConfigChange;
+  console.log('columnSizing', columnSizing, tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.getBoundingClientRect().width, tableContainerWidth);
 
   /**列筛选 */
   var _useState21 = useState(defaultColumnFilters),
@@ -426,10 +431,6 @@ var TableMax = function TableMax(_ref) {
     onExpandedChange: setExpanded,
     sortDescFirst: true // 首次排序为递减排序，不加这个属性的话，有些列的排序会有问题
   });
-  // 表格元素
-  var tableContentRef = useRef(null);
-  var tableHeaderRef = useRef(null);
-  var tableBodyRef = useRef(null);
 
   // 暴露给外部的api
   useImperativeHandle(refInstance, function () {
@@ -952,7 +953,7 @@ var TableMax = function TableMax(_ref) {
   useEffect(function () {
     // 表格宽度变化时（比如调整页面宽度大小），重新计算是否展示阴影
     getPinShadowInfo();
-  }, [tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientWidth, table.getState().columnSizing]);
+  }, [tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 ? void 0 : _tableContentRef$curr2.clientWidth, table.getState().columnSizing]);
   var scrollHandler = useCallback(function (event) {
     if (!event.currentTarget) return;
     tableHeaderRef.current.scrollLeft = event.currentTarget.scrollLeft / event.currentTarget.scrollWidth * (tableHeaderRef === null || tableHeaderRef === void 0 ? void 0 : tableHeaderRef.current.scrollWidth);

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

@@ -1,13 +1,13 @@
 import { TableMaxColumnType } from "../../type";
-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 numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+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 numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
 declare const customSortFns: {
-    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;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    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;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/dist/components/TableMax/hooks/useColumnWidth.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="react" />
 import { ColumnSizing } from '../TableMax';
 interface UseColumnWidthProps {
-    tableMaxRef: React.RefObject<HTMLDivElement>;
+    tableContentRef: React.RefObject<HTMLDivElement>;
     tableId: string;
     tableKeyPrefixCls: string;
     columnVisibleConfig?: Record<string, boolean>;
     tableKey: string;
 }
-export declare const useColumnWidth: ({ tableMaxRef, tableId, tableKeyPrefixCls, columnVisibleConfig, tableKey, }: UseColumnWidthProps) => {
+export declare const useColumnWidth: ({ tableContentRef, tableId, tableKeyPrefixCls, columnVisibleConfig, tableKey, }: UseColumnWidthProps) => {
     columnSizing: ColumnSizing;
     allColumnCount: number;
     onColumnSizingChange: (data: any) => void;

package/dist/components/TableMax/hooks/useColumnWidth.js

@@ -16,7 +16,7 @@ import { debounce } from 'lodash';
 var CACHE_MAX_AGE = 1 * 60 * 60 * 1000; // 1小时
 
 export var useColumnWidth = function useColumnWidth(_ref) {
-  var tableMaxRef = _ref.tableMaxRef,
+  var tableContentRef = _ref.tableContentRef,
     tableId = _ref.tableId,
     tableKeyPrefixCls = _ref.tableKeyPrefixCls,
     _ref$columnVisibleCon = _ref.columnVisibleConfig,
@@ -33,6 +33,13 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
+  var getTableWidth = useCallback(function () {
+    var _tableContentRef$curr;
+    var width = (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.getBoundingClientRect().width;
+    var style = window.getComputedStyle(tableContentRef.current);
+    var horizontalBorderWidth = parseFloat(style.getPropertyValue('border-left-width')) + parseFloat(style.getPropertyValue('border-right-width'));
+    return Math.floor(width - horizontalBorderWidth);
+  }, [tableContentRef]);
 
   /**
   * 处理容器宽度变化的逻辑
@@ -42,8 +49,8 @@ export var useColumnWidth = function useColumnWidth(_ref) {
   * 列宽之和小于容器宽度，除选择列和展开列外，其他列平分 列宽之和与容器宽度的差值
   */
   var handleResize = useCallback(function () {
-    if (!tableMaxRef.current) return;
-    var newWidth = Math.floor(tableMaxRef.current.clientWidth);
+    if (!tableContentRef.current) return;
+    var newWidth = getTableWidth();
     setState(function (prevState) {
       // 计算可见列，排除特定列
       var visibleColumns = Object.keys(prevState.columnSizing).filter(function (key) {
@@ -83,21 +90,21 @@ export var useColumnWidth = function useColumnWidth(_ref) {
         tableContainerWidth: newWidth
       });
     });
-  }, [tableMaxRef.current]);
+  }, [tableContentRef.current]);
 
   // 使用防抖处理容器宽度变化
   var debouncedHandleResize = useMemo(function () {
     return debounce(handleResize, 200);
   }, [handleResize]);
   useEffect(function () {
-    if (!tableMaxRef.current) return;
+    if (!tableContentRef.current) return;
     var resizeObserver = new ResizeObserver(debouncedHandleResize);
-    resizeObserver.observe(tableMaxRef.current);
+    resizeObserver.observe(tableContentRef.current);
     return function () {
       resizeObserver.disconnect();
       debouncedHandleResize.cancel(); // 清理防抖
     };
-  }, [tableMaxRef.current, debouncedHandleResize]);
+  }, [tableContentRef.current, debouncedHandleResize]);
 
   /**
   * 列显示隐藏后调整列宽
@@ -122,11 +129,10 @@ export var useColumnWidth = function useColumnWidth(_ref) {
           })
         });
       } else {
-        var _tableMaxRef$current;
         //列宽减少
         var newVisibleColumnsSizing = prevState.columnSizing;
         delete newVisibleColumnsSizing[key];
-        var containerWidth = ((_tableMaxRef$current = tableMaxRef.current) === null || _tableMaxRef$current === void 0 ? void 0 : _tableMaxRef$current.clientWidth) - 10 || 0;
+        var containerWidth = getTableWidth() - 10 || 0;
         // 计算当前总宽度
         var totalWidth = Object.values(newVisibleColumnsSizing).reduce(function (sum, width) {
           return Number(sum || 0) + Number(width || 0);
@@ -164,8 +170,8 @@ export var useColumnWidth = function useColumnWidth(_ref) {
    * */
   var calculateColumnSizing = useCallback(function (columnsSizeMap, allColumnCount, containerWidth) {
     var _Object$keys$filter;
-    if (!tableMaxRef.current || !columnsSizeMap) return {};
-    var currentWidth = containerWidth || state.tableContainerWidth || tableMaxRef.current.clientWidth;
+    if (!tableContentRef.current || !columnsSizeMap) return {};
+    var currentWidth = containerWidth || state.tableContainerWidth || getTableWidth();
     var hasColumnCount = ((_Object$keys$filter = Object.keys(columnsSizeMap).filter(function (item) {
       return !!columnsSizeMap[item];
     })) === null || _Object$keys$filter === void 0 ? void 0 : _Object$keys$filter.length) || 0;
@@ -280,7 +286,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
     var changedColumn = data();
     if (!changedColumn) return;
     setState(function (prevState) {
-      var _tableMaxRef$current2;
       var changedColumnKey = Object.keys(changedColumn)[0];
       if (!changedColumnKey) return prevState;
       var oldWidth = prevState.columnSizing[changedColumnKey] || 0;
@@ -295,7 +300,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
       var totalWidth = Object.values(newVisibleColumnsSizing).reduce(function (sum, width) {
         return Number(sum || 0) + Number(width || 0);
       }, 0);
-      var containerWidth = ((_tableMaxRef$current2 = tableMaxRef.current) === null || _tableMaxRef$current2 === void 0 ? void 0 : _tableMaxRef$current2.clientWidth) - 10 || 0;
+      var containerWidth = getTableWidth() - 10 || 0;
       console.log(widthDiff, newWidth, oldWidth, changedColumnKey, prevState, 3344);
 
       // 处理列宽变大

package/dist/components/TableMax/tableMax.less

@@ -5,6 +5,7 @@
   width: 100%;
   display: flex;
   flex-direction: column;
+  box-sizing: border-box;
   // justify-content: center;
   // align-items: center;
 
@@ -119,7 +120,6 @@
       overflow-y: hidden !important;
       display: flex;
       flex-direction: column;
-
       border: @global-table-max-border;
       border-bottom: @global-table-max-center-border-bottom;
       border-radius: @global-table-max-center-border-radius;
@@ -146,7 +146,7 @@
 
       .table-body {
         flex: 1;
-        overflow: auto scroll;
+        overflow: scroll scroll;
         font-weight: @global-table-max-body-font-weight;
         // background: @tableColor2;
         .tbody-tr-td {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",