@arim-aisdc/public-components 2.3.34 → 2.3.35

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/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,6 +15,16 @@ 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 rowValue = row.getValue(columnId);
@@ -49,6 +59,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.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) {

package/package.json

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