@arim-aisdc/public-components 2.3.18 → 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.js

@@ -12,6 +12,16 @@ import React, { useEffect, useMemo, useRef } from 'react';
 import { Rnd } from 'react-rnd';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
+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,
@@ -73,6 +83,7 @@ var CenterModal = function CenterModal(_ref) {
   }, [modalBodyRef.current]);
   return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
     className: "centerModal".concat(size),
+    wrapClassName: 'wrapClassName',
     title: /*#__PURE__*/_jsx("div", {
       className: "modal-header ".concat(dragHandleClassName),
       style: {
@@ -107,6 +118,7 @@ var CenterModal = function CenterModal(_ref) {
         enableResizing: enableResizing,
         disableDragging: !enableDragging,
         resizeHandleWrapperClass: "resizeHandles",
+        resizeHandleClasses: resizeHandleClasses,
         dragHandleClassName: dragHandleClassName,
         default: {
           x: 0,
@@ -114,6 +126,16 @@ var CenterModal = function CenterModal(_ref) {
           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',

package/dist/components/CenterModal/index.less

@@ -1,86 +1,9 @@
-.custom-light-modal {
-  top: 0 !important;
-  left: 0 !important;
-  height: 'none' !important;
-}
-
-.ant-design-draggable-modal-resize-handle {
-  display: none;
-
-  .ant-design-draggable-modal .ant-design-draggable-modal-title {
-    padding: 0;
-  }
-}
-
-.centerModal {
-  .ant-modal-content {
-    resize: none; /* disable default resize */
-    overflow: hidden;
-  }
-}
-
-.resize-handle {
-  opacity: 0.6;
-  transition: opacity 0.2s;
-  
-  &:hover {
-    opacity: 1;
-    border-color: #40a9ff;
-  }
-}
-
-.is-resizing .resize-handle {
-  opacity: 1;
-  border-color: #096dd9 !important;
-}
-
-
-
 .centerModal {
-  .react-resizable {
-    position: absolute !important;
-  }
-
-  .react-rnd {
-    border: 1px solid #d9d9d9;
-    border-radius: 6px;
-    overflow: hidden;
-    background: #fff;
-    box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 
-                0 6px 16px 0 rgba(0, 0, 0, 0.08),
-                0 9px 28px 8px rgba(0, 0, 0, 0.05);
-  }
-
-  .resize-handle {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    width: 16px;
-    height: 16px;
-    cursor: nwse-resize;
-    background: transparent;
-    border-right: 2px solid #1890ff;
-    border-bottom: 2px solid #1890ff;
-    z-index: 1001;
-    opacity: 0.7;
-    transition: opacity 0.2s;
-
-    &:hover {
-      opacity: 1;
-      border-color: #40a9ff;
-    }
-  }
-
-  .ant-modal-body {
-    padding: 0 !important;
-  }
-
   .resizeHandles div {
     pointer-events: auto;
     z-index: 1002;
   }
 
-
   .ant-modal-content {
     display: flex;
     flex-direction: column;
@@ -94,8 +17,17 @@
   .react-draggable {
     position: relative !important;
   }
-}
 
-  .react-draggable {
-    position: relative;
-  }
+  .resizeHandleBottomLeft, .resizeHandleBottomRight, .resizeHandleTopLeft, .resizeHandleTopRight {
+    width: 40px !important;
+    height: 40px !important;
+  }
+
+  // .resizeHandleLeft, .resizeHandleRight {
+  //   width: 20px !important;
+  // }
+
+  // .resizeHandleTop, .resizeHandleBottom {
+  //   height: 20px !important;
+  // }
+}

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.18",
+  "version": "2.3.19",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",