@arim-aisdc/public-components 2.3.20 → 2.3.22

package/dist/components/CenterModal/CenterModal.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["open", "title", "okText", "hasfooter", "footer", "width", "size", "renderContent", "handleConfirm", "handleCancel", "confirmLoading", "maskClosable", "bodyStyle", "afterClose", "enableResizing", "enableDragging", "minResizeWidth", "minResizeHeight", "maxResizeWidth", "maxResizeHeight"];
+var _excluded = ["open", "title", "okText", "hasfooter", "footer", "width", "height", "size", "renderContent", "handleConfirm", "handleCancel", "confirmLoading", "maskClosable", "bodyStyle", "afterClose", "enableResizing", "enableDragging", "minResizeWidth", "minResizeHeight", "maxResizeWidth", "maxResizeHeight"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -33,6 +33,7 @@ var CenterModal = function CenterModal(_ref) {
     footer = _ref.footer,
     _ref$width = _ref.width,
     width = _ref$width === void 0 ? 500 : _ref$width,
+    height = _ref.height,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? '' : _ref$size,
     renderContent = _ref.renderContent,
@@ -41,7 +42,7 @@ var CenterModal = function CenterModal(_ref) {
     _ref$confirmLoading = _ref.confirmLoading,
     confirmLoading = _ref$confirmLoading === void 0 ? false : _ref$confirmLoading,
     _ref$maskClosable = _ref.maskClosable,
-    maskClosable = _ref$maskClosable === void 0 ? true : _ref$maskClosable,
+    maskClosable = _ref$maskClosable === void 0 ? false : _ref$maskClosable,
     _ref$bodyStyle = _ref.bodyStyle,
     bodyStyle = _ref$bodyStyle === void 0 ? {
       position: 'relative'
@@ -54,76 +55,110 @@ var CenterModal = function CenterModal(_ref) {
     _ref$minResizeWidth = _ref.minResizeWidth,
     minResizeWidth = _ref$minResizeWidth === void 0 ? 200 : _ref$minResizeWidth,
     _ref$minResizeHeight = _ref.minResizeHeight,
-    minResizeHeight = _ref$minResizeHeight === void 0 ? 200 : _ref$minResizeHeight,
-    maxResizeWidth = _ref.maxResizeWidth,
+    minResizeHeight = _ref$minResizeHeight === void 0 ? 50 : _ref$minResizeHeight,
+    _ref$maxResizeWidth = _ref.maxResizeWidth,
+    maxResizeWidth = _ref$maxResizeWidth === void 0 ? 1800 : _ref$maxResizeWidth,
     maxResizeHeight = _ref.maxResizeHeight,
     rest = _objectWithoutProperties(_ref, _excluded);
   var modalBodyRef = useRef(null);
-  var titleElementRef = useRef();
+  var modalBodySizeRef = useRef(null);
   var rndRef = useRef(null);
   var contentObserverRef = useRef();
   var modalContentRef = useRef(null);
+  var hasResized = useRef(false);
   var dragHandleClassName = useMemo(function () {
-    var _titleElementRef$curr;
-    return "drag-handle-".concat((_titleElementRef$curr = titleElementRef.current) === null || _titleElementRef$curr === void 0 ? void 0 : _titleElementRef$curr.length);
-  }, [titleElementRef.current]);
-  useEffect(function () {
     var titleElements = document.querySelectorAll('.modal-header');
-    if (titleElements) {
-      titleElementRef.current = titleElements;
-    }
-  }, []);
+    if (!open || !titleElements) return "drag-handle";
+    return "drag-handle-".concat(titleElements.length);
+  }, [open]);
   useEffect(function () {
-    if (!open) {
+    var timer;
+    var cleanup = function cleanup() {
       var _contentObserverRef$c;
-      // 关闭时清理 observer
+      clearTimeout(timer);
       (_contentObserverRef$c = contentObserverRef.current) === null || _contentObserverRef$c === void 0 || _contentObserverRef$c.disconnect();
+    };
+    if (!open) {
+      cleanup();
       return;
     }
+    timer = setTimeout(function () {
+      if (height) {
+        var _modalContentRef$curr, _rndRef$current;
+        var contentRect = (_modalContentRef$curr = modalContentRef.current) === null || _modalContentRef$curr === void 0 ? void 0 : _modalContentRef$curr.getBoundingClientRect();
+        if (!contentRect) return;
+        (_rndRef$current = rndRef.current) === null || _rndRef$current === void 0 || _rndRef$current.updateSize({
+          width: formatSize(width, contentRect.width),
+          height: formatSize(height, contentRect.height)
+        });
+        return;
+      }
+      if (!modalContentRef.current || !rndRef.current || !modalBodyRef.current) return;
 
-    // 等待 Modal 渲染完成
-    var timer = setTimeout(function () {
-      var modalContent = document.querySelector('.ant-modal-content');
-      if (!modalContent || !rndRef.current) return;
-      modalContentRef.current = modalContent;
-
-      // 初始化同步尺寸
+      // Initialize size synchronization
       syncSizeIfNeeded();
 
-      // 设置 ResizeObserver 监听内容区域尺寸变化
-      contentObserverRef.current = new ResizeObserver(function () {
-        syncSizeIfNeeded();
-      });
-      contentObserverRef.current.observe(modalContent);
+      // Set up ResizeObserver for content area
+      contentObserverRef.current = new ResizeObserver(syncSizeIfNeeded);
+      contentObserverRef.current.observe(modalBodyRef.current);
     }, 0);
-    return function () {
-      var _contentObserverRef$c2;
-      clearTimeout(timer);
-      (_contentObserverRef$c2 = contentObserverRef.current) === null || _contentObserverRef$c2 === void 0 || _contentObserverRef$c2.disconnect();
-    };
-  }, [open]);
+    return cleanup;
+  }, [open, height, width]);
+
+  // Helper function to format size values
+  var formatSize = function formatSize(size, defaultSize) {
+    if (typeof size === 'string') return size;
+    if (typeof size === 'number') return "".concat(size, "px");
+    return defaultSize;
+  };
 
-  // 同步尺寸的逻辑
+  // Optimized size synchronization logic
   var syncSizeIfNeeded = function syncSizeIfNeeded() {
     if (!rndRef.current || !modalContentRef.current) return;
     var rndElement = rndRef.current.getSelfElement();
     var contentRect = modalContentRef.current.getBoundingClientRect();
-
-    // 检查 Rnd 是否已经设置了显式的 width/height 样式
+    var bodyRect = modalBodyRef.current;
+    var documentRect = document.body.getBoundingClientRect();
     var hasExplicitWidth = rndElement.style.width !== '';
     var hasExplicitHeight = rndElement.style.height !== '';
-
-    // 如果没有设置，则同步尺寸
-    if (!hasExplicitWidth || !hasExplicitHeight) {
-      var updates = {
-        width: !hasExplicitWidth ? Math.ceil(contentRect.width) : undefined,
-        height: !hasExplicitHeight ? Math.ceil(contentRect.height) : undefined
+    var rndElementWidth = Number(rndElement.style.width.split('px')[0]);
+    var rndElementHeight = Number(rndElement.style.height.split('px')[0]);
+    var needsSync = !hasExplicitWidth || !hasExplicitHeight;
+    var maxHeight = documentRect.height - contentRect.top - 24;
+    if (needsSync) {
+      rndRef.current.updateSize({
+        width: width || !hasExplicitWidth ? Math.ceil(contentRect.width) : undefined,
+        height: !hasExplicitHeight ? Math.min(Math.ceil(contentRect.height), maxHeight) : undefined
+      });
+      modalBodySizeRef.current = {
+        width: bodyRect.scrollWidth,
+        height: bodyRect.scrollHeight
       };
-      rndRef.current.updateSize(updates);
+      return;
+    }
+    if (!hasResized.current && modalBodySizeRef.current) {
+      var widthDiff = Math.abs(modalBodySizeRef.current.width - bodyRect.scrollWidth);
+      var heightDiff = Math.abs(modalBodySizeRef.current.height - bodyRect.scrollHeight);
+      var significantChange = widthDiff > 5 || heightDiff > 5;
+      if (significantChange) {
+        var delta = {
+          width: bodyRect.scrollWidth - modalBodySizeRef.current.width,
+          height: bodyRect.scrollHeight - modalBodySizeRef.current.height
+        };
+        rndRef.current.updateSize({
+          width: width || Math.ceil(rndElementWidth + delta.width),
+          height: Math.min(Math.ceil(rndElementHeight + delta.height), maxHeight)
+        });
+        modalBodySizeRef.current = {
+          width: bodyRect.scrollWidth,
+          height: bodyRect.scrollHeight
+        };
+      }
     }
   };
   var adjustResize = function adjustResize(e, direction, ref, delta, position) {
     var _ref$querySelector, _ref$style$height, _ref$style$width;
+    hasResized.current = true;
     var modalContent = (_ref$querySelector = ref.querySelector('.ant-modal-content')) === null || _ref$querySelector === void 0 ? void 0 : _ref$querySelector.getBoundingClientRect();
     var modalContentHeight = Math.ceil(modalContent.height);
     var modalContentWidth = Math.ceil(modalContent.width);
@@ -144,7 +179,7 @@ var CenterModal = function CenterModal(_ref) {
     }
   };
   return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
-    className: "centerModal".concat(size),
+    className: "centerModalContainer centerModal".concat(size),
     wrapClassName: 'wrapClassName',
     title: /*#__PURE__*/_jsx("div", {
       className: "modal-header ".concat(dragHandleClassName),
@@ -196,16 +231,26 @@ var CenterModal = function CenterModal(_ref) {
           overflow: 'hidden' // 添加overflow隐藏
         },
         minWidth: minResizeWidth,
-        minHeight: minResizeHeight
-        // maxWidth={maxResizeWidth}
-        // maxHeight={maxResizeHeight}
-        ,
-        children: modal
+        minHeight: minResizeHeight,
+        maxWidth: maxResizeWidth,
+        maxHeight: maxResizeHeight,
+        children: /*#__PURE__*/_jsx("div", {
+          ref: modalContentRef,
+          className: "custom-modal-content",
+          style: {
+            height: '100%'
+          },
+          children: modal
+        })
       });
     }
   }, rest), {}, {
     children: /*#__PURE__*/_jsx("div", {
       ref: modalBodyRef,
+      className: "custom-modal-body",
+      style: {
+        height: height ? '100%' : 'fit-content'
+      },
       children: renderContent || /*#__PURE__*/_jsx("div", {
         className: "gantt-leftbar-defalutItem"
       })

package/dist/components/CenterModal/index.less

@@ -1,4 +1,6 @@
-.centerModal {
+
+
+.centerModalContainer {
   .resizeHandles div {
     pointer-events: auto;
     z-index: 1002;
@@ -18,6 +20,10 @@
 
   .react-draggable {
     position: relative !important;
+
+    .custom-modal-body {
+      height: fit-content;
+    }
   }
 
   .resizeHandleBottomLeft, .resizeHandleBottomRight, .resizeHandleTopLeft, .resizeHandleTopRight {

package/dist/components/CenterModal/type.d.ts

@@ -27,6 +27,7 @@ export interface CenterModalPropsType extends ModalProps {
     minResizeHeight?: string | number;
     maxResizeWidth?: string | number;
     maxResizeHeight?: string | number;
+    height?: string | number;
 }
 export type ModalSizeType = {
     width: number | string;

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/package.json

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