@arim-aisdc/public-components 2.1.2 → 2.1.4

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 | Element | JSX.Element;
+    text: string | JSX.Element | Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/CustomForm/CustomForm.js

@@ -398,6 +398,9 @@ var CustomForm = function CustomForm(_ref, ref) {
           onChange: function onChange(e) {
             commonChange(e, item);
           },
+          disabled: item === null || item === void 0 ? void 0 : item.disabled
+          // disabledDate={item?.disabled}
+          ,
           suffixIcon: /*#__PURE__*/_jsx("i", {
             className: "iconfont-other icon-other-calendar"
           }),

package/dist/components/QueryFilter/index.less

@@ -8,6 +8,7 @@
 .btnContainer {
   width: 100%;
   text-align: right;
+  margin-top: 0 !important;
 }
 
 .sectionInput {

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

@@ -1,6 +1,6 @@
 import { DropSide, OnSelectChangeType } from "../type";
 import { Table } from '@tanstack/react-table';
-import { Dispatch, ReactNode, SetStateAction } from 'react';
+import React, { Dispatch, ReactNode, SetStateAction } from 'react';
 import './index.less';
 type IRowProps = {
     table: Table<any>;
@@ -58,6 +58,7 @@ type IRowProps = {
     clearHoverRowIndex: () => void;
     hoverRowIndex: number;
     dropSide: DropSide;
+    onEditValueChange?: (field: string, value: any, extra?: any) => void;
 };
-declare const Row: ({ tableBodyRef, table, tableId, row, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, reorderRow, canRowDrag, rowClassName, cellClassName, rowStyle, getCellProps, editting, rowEditing, renderSubComponent, selectedRowDragging, setSelectedRowDragging, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, rowHeight, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, shadowColumnInfo, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, }: IRowProps) => import("react/jsx-runtime").JSX.Element;
+declare const Row: ({ tableBodyRef, table, tableId, row, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, reorderRow, canRowDrag, rowClassName, cellClassName, rowStyle, getCellProps, editting, rowEditing, renderSubComponent, selectedRowDragging, setSelectedRowDragging, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, rowHeight, disableDragRowIds, selectRowWhenClick, handleEditRowWhenDClick, canEditRowWhenDClick, theme, dragBeforeStart, shadowColumnInfo, onCellContextMenu, getRowHoverTipConfig, tableTooltip, changeHoverRow, clearHoverRowIndex, hoverRowIndex, dropSide, onEditValueChange, }: IRowProps) => import("react/jsx-runtime").JSX.Element;
 export default Row;

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

@@ -12,8 +12,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { DropSide } from "../type";
 import { flexRender } from '@tanstack/react-table';
+import { useUpdateEffect } from 'ahooks';
 import { Tooltip } from 'antd';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
 import { getEmptyImage } from 'react-dnd-html5-backend';
 import { getPinningStyle } from "../TableHeader/utils";
@@ -66,7 +67,8 @@ var Row = function Row(_ref) {
     changeHoverRow = _ref.changeHoverRow,
     clearHoverRowIndex = _ref.clearHoverRowIndex,
     hoverRowIndex = _ref.hoverRowIndex,
-    dropSide = _ref.dropSide;
+    dropSide = _ref.dropSide,
+    onEditValueChange = _ref.onEditValueChange;
   var dropPreviewLineClassName = useMemo(function () {
     if (hoverRowIndex === row.index) {
       return dropSide === DropSide.Top ? 'showTopBorder' : 'showBottomBorder';
@@ -146,6 +148,12 @@ var Row = function Row(_ref) {
       setSelectedRowDragging(isDragging);
     }
   }, [isDragging, row.getIsSelected()]);
+  useUpdateEffect(function () {
+    // 鼠标移出，清除border
+    if (!isDragging) {
+      clearHoverRowIndex();
+    }
+  }, [isDragging]);
   var rowClickHandler = function rowClickHandler(evt) {
     // 触发单击事件
     onRowMouseClick === null || onRowMouseClick === void 0 || onRowMouseClick(row);
@@ -253,8 +261,6 @@ var Row = function Row(_ref) {
   };
   var rowMouseLeave = function rowMouseLeave() {
     onRowMouseLeave === null || onRowMouseLeave === void 0 || onRowMouseLeave(row);
-    // 鼠标移出，清除border
-    clearHoverRowIndex === null || clearHoverRowIndex === void 0 || clearHoverRowIndex();
   };
   var handleCellRightClick = function handleCellRightClick(e, cell) {
     onCellContextMenu(e, cell);
@@ -283,9 +289,7 @@ var Row = function Row(_ref) {
     canSelection && !selectRowWhenClick && String(row.id) === String(rowHighLightId) // 多选并且点击行时不选中，高亮状态单独管理
     ;
   }, [row.id, row.getIsSelected(), rowSelectedId, selectRowWhenClick, rowHighLightId, canSelection]);
-
-  // console.log('row render', row.id);
-
+  console.log('row render');
   var rowCom = function rowCom() {
     var _row;
     return /*#__PURE__*/_jsx("tr", {
@@ -329,6 +333,7 @@ var Row = function Row(_ref) {
             editing: columnEditing,
             dataIndex: accessorKey,
             title: header,
+            onEditValueChange: onEditValueChange,
             children: flexRender(cell.column.columnDef.cell, cell.getContext())
           }))
         }), cell.id);

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

@@ -70,6 +70,7 @@ type TableBodyPropsType = {
     };
     tableTooltip: boolean;
     compactMode: boolean;
+    onEditValueChange?: (field: string, value: any, extra?: any) => void;
 };
-declare const TableBody: ({ tableBodyRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, datas, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, dragBeforeStart, shadowColumnInfo, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const TableBody: ({ tableBodyRef, table, tableId, theme, reorderRow, rowSelectedId, setRowSelectedId, rowHighLightId, setRowHighLightId, selectedRowChange, onSelectChange, canSelection, selectionWithoutChecked, tableContainerWidth, selectedRowDragging, setSelectedRowDragging, canRowDrag, rowKey, loading, rowClassName, cellClassName, rowStyle, getCellProps, rowHeight, renderSubComponent, onRowMouseEnter, onRowMouseLeave, onRowMouseClick, onRowMouseDoubleClick, disableDragRowIds, selectRowWhenClick, datas, canEditRowWhenDClick, editingRowId, handleEditRowWhenDClick, dragBeforeStart, shadowColumnInfo, getContextMenu, onClickContextMenu, getRowHoverTipConfig, tableTooltip, compactMode, onEditValueChange, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
 export default TableBody;

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

@@ -71,7 +71,8 @@ var TableBody = function TableBody(_ref) {
     onClickContextMenu = _ref.onClickContextMenu,
     getRowHoverTipConfig = _ref.getRowHoverTipConfig,
     tableTooltip = _ref.tableTooltip,
-    compactMode = _ref.compactMode;
+    compactMode = _ref.compactMode,
+    onEditValueChange = _ref.onEditValueChange;
   var _useConfig = useConfig(),
     root = _useConfig.root;
   var headerGroups = table.getHeaderGroups();
@@ -126,6 +127,7 @@ var TableBody = function TableBody(_ref) {
     })) || [];
     // console.log('hover :>> ', targetRowIndex, originRowIndex);
     if (tableId === origin.sourceTableId && originRowIndexList.includes(targetRowIndex)) {
+      // hover在被拖动的行时，隐藏放置位置
       clearHoverRowIndex();
     } else if (targetRowIndex !== hoverRowIndex) {
       setHoverRowIndex(targetRowIndex);
@@ -142,11 +144,11 @@ var TableBody = function TableBody(_ref) {
   var addToLast = useCallback(function () {
     publishCurTableHoveringEvent();
     var lastIndex = table.getRowModel().rows.length - 1;
-    if (lastIndex !== hoverRowIndex) {
+    if (lastIndex !== hoverRowIndex || lastIndex === hoverRowIndex && dropSide !== DropSide.Bottom) {
       setHoverRowIndex(lastIndex);
       setDropSide(DropSide.Bottom);
     }
-  }, [hoverRowIndex]);
+  }, [hoverRowIndex, dropSide]);
 
   // cell右键菜单
   var handleCellContextMenu = function handleCellContextMenu(e, cell) {
@@ -365,7 +367,8 @@ var TableBody = function TableBody(_ref) {
         changeHoverRow: changeHoverRow,
         clearHoverRowIndex: clearHoverRowIndex,
         hoverRowIndex: hoverRowIndex,
-        dropSide: dropSide
+        dropSide: dropSide,
+        onEditValueChange: onEditValueChange
       }, row.id);
     });
   };

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

@@ -15,5 +15,6 @@ export declare enum ColumnType {
 }
 export type ColumnSizing = Record<string, number>;
 export declare const TableContext: React.Context<TableContextType>;
+export declare const CACHE_MAX_AGE: number;
 declare const _default: React.ForwardRefExoticComponent<TableMaxProps & React.RefAttributes<unknown>>;
 export default _default;