@arim-aisdc/public-components 2.3.17 → 2.3.19

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/CenterModal/CenterModal.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import './index.less';
 import { CenterModalPropsType } from './type';
-declare const _default: React.NamedExoticComponent<CenterModalPropsType>;
-export default _default;
+declare const CenterModal: React.FC<CenterModalPropsType>;
+export default CenterModal;

package/dist/components/CenterModal/CenterModal.js

@@ -1,25 +1,27 @@
 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"];
+var _excluded = ["open", "title", "okText", "hasfooter", "footer", "width", "size", "renderContent", "handleConfirm", "handleCancel", "confirmLoading", "maskClosable", "bodyStyle", "afterClose", "enableResizing", "enableDragging", "minResizeWidth", "minResizeHeight"];
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Modal } from 'antd';
-import React, { useRef, useState } from 'react';
-import Draggable from 'react-draggable';
+import React, { useEffect, useMemo, useRef } from 'react';
+import { Rnd } from 'react-rnd';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-// import 'ant-design-draggable-modal/dist/index.css';
-
+var resizeHandleClasses = {
+  bottom: "resizeHandleBottom",
+  bottomLeft: "resizeHandleBottomLeft",
+  bottomRight: "resizeHandleBottomRight",
+  left: "resizeHandleLeft",
+  right: "resizeHandleRight",
+  top: "resizeHandleTop",
+  topLeft: "resizeHandleTopLeft",
+  topRight: "resizeHandleTopRight"
+};
 var CenterModal = function CenterModal(_ref) {
   var _ref$open = _ref.open,
     open = _ref$open === void 0 ? false : _ref$open,
@@ -43,114 +45,114 @@ var CenterModal = function CenterModal(_ref) {
     _ref$bodyStyle = _ref.bodyStyle,
     bodyStyle = _ref$bodyStyle === void 0 ? {
       position: 'relative'
-      // padding: '24px 32px',
     } : _ref$bodyStyle,
     afterClose = _ref.afterClose,
+    _ref$enableResizing = _ref.enableResizing,
+    enableResizing = _ref$enableResizing === void 0 ? true : _ref$enableResizing,
+    _ref$enableDragging = _ref.enableDragging,
+    enableDragging = _ref$enableDragging === void 0 ? true : _ref$enableDragging,
+    _ref$minResizeWidth = _ref.minResizeWidth,
+    minResizeWidth = _ref$minResizeWidth === void 0 ? 200 : _ref$minResizeWidth,
+    _ref$minResizeHeight = _ref.minResizeHeight,
+    minResizeHeight = _ref$minResizeHeight === void 0 ? 200 : _ref$minResizeHeight,
     rest = _objectWithoutProperties(_ref, _excluded);
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    disabled = _useState2[0],
-    setDisabled = _useState2[1];
-  var _useState3 = useState({
-      left: 0,
-      top: 0,
-      bottom: 0,
-      right: 0
-    }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    bounds = _useState4[0],
-    setBounds = _useState4[1];
-  var draggleRef = useRef(null);
-  var domList = document.querySelectorAll('.modal-header');
-  var id = 'modal-header';
-  if ((domList === null || domList === void 0 ? void 0 : domList.length) > 0) {
-    id = "modal-header-".concat(domList === null || domList === void 0 ? void 0 : domList.length);
-  }
-  var _onStart = function onStart(event, uiData) {
-    var _window, _draggleRef$current;
-    // eslint-disable-next-line no-unsafe-optional-chaining
-    var _window$document$docu = (_window = window) === null || _window === void 0 || (_window = _window.document) === null || _window === void 0 ? void 0 : _window.documentElement,
-      clientWidth = _window$document$docu.clientWidth,
-      clientHeight = _window$document$docu.clientHeight;
-    var modalHeader = document.getElementById(id);
-    var targetRect = draggleRef === null || draggleRef === void 0 || (_draggleRef$current = draggleRef.current) === null || _draggleRef$current === void 0 ? void 0 : _draggleRef$current.getBoundingClientRect();
-    console.log(modalHeader, event.target);
-    if (modalHeader && !modalHeader.contains(event.target)) {
-      setBounds({
-        left: 0,
-        right: 0,
-        top: 0,
-        bottom: 0
-      });
-      return;
+  var modalRef = useRef(null);
+  var modalBodyRef = useRef(null);
+  var startSizeRef = useRef();
+  var titleElementRef = useRef();
+  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;
+    }
+  }, []);
+  useEffect(function () {
+    var modal = modalBodyRef.current;
+    if (modal) {
+      var rect = modal.getBoundingClientRect();
+      console.log('rect', rect.width, rect.height);
+      startSizeRef.current = {
+        width: rect.width,
+        height: rect.height
+      };
     }
-    setBounds({
-      left: -(targetRect === null || targetRect === void 0 ? void 0 : targetRect.left) + (uiData === null || uiData === void 0 ? void 0 : uiData.x),
-      right: clientWidth - ((targetRect === null || targetRect === void 0 ? void 0 : targetRect.right) - (uiData === null || uiData === void 0 ? void 0 : uiData.x)),
-      top: -(targetRect === null || targetRect === void 0 ? void 0 : targetRect.top) + (uiData === null || uiData === void 0 ? void 0 : uiData.y),
-      bottom: clientHeight - ((targetRect === null || targetRect === void 0 ? void 0 : targetRect.bottom) - (uiData === null || uiData === void 0 ? void 0 : uiData.y))
-    });
-  };
+  }, [modalBodyRef.current]);
   return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
     className: "centerModal".concat(size),
+    wrapClassName: 'wrapClassName',
     title: /*#__PURE__*/_jsx("div", {
-      id: id,
-      className: "modal-header",
+      className: "modal-header ".concat(dragHandleClassName),
       style: {
         width: '100%',
         cursor: 'move'
       },
-      onMouseOver: function onMouseOver() {
-        if (disabled) {
-          setDisabled(false);
-        }
-      },
-      onMouseOut: function onMouseOut() {
-        setDisabled(false);
-      }
-      // fix eslintjsx-a11y/mouse-events-have-key-events
-      // https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/docs/rules/mouse-events-have-key-events.md
-      ,
-      onFocus: function onFocus() {},
-      onBlur: function onBlur() {}
-      // end
-      ,
       children: title
     }),
     open: open,
-    width: width,
-    maskClosable: maskClosable,
     onOk: handleConfirm,
     onCancel: handleCancel,
     okText: okText,
     footer: hasfooter ? footer : null,
-    centered: true,
+    centered: false,
     closeIcon: /*#__PURE__*/_jsx("i", {
-      className: "iconfont-other icon-other-close"
+      className: "iconfont-other icon-other-close",
+      children: " "
     }),
     destroyOnClose: true,
     confirmLoading: confirmLoading,
+    maskClosable: maskClosable,
+    afterClose: afterClose,
     styles: {
-      body: bodyStyle
+      body: _objectSpread(_objectSpread({}, bodyStyle), {}, {
+        overflow: 'auto'
+      })
     },
-    afterClose: afterClose,
+    width: width,
     modalRender: function modalRender(modal) {
-      return /*#__PURE__*/_jsx(Draggable, {
-        disabled: disabled,
-        bounds: bounds,
-        handle: "#".concat(id),
-        onStart: function onStart(event, uiData) {
-          return _onStart(event, uiData);
+      return /*#__PURE__*/_jsx(Rnd, {
+        ref: modalRef,
+        enableResizing: enableResizing,
+        disableDragging: !enableDragging,
+        resizeHandleWrapperClass: "resizeHandles",
+        resizeHandleClasses: resizeHandleClasses,
+        dragHandleClassName: dragHandleClassName,
+        default: {
+          x: 0,
+          y: 0,
+          width: 'fit-content',
+          height: 'fit-content'
+        },
+        onResizeStop: function onResizeStop(e, direction, ref, delta, position) {
+          var _ref$querySelector;
+          if (direction === 'left' || direction === 'right') return;
+          var modalContent = (_ref$querySelector = ref.querySelector('.ant-modal-content')) === null || _ref$querySelector === void 0 ? void 0 : _ref$querySelector.getBoundingClientRect();
+          var resizeContent = ref === null || ref === void 0 ? void 0 : ref.getBoundingClientRect();
+          var height = modalContent.height;
+          if (modalContent.height !== resizeContent.height) {
+            ref.style.height = height + "px";
+          }
+        },
+        style: {
+          display: 'flex',
+          flexDirection: 'column',
+          overflow: 'hidden' // 添加overflow隐藏
         },
-        children: /*#__PURE__*/_jsx("div", {
-          children: modal
-        })
+        minWidth: minResizeWidth,
+        minHeight: minResizeHeight,
+        children: modal
       });
     }
   }, rest), {}, {
-    children: renderContent ? renderContent : /*#__PURE__*/_jsx("div", {
-      className: "gantt-leftbar-defalutItem"
+    children: /*#__PURE__*/_jsx("div", {
+      ref: modalBodyRef,
+      children: renderContent || /*#__PURE__*/_jsx("div", {
+        className: "gantt-leftbar-defalutItem"
+      })
     })
   }));
 };
-export default /*#__PURE__*/React.memo(CenterModal);
+export default CenterModal;

package/dist/components/CenterModal/index.less

@@ -1,13 +1,33 @@
-.custom-light-modal {
-  top: 0 !important;
-  left: 0 !important;
-  height: 'none' !important;
-}
+.centerModal {
+  .resizeHandles div {
+    pointer-events: auto;
+    z-index: 1002;
+  }
+
+  .ant-modal-content {
+    display: flex;
+    flex-direction: column;
+
+    .ant-modal-body {
+      flex: 1;
+      overflow: auto;
+    }
+  }
 
-.ant-design-draggable-modal-resize-handle {
-  display: none;
+  .react-draggable {
+    position: relative !important;
+  }
 
-  .ant-design-draggable-modal .ant-design-draggable-modal-title {
-    padding: 0;
+  .resizeHandleBottomLeft, .resizeHandleBottomRight, .resizeHandleTopLeft, .resizeHandleTopRight {
+    width: 40px !important;
+    height: 40px !important;
   }
+
+  // .resizeHandleLeft, .resizeHandleRight {
+  //   width: 20px !important;
+  // }
+
+  // .resizeHandleTop, .resizeHandleBottom {
+  //   height: 20px !important;
+  // }
 }

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

@@ -21,4 +21,12 @@ export interface CenterModalPropsType extends ModalProps {
     confirmLoading?: boolean;
     bodyStyle?: object;
     afterClose?: () => void;
+    enableResizing?: boolean;
+    enableDragging?: boolean;
+    minResizeWidth?: string | number;
+    minResizeHeight?: string | number;
 }
+export type ModalSizeType = {
+    width: number | string;
+    height: number | string;
+};

package/dist/components/CustomForm/CustomForm.js

@@ -689,7 +689,11 @@ var CustomForm = function CustomForm(_ref, ref) {
           xl: 12,
           xxl: 24
         },
-        className: "customFormRow"
+        className: "customFormRow",
+        style: {
+          marginLeft: 0,
+          marginRight: 0
+        }
         // justify="space-between"
         ,
         children: [data.map(function (item, index) {

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 copy.d.ts

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