@arim-aisdc/public-components 2.3.33 → 2.3.35

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

@@ -29,6 +29,7 @@ export interface ConfigConsumerProps {
     tableMax?: {
         pageSizeOptions?: number[];
         cacheMaxAge?: number;
+        openMemo?: boolean;
     };
 }
 export declare const DEFAULT_CONTEXT: {

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

@@ -246,7 +246,7 @@ var Row = function Row(_ref) {
     } else if (Object.keys(selectionConfig).length > 1) {
       delete selectionConfig[row.id];
     }
-    setRowSelection(_objectSpread({}, selectionConfig));
+    // setRowSelection({ ...selectionConfig });
   }, [row, table]);
   var handleShiftSelection = useCallback(function () {
     var min = Math.min(initselectedIndex || 0, row.index);
@@ -257,11 +257,12 @@ var Row = function Row(_ref) {
     }).forEach(function (row) {
       selectionConfig[row.id] = true;
     });
-    setRowSelection(selectionConfig);
+
+    // setRowSelection(selectionConfig);
   }, [row, table]);
   var handleSingleRowSelection = useCallback(function () {
     initselectedIndex = row.index;
-    setRowSelection(_defineProperty({}, row === null || row === void 0 ? void 0 : row.id, true));
+    // setRowSelection({ [row?.id]: true });
   }, [row, table]);
   var handleShiftSelectionWithCheckbox = useCallback(function () {
     var selectionConfig = _objectSpread({}, table.getState().rowSelection);
@@ -272,7 +273,8 @@ var Row = function Row(_ref) {
     }).forEach(function (row) {
       selectionConfig[row.id] = true;
     });
-    setRowSelection(selectionConfig);
+
+    // setRowSelection(selectionConfig);
   }, [row, table]);
   var handleToggleSelection = useCallback(function () {
     if (!row.getIsSelected()) {
@@ -280,7 +282,7 @@ var Row = function Row(_ref) {
     }
     var selectionConfig = _objectSpread(_objectSpread({}, table.getState().rowSelection), {}, _defineProperty({}, row.id, !row.getIsSelected()));
     if (row.getCanSelect()) {
-      setRowSelection(selectionConfig);
+      // setRowSelection(selectionConfig);
     }
   }, [row, table]);
   var handleSingleSelection = useCallback(function (evt) {
@@ -390,7 +392,7 @@ var Row = function Row(_ref) {
       className: rowClassNames,
       children: row.getVisibleCells().map(renderCell)
     });
-  }, [row, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, leftLastColumnId, rightFirstColumnId, cellClassName, theme, rowHeight, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat]);
+  }, [row, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, leftLastColumnId, rightFirstColumnId, cellClassName, theme, rowHeight, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat, row.getVisibleCells(), row.getIsSelected(), row.getValue(), row.renderValue()]);
   var rowCom = function rowCom() {
     var renderCell = function renderCell(cell) {
       var _cellClassName2;

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: {
@@ -389,7 +393,7 @@ var TableBody = function TableBody(_ref) {
   // console.log('rowHeight :>>', rowHeight);
 
   var TableRow = useMemo(function () {
-    console.log(TableRow, 'TableRow');
+    console.log(table.getRowModel().rows, 'TableRow');
     return table.getRowModel().rows;
   }, [table, table.getState().rowSelection]);
   return (
@@ -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

@@ -216,10 +216,12 @@ var TableMax = function TableMax(_ref) {
   var tableMaxConfig = useMemo(function () {
     var _ref2 = tableMax || {},
       globalPageSizeOptions = _ref2.pageSizeOptions,
-      cacheMaxAge = _ref2.cacheMaxAge;
+      cacheMaxAge = _ref2.cacheMaxAge,
+      openMemo = _ref2.openMemo;
     return {
       globalPageSizeOptions: globalPageSizeOptions,
-      cacheMaxAge: cacheMaxAge
+      cacheMaxAge: cacheMaxAge,
+      openMemo: openMemo
     };
   }, [JSON.stringify(tableMax)]);
 
@@ -1069,7 +1071,7 @@ var TableMax = function TableMax(_ref) {
     hasTotalRow: hasTotalRow,
     totalDatas: totalDatas,
     setRowSelection: setRowSelection,
-    openMemo: openMemo
+    openMemo: openMemo !== null && openMemo !== void 0 ? openMemo : tableMaxConfig === null || tableMaxConfig === void 0 ? void 0 : tableMaxConfig.openMemo
   };
   var changeCompactMode = function changeCompactMode() {
     setCompactMode(!compactMode);

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