@arim-aisdc/public-components 2.0.21 → 2.0.23

package/dist/components/CustomForm/CustomForm.js

@@ -258,7 +258,8 @@ var CustomForm = function CustomForm(_ref, ref) {
         break;
       case CustomFormItemType.Number:
         element = /*#__PURE__*/_jsx(CustomFormItemInputNumber, {
-          item: item
+          item: item,
+          commonChange: commonChange
         });
         break;
       case CustomFormItemType.Switch:

package/dist/components/CustomForm/customFormItemInputNumber/index.d.ts

@@ -1,8 +1,10 @@
+import { fieldType, inputValueType } from '../type';
 import './index.less';
 interface CustomFormItemInputNumberProps {
     item: any;
+    commonChange: (e: any, item: fieldType, type?: inputValueType) => void;
     value?: number;
     onChange?: (e: any) => void;
 }
-declare const CustomFormItemInputNumber: ({ item, value, onChange }: CustomFormItemInputNumberProps) => import("react/jsx-runtime").JSX.Element;
+declare const CustomFormItemInputNumber: ({ item, commonChange, value, onChange }: CustomFormItemInputNumberProps) => import("react/jsx-runtime").JSX.Element;
 export default CustomFormItemInputNumber;

package/dist/components/CustomForm/customFormItemInputNumber/index.js

@@ -1,13 +1,14 @@
 import { InputNumber } from 'antd';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var CustomFormItemInputNumber = function CustomFormItemInputNumber(_ref) {
   var item = _ref.item,
+    commonChange = _ref.commonChange,
     value = _ref.value,
     _onChange = _ref.onChange;
-  return /*#__PURE__*/_jsxs(_Fragment, {
+  return /*#__PURE__*/_jsxs("div", {
+    className: "customFormItemInputNumber",
     children: [/*#__PURE__*/_jsx(InputNumber, {
       placeholder: item.inputTips,
       precision: item.precision,
@@ -17,6 +18,7 @@ var CustomFormItemInputNumber = function CustomFormItemInputNumber(_ref) {
       step: item.step,
       onChange: function onChange(e) {
         _onChange(e);
+        commonChange(e, item);
       },
       value: value
     }), (item === null || item === void 0 ? void 0 : item.unit) && /*#__PURE__*/_jsx("span", {

package/dist/components/CustomForm/customFormItemInputNumber/index.less

@@ -1,6 +1,12 @@
-.unit {
-  font-weight: 400;
-  font-size: 14px;
-  margin-left: 6px;
-  color: @globalColor1;
+.customFormItemInputNumber {
+  display: flex;
+  align-items: center;
+
+  .unit {
+    font-weight: 400;
+    font-size: 14px;
+    margin-left: 6px;
+    color: @globalColor1;
+    flex-shrink: 0;
+  }
 }

package/dist/components/Icon/index.js

@@ -9,7 +9,7 @@ var Icon = function Icon(_ref) {
     name = _ref.name,
     prefix = _ref.prefix,
     style = _ref.style,
-    _onClick = _ref.onClick;
+    onClick = _ref.onClick;
   var _useConfig = useConfig(),
     theme = _useConfig.theme;
   var iconPrefix = useMemo(function () {
@@ -20,9 +20,7 @@ var Icon = function Icon(_ref) {
   return /*#__PURE__*/_jsx("i", {
     className: "public-icon ".concat(className, " iconfont-").concat(iconPrefix, " icon-").concat(iconPrefix, "-").concat(name),
     style: style,
-    onClick: function onClick(event) {
-      return _onClick(event);
-    }
+    onClick: onClick
   });
 };
 export default Icon;

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

@@ -65,8 +65,10 @@ var Row = function Row(_ref) {
   var timerRef = useRef();
   var _useDrop = useDrop({
       accept: 'TABLE_ROW',
-      drop: function drop(formDatas, monitor) {
-        console.log('drop================start-', monitor);
+      drop: function drop(formDatas
+      //  monitor
+      ) {
+        // console.log('drop-row', monitor, row);
         return reorderRow === null || reorderRow === void 0 ? void 0 : reorderRow(formDatas, {
           hoverRow: row,
           targetTableId: tableId

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

@@ -70,5 +70,5 @@ type TableBodyPropsType = {
     };
     tableTooltip: boolean;
 };
-declare const TableBody: ({ tableContentRef, 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, }: 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, }: TableBodyPropsType) => import("react/jsx-runtime").JSX.Element;
 export default TableBody;

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

@@ -20,17 +20,16 @@ import { CustomDragLayer } from "../components/CustomDragerLayer";
 import { useCallback, useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { useConfig } from "../../ConfigProvider";
+import Empty from "../../Empty";
 import Row from "./Row";
 import ContextMenu from "./contextMenu/ContextMenu";
 import "./index.less";
-import Empty from "../../Empty";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 var TableBody = function TableBody(_ref) {
   var _headerGroups, _table$getRowModel$ro2;
-  var tableContentRef = _ref.tableContentRef,
-    tableBodyRef = _ref.tableBodyRef,
+  var tableBodyRef = _ref.tableBodyRef,
     table = _ref.table,
     tableId = _ref.tableId,
     theme = _ref.theme,
@@ -72,8 +71,7 @@ var TableBody = function TableBody(_ref) {
     getRowHoverTipConfig = _ref.getRowHoverTipConfig,
     tableTooltip = _ref.tableTooltip;
   var _useConfig = useConfig(),
-    root = _useConfig.root,
-    renderEmpty = _useConfig.renderEmpty;
+    root = _useConfig.root;
   var headerGroups = table.getHeaderGroups();
   var headers = (headerGroups === null || headerGroups === void 0 || (_headerGroups = headerGroups[headerGroups.length - 1]) === null || _headerGroups === void 0 ? void 0 : _headerGroups.headers) || [];
   var _useState = useState({
@@ -203,17 +201,34 @@ var TableBody = function TableBody(_ref) {
   var _useDrop = useDrop({
       accept: 'TABLE_ROW',
       drop: function drop(formDatas) {
+        // console.log('drop-empty did');
         return reorderRow === null || reorderRow === void 0 ? void 0 : reorderRow(formDatas, {
           hoverRow: {
             index: 0
           },
           targetTableId: tableId
         });
-        // return reorderRow?.(draggedRow, { ...row, tableId });
       }
     }),
     _useDrop2 = _slicedToArray(_useDrop, 2),
-    dropRef = _useDrop2[1];
+    dropEmptyRef = _useDrop2[1];
+  var _useDrop3 = useDrop({
+      accept: 'TABLE_ROW',
+      drop: function drop(formDatas, monitor) {
+        if (monitor.didDrop()) {
+          // drop到内部的row时，这里不再处理
+          // console.log('drop-table-empty stop');
+          return undefined;
+        }
+        // console.log('drop-table-empty did');
+        return reorderRow === null || reorderRow === void 0 ? void 0 : reorderRow(formDatas, {
+          hoverRow: undefined,
+          targetTableId: tableId
+        });
+      }
+    }),
+    _useDrop4 = _slicedToArray(_useDrop3, 2),
+    dropTableEmptyRef = _useDrop4[1];
   var LoadingAndEmptyContent = function LoadingAndEmptyContent() {
     return /*#__PURE__*/_jsx("div", {
       className: "empty-container",
@@ -227,7 +242,7 @@ var TableBody = function TableBody(_ref) {
         },
         children: loading ? /*#__PURE__*/_jsx(Spin, {}) : /*#__PURE__*/_jsx("span", {
           className: "empty-content",
-          ref: dropRef,
+          ref: dropEmptyRef,
           children: /*#__PURE__*/_jsx(Empty, {})
         })
       })
@@ -301,19 +316,23 @@ var TableBody = function TableBody(_ref) {
         tableId: tableId
       }),
       // document.body,
-      root ? document.querySelector(root) : document.body), showTable ? /*#__PURE__*/_jsxs("table", {
-        children: [/*#__PURE__*/_jsx("colgroup", {
-          children: headers.map(function (header) {
-            var _header$column;
-            var size = (header === null || header === void 0 || (_header$column = header.column) === null || _header$column === void 0 ? void 0 : _header$column.getSize()) || 120;
-            return /*#__PURE__*/_jsx("col", {
-              width: size
-            }, header.id);
-          })
-        }), /*#__PURE__*/_jsx("tbody", {
-          id: "table-max-tableBody-tbody-".concat(tableId),
-          children: TBodyContent()
-        })]
+      root ? document.querySelector(root) : document.body), showTable ? /*#__PURE__*/_jsx("div", {
+        className: "table-max-table-body-table-wrapper",
+        ref: dropTableEmptyRef,
+        children: /*#__PURE__*/_jsxs("table", {
+          children: [/*#__PURE__*/_jsx("colgroup", {
+            children: headers.map(function (header) {
+              var _header$column;
+              var size = (header === null || header === void 0 || (_header$column = header.column) === null || _header$column === void 0 ? void 0 : _header$column.getSize()) || 120;
+              return /*#__PURE__*/_jsx("col", {
+                width: size
+              }, header.id);
+            })
+          }), /*#__PURE__*/_jsx("tbody", {
+            id: "table-max-tableBody-tbody-".concat(tableId),
+            children: TBodyContent()
+          })]
+        })
       }) : LoadingAndEmptyContent(), /*#__PURE__*/_jsx(ContextMenu, _objectSpread(_objectSpread({}, contextMenuData), {}, {
         onClickContextMenu: onClickContextMenu,
         closeContextMenu: closeContextMenu

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

@@ -163,3 +163,9 @@ table {
     }
   }
 }
+
+.table-max-table-body-table-wrapper {
+  min-width: 100%;
+  min-height: 100%;
+  width: fit-content;
+}

package/dist/components/TableMax/TableMax.js

@@ -787,7 +787,7 @@ var TableMax = function TableMax(_ref) {
       targetTableId = toDatas.targetTableId;
     if (!dragBeforeEnd(toDatas, fromDatas)) return;
     var dragFromRowIndex = draggedRow.index;
-    var targetRowIndex = hoverRow.index;
+    var targetRowIndex = hoverRow === null || hoverRow === void 0 ? void 0 : hoverRow.index;
     var draggedRowsIndexList = draggedRows === null || draggedRows === void 0 ? void 0 : draggedRows.map(function (row) {
       return row.index;
     });
@@ -796,9 +796,14 @@ var TableMax = function TableMax(_ref) {
       aheadOfTargetRowNumber = 0;
     var newTableDatas;
     if (sourceTableId !== targetTableId) {
-      var _newTableDatas;
       newTableDatas = _toConsumableArray(tableDatas);
-      (_newTableDatas = newTableDatas).splice.apply(_newTableDatas, [targetRowIndex, 0].concat(_toConsumableArray(draggedRows)));
+      if (targetRowIndex !== undefined) {
+        var _newTableDatas;
+        (_newTableDatas = newTableDatas).splice.apply(_newTableDatas, [targetRowIndex, 0].concat(_toConsumableArray(draggedRows)));
+      } else {
+        var _newTableDatas2;
+        (_newTableDatas2 = newTableDatas).push.apply(_newTableDatas2, _toConsumableArray(draggedRows));
+      }
       rowOrderChange === null || rowOrderChange === void 0 || rowOrderChange({
         sourceTableId: sourceTableId,
         targetTableId: targetTableId,
@@ -813,31 +818,46 @@ var TableMax = function TableMax(_ref) {
     }
     // 多选行拖动（如果有多选行，且拖拽行属于选中行，则所有选中行跟随拖拽一起移动）
     if (isMultipleDrag) {
-      var _newTableDatas2;
       draggedRows.forEach(function (item) {
-        //如果目标行等于拖拽行，则取消拖拽操作
-        if (targetRowIndex === item.index) {
-          isDraggedToSourceRow = true;
-        }
-        if (item.index < targetRowIndex) {
-          aheadOfTargetRowNumber++;
-        }
         if (draggedRowsIndexList.includes(item.index)) {
           draggedDatas.push(tableDatas[item.index]);
         }
       });
-      if (isDraggedToSourceRow) return;
+      if (targetRowIndex !== undefined) {
+        var _newTableDatas3;
+        draggedRows.forEach(function (item) {
+          //如果目标行等于拖拽行，则取消拖拽操作
+          if (targetRowIndex === item.index) {
+            isDraggedToSourceRow = true;
+          }
+          if (item.index < targetRowIndex) {
+            aheadOfTargetRowNumber++;
+          }
+        });
+        if (isDraggedToSourceRow) return;
 
-      //统一删除选中行
-      newTableDatas = tableDatas.filter(function (data, idx) {
-        return !draggedRowsIndexList.includes(idx);
-      });
-      (_newTableDatas2 = newTableDatas).splice.apply(_newTableDatas2, [targetRowIndex > dragFromRowIndex ? targetRowIndex - aheadOfTargetRowNumber + 1 : targetRowIndex - aheadOfTargetRowNumber, 0].concat(draggedDatas));
+        //统一删除选中行
+        newTableDatas = tableDatas.filter(function (data, idx) {
+          return !draggedRowsIndexList.includes(idx);
+        });
+        (_newTableDatas3 = newTableDatas).splice.apply(_newTableDatas3, [targetRowIndex > dragFromRowIndex ? targetRowIndex - aheadOfTargetRowNumber + 1 : targetRowIndex - aheadOfTargetRowNumber, 0].concat(draggedDatas));
+      } else {
+        var _newTableDatas4;
+        //统一删除选中行
+        newTableDatas = tableDatas.filter(function (data, idx) {
+          return !draggedRowsIndexList.includes(idx);
+        });
+        (_newTableDatas4 = newTableDatas).push.apply(_newTableDatas4, draggedDatas);
+      }
       setTableDatas(_toConsumableArray(newTableDatas));
     } else {
       // 单选行拖动
       newTableDatas = _toConsumableArray(tableDatas);
-      newTableDatas.splice(targetRowIndex, 0, newTableDatas.splice(dragFromRowIndex, 1)[0]);
+      if (targetRowIndex !== undefined) {
+        newTableDatas.splice(targetRowIndex, 0, newTableDatas.splice(dragFromRowIndex, 1)[0]);
+      } else {
+        newTableDatas.push(newTableDatas.splice(dragFromRowIndex, 1)[0]);
+      }
       setTableDatas(newTableDatas);
     }
     rowOrderChange === null || rowOrderChange === void 0 || rowOrderChange({

package/package.json

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