@arim-aisdc/public-components 2.3.67 → 2.3.68

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

@@ -477,10 +477,10 @@ var OriginalRow = function OriginalRow(_ref) {
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [!!getRowHoverTipConfig ? /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({}, tooltipConfig), {}, {
       onOpenChange: onOpenChange,
-      destroyTooltipOnHide: {
-        keepParent: false
+      destroyOnHidden: false,
+      classNames: {
+        root: 'table-max-row-tooltip-wrapper'
       },
-      overlayClassName: "table-max-row-tooltip-wrapper",
       getPopupContainer: function getPopupContainer() {
         return tableBodyRef.current || document.body;
       },

package/dist/components/TableMax/TableMax.js

@@ -39,6 +39,7 @@ import { downloadExcel, getFormatFilters, getFormatFiltersV2, getFormatSorting,
 import { useTableScrollShadow } from "./hooks/useTableScrollShadow";
 import { ExportTableData } from "./components/Export";
 import UnifiedTable from "./UnifiedTable";
+import { useHoverDetection } from "./hooks/useHoverDetection";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var ColumnType = /*#__PURE__*/function (ColumnType) {
@@ -415,6 +416,7 @@ var TableMax = function TableMax(_ref) {
       });
     }
   };
+  console.log(tableDatas, 'tableDatas');
 
   // table
   var table = useReactTable({
@@ -1062,6 +1064,7 @@ var TableMax = function TableMax(_ref) {
     getDynamicFilterOptionsFn: getDynamicFilterOptionsFn,
     tableHeaderRef: tableHeaderRef
   };
+  console.log(table.getRowModel().rows, 'table.getRowModel().rows');
   var tableBodyProps = {
     tableContentRef: tableContentRef,
     tableBodyRef: tableBodyRef,
@@ -1130,6 +1133,19 @@ var TableMax = function TableMax(_ref) {
     setCompactMode(compactMode);
     setRowHeight(newHeight);
   };
+
+  // 在你的组件中使用
+  // const tableBodyRef = useRef(null);
+  var isHovered = useHoverDetection(tableBodyRef);
+  useEffect(function () {
+    if (tableBodyRef.current) {
+      if (isHovered) {
+        tableBodyRef.current.classList.add('hover-active');
+      } else {
+        tableBodyRef.current.classList.remove('hover-active');
+      }
+    }
+  }, [isHovered]);
   return /*#__PURE__*/_jsx(Form, {
     form: form,
     component: false,
@@ -1304,17 +1320,17 @@ var TableMax = function TableMax(_ref) {
             className: "table-body",
             style: {
               width: "100%"
-            },
-            onMouseEnter: function onMouseEnter() {
-              var _tableBodyRef$current;
-              // 给当前元素添加hover类
-              (_tableBodyRef$current = tableBodyRef.current) === null || _tableBodyRef$current === void 0 || _tableBodyRef$current.classList.add('hover-active');
-            },
-            onMouseLeave: function onMouseLeave() {
-              var _tableBodyRef$current2;
-              // 移除当前元素的hover类
-              (_tableBodyRef$current2 = tableBodyRef.current) === null || _tableBodyRef$current2 === void 0 || _tableBodyRef$current2.classList.remove('hover-active');
-            },
+            }
+            // onMouseEnter={() => {
+            //   // 给当前元素添加hover类
+            //   tableBodyRef.current?.classList.add('hover-active');
+
+            // }}
+            // onMouseLeave={() => {
+            //   // 移除当前元素的hover类
+            //   tableBodyRef.current?.classList.remove('hover-active');
+            // }}
+            ,
             children: /*#__PURE__*/_jsx(UnifiedTable, {
               tableId: tableId,
               table: table,

package/dist/components/TableMax/components/ColumnFilterV2/MultipleSelect/index.js

@@ -50,7 +50,9 @@ var MultipleSelect = function MultipleSelect(_ref) {
     frontendOptions = _useState6[0],
     setFrontendOptions = _useState6[1];
   var checkAll = options.length === innerValue.length;
-  var indeterminate = innerValue.length > 0 && innerValue.length < options.length;
+  var indeterminate = useMemo(function () {
+    return innerValue.length > 0 && innerValue.length < options.length && JSON.stringify(innerValue) !== '["NULL"]';
+  }, [innerValue]);
   var handleCheckBoxChange = function handleCheckBoxChange(changedValue) {
     console.log('changedValue :>> ', changedValue);
     setInnerValue(changedValue);
@@ -146,6 +148,18 @@ var MultipleSelect = function MultipleSelect(_ref) {
         children: /*#__PURE__*/_jsx(Spin, {})
       }) : /*#__PURE__*/_jsxs(_Fragment, {
         children: [/*#__PURE__*/_jsx(Checkbox, {
+          checked: JSON.stringify(innerValue) === '["NULL"]',
+          onChange: function onChange(e) {
+            var _e$target;
+            console.log(innerValue);
+            if (e !== null && e !== void 0 && (_e$target = e.target) !== null && _e$target !== void 0 && _e$target.checked) {
+              setInnerValue(['NULL']);
+            } else {
+              setInnerValue([]);
+            }
+          },
+          children: "NULL"
+        }), /*#__PURE__*/_jsx("br", {}), /*#__PURE__*/_jsx(Checkbox, {
           indeterminate: indeterminate,
           onChange: onCheckAllChange,
           checked: checkAll,

package/dist/components/TableMax/components/ColumnFilterV2/SingleSelect/index.js

@@ -80,14 +80,21 @@ var SingleSelect = function SingleSelect(_ref) {
     if (isEmpty(value) || isEmpty(value === null || value === void 0 ? void 0 : value.filterValue) || Array.isArray(options) && options.length === 0 || !isFirstScroll.current) return;
     // 滚动到选中的项目
     function scrollToSelectedItem() {
-      var selectedElement = document.querySelector(".item[data-id=".concat(value.filterValue, "]"));
-      if (!selectedElement) return;
-      if (selectedElement) {
-        selectedElement.scrollIntoView({
-          behavior: 'smooth',
-          block: 'center'
-        });
+      // 确保 value.filterValue 存在且不是 undefined/null
+      if ((value === null || value === void 0 ? void 0 : value.filterValue) == null) return;
+
+      // 转换为字符串并转义特殊字符
+      var id = String(value.filterValue);
+      var selector = ".item[data-id=\"".concat(CSS.escape(id), "\"]");
+      var selectedElement = document.querySelector(selector);
+      if (!selectedElement) {
+        console.warn("Element with data-id=\"".concat(id, "\" not found"));
+        return;
       }
+      selectedElement.scrollIntoView({
+        behavior: 'smooth',
+        block: 'center'
+      });
     }
     var timer = setTimeout(function () {
       return scrollToSelectedItem();
@@ -99,16 +106,26 @@ var SingleSelect = function SingleSelect(_ref) {
 
   // 最终的可选值
   var finalOptions = useMemo(function () {
+    var nullValueOptions = [{
+      label: 'NULL',
+      value: 'NULL',
+      children: []
+    }, {
+      label: 'NOT NULL',
+      value: 'NOT NULL',
+      children: []
+    }].concat(options);
     if (!isFrontSearch) {
-      return options;
+      return nullValueOptions;
     }
     var input = (inputSearchValue !== null && inputSearchValue !== void 0 ? inputSearchValue : '').toUpperCase().trim();
-    return options.filter(function (option) {
+    return nullValueOptions.filter(function (option) {
       var _option$label;
-      var optionFilterString = ('' + ((_option$label = option.label) !== null && _option$label !== void 0 ? _option$label : option.children)).toUpperCase().trim();
+      var optionFilterString = ('' + ((_option$label = option.label) !== null && _option$label !== void 0 ? _option$label : option === null || option === void 0 ? void 0 : option.children)).toUpperCase().trim();
       return optionFilterString.indexOf(input) !== -1;
     });
   }, [options, inputSearchValue]);
+  console.log(finalOptions, 'finalOptions');
   return /*#__PURE__*/_jsxs("div", {
     className: "tableMax-filter-singleSelect",
     children: [/*#__PURE__*/_jsx("div", {

package/dist/components/TableMax/components/ColumnFilterV2/customFilterFns.js

@@ -12,6 +12,16 @@ var fuzzyFilter = function fuzzyFilter(row, columnId, filterValue) {
   var filterStringValue = (filterValue !== null && filterValue !== void 0 ? filterValue : '') + '';
   var rowStringValue = ((_row$getValue = row.getValue(columnId)) !== null && _row$getValue !== void 0 ? _row$getValue : '') + '';
   // console.log('object :>> ', rowStringValue, filterStringValue);
+  // 处理 null 搜索
+  var filterUpper = filterStringValue.toUpperCase().trim();
+  if (filterUpper === 'NULL') {
+    return rowStringValue === ''; // 空值包括 null, undefined, 空字符串等
+  }
+
+  // 处理 not null 搜索
+  if (filterUpper === 'NOT NULL' || filterUpper === 'NOTNULL') {
+    return rowStringValue !== ''; // 非空值
+  }
   return rowStringValue.toUpperCase().indexOf(filterStringValue.toUpperCase().trim()) !== -1;
 };
 
@@ -22,14 +32,27 @@ var singleSelectFilter = function singleSelectFilter(row, columnId, filterValue)
   var filterStringValue = (value !== null && value !== void 0 ? value : '') + '';
   var rowStringValue = ((_row$getValue2 = row.getValue(columnId)) !== null && _row$getValue2 !== void 0 ? _row$getValue2 : '') + '';
   // console.log('object :>> ', rowStringValue, filterStringValue);
+  var filterUpper = filterStringValue.toUpperCase().trim();
+  if (filterUpper === 'NULL') {
+    return rowStringValue === ''; // 空值包括 null, undefined, 空字符串等
+  }
+
+  // 处理 not null 搜索
+  if (filterUpper === 'NOT NULL') {
+    return rowStringValue !== ''; // 非空值
+  }
   return rowStringValue.toUpperCase().indexOf(filterStringValue.toUpperCase().trim()) !== -1;
 };
 
 // 多选筛选
 var multiSelectFilter = function multiSelectFilter(row, columnId, filterValue) {
+  var _row$getValue3;
   var value = filterValue.filterValue;
-  var rowValue = row.getValue(columnId);
-  return value === null || value === void 0 ? void 0 : value.includes(rowValue + '');
+  var rowStringValue = ((_row$getValue3 = row.getValue(columnId)) !== null && _row$getValue3 !== void 0 ? _row$getValue3 : '') + '';
+  if (JSON.stringify(value) === '["NULL"]') {
+    return rowStringValue === ''; // 空值包括 null, undefined, 空字符串等
+  }
+  return value === null || value === void 0 ? void 0 : value.includes(rowStringValue + '');
 };
 
 // 数字范围筛选

package/dist/components/TableMax/hooks/useColumnWidth.js

@@ -19,7 +19,7 @@ import { getSizeInfo } from "../utils";
 var DEFAULT_MIN_SIZE = 120;
 var DEFAULT_MAX_SIZE = 2000;
 var DEFAULT_RESIZE_DEBOUNCE = 200;
-var DEFAULT_TABLE_PADDING = 10;
+var DEFAULT_TABLE_PADDING = 12;
 // const DEFAULT_TABLE_PADDING = 0;
 
 /**
@@ -163,7 +163,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
    */
   var calculateColumnSizing = useCallback(function (columnsSizeMap, allColumnCount, containerWidth) {
     var currentWidth = containerWidth || state.tableContainerWidth || getTableWidth();
-    console.log(containerWidth, tableContentRef.current.clientWidth, state.tableContainerWidth, getTableWidth());
     if (!currentWidth) return columnsSizeMap;
     var result = _objectSpread({}, columnsSizeMap);
     var adjustableColumns = getAdjustableColumns(result);
@@ -198,18 +197,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
         result[key] = Math.min(result[key] + averageExtra, DEFAULT_MAX_SIZE);
       });
     }
-
-    // console.log({
-    //   currentWidth,
-    //   columnsSizeMap,
-    //   adjustableColumns,
-    //   hasWidthColumns,
-    //   noWidthColumns,
-    //   totalWidth,
-    //   remainWidth,
-    //   result
-    // }, 'hasWidthColumns')
-
     return result;
   }, [getAdjustableColumns, getTableWidth, state.tableContainerWidth]);
 
@@ -262,16 +249,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
           });
         }
 
-        // console.log({
-        //   prevState,
-        //   initColumnsSizeMap,
-        //   visibleColumnsSizeMap,
-        //   cache,
-        //   cacheMaxAge,
-        //   tableContentRef: tableContentRef.current
-
-        // }, 'columnSizeMap123')
-
         // 计算可见列数
         var visibleCount = allCount - Object.keys(columnVisibleConfig).filter(function (key) {
           return !columnVisibleConfig[key];

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

@@ -0,0 +1 @@
+export declare const useHoverDetection: (ref: any) => boolean;

package/dist/components/TableMax/hooks/useHoverDetection.js

@@ -0,0 +1,69 @@
+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; }
+import { useEffect, useState } from "react";
+
+// useHoverDetection.js
+export var useHoverDetection = function useHoverDetection(ref) {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isHovered = _useState2[0],
+    setIsHovered = _useState2[1];
+  useEffect(function () {
+    var element = ref.current;
+    if (!element) return;
+    var isInside = false;
+    var timeoutId = null;
+    var handleMouseEnter = function handleMouseEnter() {
+      clearTimeout(timeoutId);
+      if (!isInside) {
+        isInside = true;
+        setIsHovered(true);
+      }
+    };
+    var handleMouseLeave = function handleMouseLeave() {
+      timeoutId = setTimeout(function () {
+        isInside = false;
+        setIsHovered(false);
+      }, 100); // 防抖延迟
+    };
+
+    // 使用 document 级别的监听，避免事件冒泡问题
+    var handleDocumentMouseMove = function handleDocumentMouseMove(e) {
+      if (!element) return;
+      var rect = element.getBoundingClientRect();
+      var isMouseInside = e.clientX >= rect.left && e.clientX <= rect.right && e.clientY >= rect.top && e.clientY <= rect.bottom;
+      if (isMouseInside && !isInside) {
+        handleMouseEnter();
+      } else if (!isMouseInside && isInside) {
+        handleMouseLeave();
+      }
+    };
+
+    // 初始检查
+    var handleInitialCheck = function handleInitialCheck() {
+      // 触发一次鼠标移动检查
+      document.dispatchEvent(new MouseEvent('mousemove'));
+    };
+    document.addEventListener('mousemove', handleDocumentMouseMove);
+    window.addEventListener('load', handleInitialCheck);
+
+    // 页面显示时重新检查
+    var handleVisibilityChange = function handleVisibilityChange() {
+      if (!document.hidden) {
+        setTimeout(handleInitialCheck, 100);
+      }
+    };
+    document.addEventListener('visibilitychange', handleVisibilityChange);
+    return function () {
+      document.removeEventListener('mousemove', handleDocumentMouseMove);
+      window.removeEventListener('load', handleInitialCheck);
+      document.removeEventListener('visibilitychange', handleVisibilityChange);
+      clearTimeout(timeoutId);
+    };
+  }, [ref]);
+  return isHovered;
+};

package/dist/components/TableMax/utils.js

@@ -197,15 +197,20 @@ export var getFormatFiltersV2 = function getFormatFiltersV2(columns, originFilte
       }
     } else if (filterType === FilterType.MultiSelect || !filterType) {
       // 多选组件
-      res.operator = FilterOperator.In;
       res.value = value.filterValue;
+      res.operator = JSON.stringify(res.value) === '["NULL"]' ? FilterOperator.IsNull : FilterOperator.In;
     } else if (filterType === FilterType.Input || filterType === FilterType.AutoComplete) {
+      var _value$toUpperCase;
       // Input组件
-      res.value = splitString(value);
-      res.operator = typeof res.value === 'string' ? FilterOperator.Contains : FilterOperator.In;
+      var upperValue = value === null || value === void 0 || (_value$toUpperCase = value.toUpperCase()) === null || _value$toUpperCase === void 0 ? void 0 : _value$toUpperCase.trim();
+      res.value = splitString(value + '');
+      res.operator = upperValue === 'NULL' ? FilterOperator.IsNull : upperValue === 'NOT NULL' || upperValue === 'NOTNULL' ? FilterOperator.IsNotNull : typeof res.value === 'string' ? FilterOperator.Contains : FilterOperator.In;
     } else if (filterType === FilterType.SingleSelect) {
-      res.operator = FilterOperator.Eq;
+      var _res$value;
+      // 单选组件
       res.value = value.filterValue;
+      var _upperValue = typeof res.value === 'string' ? (_res$value = res.value) === null || _res$value === void 0 ? void 0 : _res$value.toUpperCase() : res.value;
+      res.operator = _upperValue === 'NULL' ? FilterOperator.IsNull : _upperValue === 'NOT NULL' ? FilterOperator.IsNotNull : FilterOperator.Eq;
     } else {
       // 其他组件: SingleDate/SingleNumber
       res.operator = FilterOperator.Eq;

package/dist/themes/variablesConfig.js

@@ -141,7 +141,7 @@ export var PublicThemeVariablesConfig = {
     '--global-messageTip-background-color': '#0c1b3b',
     '--global-messageTip-text-color': '#eaeaea',
     '--global-messageTip-box-shadow': '0px 5px 12px 4px rgba(3,5,33,0.45)',
-    '--global-sort-flag-color': '#FFFFFF'
+    '--global-sort-flag-color': '#242A30'
   }),
   dark: _objectSpread(_objectSpread({
     '--global-curd-input-background-color': '#494c5dff',

package/package.json

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