@arim-aisdc/public-components 2.3.34 → 2.3.36

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

@@ -328,7 +328,6 @@ var Row = function Row(_ref) {
 
   // 优化：将行渲染逻辑提取为useMemo
   var rowComMemo = useMemo(function () {
-    console.log(row.getIsSelected(), row.renderValue(), 'row.getIsSelected()');
     var renderCell = function renderCell(cell) {
       var _cellClassName;
       var _cell$column$columnDe = cell.column.columnDef,

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

@@ -18,7 +18,7 @@ import { CustomDragLayer } from "../components/CustomDragerLayer";
 // import RowContent from "../components/RowContent";
 import { DropSide } from "../type";
 import { events, useEventBus } from "../../..";
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { useConfig } from "../../ConfigProvider";
 import Empty from "../../Empty";
@@ -181,6 +181,9 @@ var TableBody = function TableBody(_ref) {
       visible: false
     }));
   }, []);
+  useEffect(function () {
+    console.log("emptyTheme-tableMax", theme);
+  }, [theme]);
 
   // useEffect(() => {
   //   if (tbodyRef.current) {
@@ -307,6 +310,7 @@ var TableBody = function TableBody(_ref) {
     _useDrop4 = _slicedToArray(_useDrop3, 2),
     dropTableEmptyRef = _useDrop4[1];
   var LoadingAndEmptyContent = function LoadingAndEmptyContent() {
+    console.log('emptyTheme0');
     return /*#__PURE__*/_jsx("div", {
       className: "empty-container",
       style: {
@@ -485,7 +489,25 @@ var TableBody = function TableBody(_ref) {
             })]
           })]
         })
-      }) : LoadingAndEmptyContent(), /*#__PURE__*/_jsx(ContextMenu, _objectSpread(_objectSpread({}, contextMenuData), {}, {
+      }) : /*#__PURE__*/_jsx("div", {
+        className: "empty-container",
+        style: {
+          width: table.getTotalSize()
+        },
+        children: /*#__PURE__*/_jsx("div", {
+          className: "empty-wrapper",
+          style: {
+            width: "".concat(tableContainerWidth - 10, "px")
+          },
+          children: loading ? /*#__PURE__*/_jsx(Spin, {}) : /*#__PURE__*/_jsx("span", {
+            className: "empty-content",
+            ref: dropEmptyRef,
+            children: /*#__PURE__*/_jsx(Empty, {})
+          })
+        })
+      })
+      // LoadingAndEmptyContent()
+      , /*#__PURE__*/_jsx(ContextMenu, _objectSpread(_objectSpread({}, contextMenuData), {}, {
         onClickContextMenu: onClickContextMenu,
         closeContextMenu: closeContextMenu
       }))]

package/dist/components/TableMax/TableMax.js

@@ -553,10 +553,6 @@ var TableMax = function TableMax(_ref) {
     }
     setColumnOrder(arr);
   };
-  var _useState39 = useState(0),
-    _useState40 = _slicedToArray(_useState39, 2),
-    checkboxRender = _useState40[0],
-    setCheckboxRender = _useState40[1];
   var setColumnsByProps = useCallback(function () {
     var extraColumns = [];
     if (getRowCanExpand() && columns.findIndex(function (column) {
@@ -620,9 +616,6 @@ var TableMax = function TableMax(_ref) {
                 }
                 return item.getIsSelected();
               });
-              setCheckboxRender(function (prev) {
-                return prev + 1;
-              });
               onRowCheckboxClick === null || onRowCheckboxClick === void 0 || onRowCheckboxClick(row, row.original, !row.getIsSelected(), curSelectedRows);
               // 阻止点击事件冒泡，监听行双击事件时，点击这里会有问题
               e.stopPropagation();

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

@@ -13,7 +13,7 @@ import { AutoComplete, DatePicker, Input, InputNumber } from 'antd';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { FilterType, defaultDateFormat } from '.';
+import { FilterType, defaultDateFormat, isEmpty } from '.';
 import { DateRange } from "./DateRange";
 import MultipleSelect from "./MultipleSelect";
 import NumberRange from "./NumberRange";
@@ -57,19 +57,19 @@ var Filter = function Filter(_ref) {
     setColumnFilterValue(newValue);
     column.setFilterValue(newValue);
   };
-  // 修改表格SingleSelect 筛选参数
+  // 修改表格SingleSelect MutiSelect 筛选参数
   var handleChangeSelectFilterValue = function handleChangeSelectFilterValue(value, inputSearchValue) {
     var newValue = value;
-    if (value === null || Array.isArray(value) && value.length === 0) {
+    if (value === null || value === undefined || Array.isArray(value) && value.length === 0) {
       // 值为null或空数组时，清除过滤条件。
       newValue = undefined;
     }
     // console.log('handleChangeFilterValue :>> ', newValue);
-    setColumnFilterValue(!value ? undefined : {
+    setColumnFilterValue(isEmpty(newValue) ? undefined : {
       filterValue: newValue,
       optionsParam: inputSearchValue
     });
-    column.setFilterValue(!value ? undefined : {
+    column.setFilterValue(isEmpty(newValue) ? undefined : {
       filterValue: newValue,
       optionsParam: inputSearchValue
     });
@@ -163,10 +163,7 @@ var Filter = function Filter(_ref) {
     fetchOptions(value);
   }, 500), [fetchOptions]);
   useEffect(function () {
-    if ([FilterType.MultiSelect].includes(filterType)) {
-      // 打开后自动获取可选值
-      fetchOptions(columnFilterValue);
-    } else if ([FilterType.SingleSelect].includes(filterType)) {
+    if ([FilterType.SingleSelect, FilterType.MultiSelect].includes(filterType)) {
       // 打开后自动获取可选值
       var _ref3 = columnFilterValue || {},
         optionsParam = _ref3.optionsParam;
@@ -285,7 +282,7 @@ var Filter = function Filter(_ref) {
       default:
         return /*#__PURE__*/_jsx(MultipleSelect, {
           value: columnFilterValue,
-          onChange: handleChangeFilterValue,
+          onChange: handleChangeSelectFilterValue,
           onSearch: onSearch,
           options: options,
           loading: apiLoading,

package/dist/components/TableMax/components/ColumnFilterV2/MultipleSelect/index.d.ts

@@ -1,8 +1,11 @@
 import './index.less';
 interface IProps {
-    value: any[];
+    value: {
+        filterValue?: any[];
+        optionsParam?: string;
+    } | undefined;
     options: any[];
-    onChange: (value: any[]) => void;
+    onChange: (value: any[], inputValue?: string) => void;
     onSearch: (value: string) => void;
     isFrontSearch: boolean;
     loading: boolean;

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

@@ -15,7 +15,10 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 var CheckboxGroup = Checkbox.Group;
 var MultipleSelect = function MultipleSelect(_ref) {
   var _ref$value = _ref.value,
-    value = _ref$value === void 0 ? [] : _ref$value,
+    value = _ref$value === void 0 ? {
+      filterValue: [],
+      optionsParam: ''
+    } : _ref$value,
     onChange = _ref.onChange,
     options = _ref.options,
     onSearch = _ref.onSearch,
@@ -23,37 +26,55 @@ var MultipleSelect = function MultipleSelect(_ref) {
     loading = _ref.loading,
     onCloseFilterPanel = _ref.onCloseFilterPanel;
   // 内部state
-  var _useState = useState(Array.isArray(value) ? value : [value]),
-    _useState2 = _slicedToArray(_useState, 2),
-    innerValue = _useState2[0],
-    setInnerValue = _useState2[1];
+  // const [innerValue, setInnerValue] = useState(Array.isArray(value) ? value : [value]);
   var _useTranslation = useTranslation(),
     _useTranslation2 = _slicedToArray(_useTranslation, 1),
     t = _useTranslation2[0];
+  var _ref2 = value || {},
+    filterValue = _ref2.filterValue,
+    optionsParam = _ref2.optionsParam;
 
-  // 前端搜索输入值
-  var _useState3 = useState(''),
+  // 列筛选 最终筛选值
+  var _useState = useState(Array.isArray(filterValue) ? filterValue : filterValue ? [filterValue] : []),
+    _useState2 = _slicedToArray(_useState, 2),
+    innerValue = _useState2[0],
+    setInnerValue = _useState2[1];
+  // 列筛选可选值列表的筛选参数
+  var _useState3 = useState(optionsParam),
     _useState4 = _slicedToArray(_useState3, 2),
-    frontendSearchValue = _useState4[0],
-    setFrontendSearchValue = _useState4[1];
+    inputSearchValue = _useState4[0],
+    setInputSearchValue = _useState4[1];
+  // 列筛选-前端筛选可选值列表
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    frontendOptions = _useState6[0],
+    setFrontendOptions = _useState6[1];
   var checkAll = options.length === innerValue.length;
   var indeterminate = innerValue.length > 0 && innerValue.length < options.length;
   var handleCheckBoxChange = function handleCheckBoxChange(changedValue) {
     console.log('changedValue :>> ', changedValue);
     setInnerValue(changedValue);
   };
+
+  // const handleConfirm = () => {
+  //   onChange(innerValue);
+  //   onCloseFilterPanel();
+  // };
+
+  // const handleReset = () => {
+  //   setInnerValue([]);
+  //   onChange([]);
+  // };
+
   var handleConfirm = function handleConfirm() {
-    onChange(innerValue);
+    onChange(innerValue, inputSearchValue);
     onCloseFilterPanel();
   };
   var handleReset = function handleReset() {
     setInnerValue([]);
-    onChange([]);
+    setInputSearchValue(undefined);
+    onChange([], undefined);
   };
-  useUpdateEffect(function () {
-    // console.log('value :>> ', value);
-    setInnerValue(Array.isArray(value) ? value : [value]);
-  }, [value.toString()]);
   var onCheckAllChange = function onCheckAllChange(e) {
     console.log('checkAll :>> ', e.target.checked);
     var checkAll = e.target.checked;
@@ -65,12 +86,20 @@ var MultipleSelect = function MultipleSelect(_ref) {
       setInnerValue([]);
     }
   };
+  useUpdateEffect(function () {
+    var _ref3 = value || {},
+      _ref3$filterValue = _ref3.filterValue,
+      filterValue = _ref3$filterValue === void 0 ? [] : _ref3$filterValue,
+      optionsParam = _ref3.optionsParam;
+    setInnerValue(Array.isArray(filterValue) ? filterValue : filterValue ? [filterValue] : []);
+    console.log('value :>> ', value);
+    setInputSearchValue(optionsParam);
+  }, [JSON.stringify(filterValue), optionsParam]);
   var handleInputChange = function handleInputChange(e) {
     var value = e.target.value;
+    setInputSearchValue(value);
     if (!isFrontSearch) {
       onSearch(value);
-    } else {
-      setFrontendSearchValue(value);
     }
   };
 
@@ -79,18 +108,33 @@ var MultipleSelect = function MultipleSelect(_ref) {
     if (!isFrontSearch) {
       return options;
     }
-    var input = (frontendSearchValue !== null && frontendSearchValue !== void 0 ? frontendSearchValue : '').toUpperCase().trim();
+    var input = (inputSearchValue !== null && inputSearchValue !== void 0 ? inputSearchValue : '').toUpperCase().trim();
     return options.filter(function (option) {
       var _option$label;
       var optionFilterString = ('' + ((_option$label = option.label) !== null && _option$label !== void 0 ? _option$label : option.children)).toUpperCase().trim();
       return optionFilterString.indexOf(input) !== -1;
     });
-  }, [options, frontendSearchValue]);
+  }, [options, inputSearchValue]);
+
+  // // 最终的可选值
+  // const finalOptions = useMemo(() => {
+  //   if (!isFrontSearch) {
+  //     return options;
+  //   }
+  //   const input = (frontendSearchValue ?? '').toUpperCase().trim();
+  //   return options.filter(option => {
+  //     const optionFilterString = ('' + (option.label ?? option.children)).toUpperCase().trim();
+  //     return optionFilterString.indexOf(input) !== -1;
+  //   });
+  // }, [options, frontendSearchValue]);
+
   return /*#__PURE__*/_jsxs("div", {
     className: "tableMax-filter-multipleSelect",
     children: [/*#__PURE__*/_jsx("div", {
       className: "tableMax-filter-multipleSelect-header",
       children: /*#__PURE__*/_jsx(Input, {
+        defaultValue: inputSearchValue,
+        value: inputSearchValue,
         placeholder: t('global.placeholder.input'),
         onChange: handleInputChange,
         allowClear: true

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

@@ -5,9 +5,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { useTranslation } from "../../../../../hooks/useTranslation";
+import { useUpdateEffect } from 'ahooks';
 import { Button, Input, Spin } from 'antd';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import "./index.less";
+import { isEmpty } from '..';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var SingleSelect = function SingleSelect(_ref) {
@@ -54,7 +56,7 @@ var SingleSelect = function SingleSelect(_ref) {
     setInputSearchValue(undefined);
     onChange(undefined, undefined);
   };
-  useEffect(function () {
+  useUpdateEffect(function () {
     console.log('value :>> ', value);
     var _ref3 = value || {},
       filterValue = _ref3.filterValue,
@@ -75,7 +77,7 @@ var SingleSelect = function SingleSelect(_ref) {
   };
   // 首次加载，已选item滚动到可视区
   useEffect(function () {
-    if (!value || !value.filterValue || !options || Array.isArray(options) && options.length === 0 || !isFirstScroll.current) return;
+    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, "]"));

package/dist/components/TableMax/components/ColumnFilterV2/customFilterFns.d.ts

@@ -3,5 +3,6 @@ declare const customFilterFns: {
     fuzzyFilter: (row: any, columnId: any, filterValue: any) => boolean;
     multiSelectFilter: (row: any, columnId: any, filterValue: any) => any;
     numberRangeFilter: (row: any, columnId: any, filterValue: any) => boolean;
+    singleSelectFilter: (row: any, columnId: any, filterValue: any) => boolean;
 };
 export default customFilterFns;

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

@@ -15,10 +15,21 @@ var fuzzyFilter = function fuzzyFilter(row, columnId, filterValue) {
   return rowStringValue.toUpperCase().indexOf(filterStringValue.toUpperCase().trim()) !== -1;
 };
 
+// singleSelect使用的模糊筛选
+var singleSelectFilter = function singleSelectFilter(row, columnId, filterValue) {
+  var _row$getValue2;
+  var value = filterValue.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);
+  return rowStringValue.toUpperCase().indexOf(filterStringValue.toUpperCase().trim()) !== -1;
+};
+
 // 多选筛选
 var multiSelectFilter = function multiSelectFilter(row, columnId, filterValue) {
+  var value = filterValue.filterValue;
   var rowValue = row.getValue(columnId);
-  return filterValue.includes(rowValue + '');
+  return value === null || value === void 0 ? void 0 : value.includes(rowValue + '');
 };
 
 // 数字范围筛选
@@ -49,6 +60,7 @@ var customFilterFns = {
   timeRangeFilter: timeRangeFilter,
   fuzzyFilter: fuzzyFilter,
   multiSelectFilter: multiSelectFilter,
-  numberRangeFilter: numberRangeFilter
+  numberRangeFilter: numberRangeFilter,
+  singleSelectFilter: singleSelectFilter
 };
 export default customFilterFns;

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

@@ -34,3 +34,4 @@ export declare function ColumnFilter({ column, manualFiltering }: {
     column: Column<any, unknown>;
     manualFiltering: boolean;
 }): import("react/jsx-runtime").JSX.Element;
+export declare function isEmpty(value: any): boolean;

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

@@ -36,7 +36,7 @@ export var FilterType = /*#__PURE__*/function (FilterType) {
   return FilterType;
 }({}); // 输入框
 // 不同筛选类型需要特定的过滤函数
-var FILTER_FN_ENUM = (_FILTER_FN_ENUM = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_FILTER_FN_ENUM, FilterType.Date, 'timeRangeFilter'), FilterType.DateRange, 'timeRangeFilter'), FilterType.SingleDate, 'fuzzyFilter'), FilterType.MultiSelect, 'multiSelectFilter'), FilterType.Integer, 'numberRangeFilter'), FilterType.NumberRange, 'numberRangeFilter'), FilterType.SingleInteger, 'fuzzyFilter'), FilterType.SingleNumber, 'fuzzyFilter'), FilterType.SingleSelect, 'fuzzyFilter'), FilterType.AutoComplete, 'fuzzyFilter'), _defineProperty(_FILTER_FN_ENUM, FilterType.Input, 'fuzzyFilter'));
+var FILTER_FN_ENUM = (_FILTER_FN_ENUM = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_FILTER_FN_ENUM, FilterType.Date, 'timeRangeFilter'), FilterType.DateRange, 'timeRangeFilter'), FilterType.SingleDate, 'fuzzyFilter'), FilterType.MultiSelect, 'multiSelectFilter'), FilterType.Integer, 'numberRangeFilter'), FilterType.NumberRange, 'numberRangeFilter'), FilterType.SingleInteger, 'fuzzyFilter'), FilterType.SingleNumber, 'fuzzyFilter'), FilterType.SingleSelect, 'singleSelectFilter'), FilterType.AutoComplete, 'fuzzyFilter'), _defineProperty(_FILTER_FN_ENUM, FilterType.Input, 'fuzzyFilter'));
 
 // 给columns配置填充默认的过滤函数
 export function setDefaultFilterFn(columns) {
@@ -155,4 +155,9 @@ export function ColumnFilter(_ref) {
       })
     }), root ? document.querySelector(root) : document.body) : null]
   });
+}
+export function isEmpty(value) {
+  if (value) return false;
+  if (value === false || value === 0) return false;
+  return true;
 }

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) => 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;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
 declare const customSortFns: {
-    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;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/dist/components/TableMax/utils.js

@@ -124,7 +124,7 @@ export var getFormatFilters = function getFormatFilters(columns, originFilters)
       formatFilters["".concat(formatKey, "To")] = value === null || value === void 0 ? void 0 : value[1];
     } else if (filterType === FilterType.MultiSelect || !filterType) {
       // 多选组件
-      formatFilters["".concat(formatKey, "List")] = value;
+      formatFilters["".concat(formatKey, "List")] = value.filterValue;
       // formatFilters[formatKey] = value;
     } else if (filterType === FilterType.SingleSelect) {
       // 单选组件
@@ -196,7 +196,7 @@ export var getFormatFiltersV2 = function getFormatFiltersV2(columns, originFilte
     } else if (filterType === FilterType.MultiSelect || !filterType) {
       // 多选组件
       res.operator = FilterOperator.In;
-      res.value = value;
+      res.value = value.filterValue;
     } else if (filterType === FilterType.Input || filterType === FilterType.AutoComplete) {
       // Input组件
       res.operator = FilterOperator.Contains;

package/package.json

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