@arim-aisdc/public-components 2.3.47 → 2.3.49

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

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

package/dist/components/CustomForm/UploadImg/index.js

@@ -114,7 +114,7 @@ var UploadImg = function UploadImg(_ref) {
             url = "".concat(item === null || item === void 0 ? void 0 : item.baseUrl, "/api/file-management/file-descriptor/content");
             _context2.prev = 3;
             _context2.next = 6;
-            return fetch("".concat(url, "?id=").concat(id), {
+            return fetch("".concat(url, "?fileId=").concat(id), {
               method: 'GET',
               headers: {
                 Authorization: "Bearer ".concat(item === null || item === void 0 ? void 0 : item.token)

package/dist/components/TableMax/TableMax.js

@@ -116,6 +116,7 @@ var TableMax = function TableMax(_ref) {
     defaultCompactMode = _ref$defaultCompactMo === void 0 ? false : _ref$defaultCompactMo,
     _ref$canSelection = _ref.canSelection,
     canSelection = _ref$canSelection === void 0 ? false : _ref$canSelection,
+    canSelectionUseShift = _ref.canSelectionUseShift,
     _ref$selectionWithout = _ref.selectionWithoutChecked,
     selectionWithoutChecked = _ref$selectionWithout === void 0 ? false : _ref$selectionWithout,
     _ref$canRowDrag = _ref.canRowDrag,
@@ -223,10 +224,12 @@ var TableMax = function TableMax(_ref) {
       globalPageSizeOptions = _ref2.pageSizeOptions,
       cacheMaxAge = _ref2.cacheMaxAge,
       openMemo = _ref2.openMemo,
-      globalCanExport = _ref2.canExport;
+      globalCanExport = _ref2.canExport,
+      canSelectionUseShift = _ref2.canSelectionUseShift;
     return {
       globalCanExport: globalCanExport,
       globalPageSizeOptions: globalPageSizeOptions,
+      canSelectionUseShift: canSelectionUseShift,
       cacheMaxAge: cacheMaxAge,
       openMemo: openMemo
     };
@@ -554,6 +557,8 @@ var TableMax = function TableMax(_ref) {
     }
     setColumnOrder(arr);
   };
+  var recentlyCheckedRow = useRef(null);
+  var allCheckedRow = useRef(null);
   var setColumnsByProps = useCallback(function () {
     var extraColumns = [];
     if (getRowCanExpand() && columns.findIndex(function (column) {
@@ -606,16 +611,65 @@ var TableMax = function TableMax(_ref) {
             checked: row.getIsSelected(),
             disabled: !row.getCanSelect(),
             indeterminate: row.getIsSomeSelected(),
-            onChange: row.getToggleSelectedHandler(),
-            onClick: function onClick(e) {
-              var _table$getRowModel;
-              var curSelectedRows = (_table$getRowModel = table.getRowModel()) === null || _table$getRowModel === void 0 ? void 0 : _table$getRowModel.rows.filter(function (item) {
-                if (item.id === row.id) {
-                  return !row.getIsSelected();
-                }
-                return item.getIsSelected();
-              });
-              onRowCheckboxClick === null || onRowCheckboxClick === void 0 || onRowCheckboxClick(row, row.original, !row.getIsSelected(), curSelectedRows);
+            // onChange: row.getToggleSelectedHandler(),
+            onChange: function onChange(e) {
+              var _e$nativeEvent;
+              var currentRowIsSelected,
+                currentSelectedRows = [],
+                allSelectedRows = [];
+              var isCanShiftControl = canSelectionUseShift !== null && canSelectionUseShift !== void 0 ? canSelectionUseShift : tableMaxConfig === null || tableMaxConfig === void 0 ? void 0 : tableMaxConfig.canSelectionUseShift;
+              if (!isCanShiftControl) {
+                var _table$getRowModel;
+                row.toggleSelected();
+                currentRowIsSelected = !row.getIsSelected();
+                allSelectedRows = (_table$getRowModel = table.getRowModel()) === null || _table$getRowModel === void 0 ? void 0 : _table$getRowModel.rows.filter(function (item) {
+                  if (item.id === row.id) {
+                    return !row.getIsSelected();
+                  }
+                  return item.getIsSelected();
+                });
+                // 为了兼容之前的逻辑，currentSelectedRows在不使用shift时是对象，使用shift时是数组
+                onRowCheckboxClick === null || onRowCheckboxClick === void 0 || onRowCheckboxClick(row, row.original, currentRowIsSelected, allSelectedRows);
+                e.stopPropagation();
+                return;
+              }
+              if (e !== null && e !== void 0 && (_e$nativeEvent = e.nativeEvent) !== null && _e$nativeEvent !== void 0 && _e$nativeEvent.shiftKey) {
+                var selectionConfig = {};
+                var initselectedIndex = recentlyCheckedRow.current;
+                var min = Math.min(initselectedIndex || 0, row.index);
+                var max = Math.max(initselectedIndex || 0, row.index);
+                table.getRowModel().rows.map(function (row) {
+                  var isInRange = row.index >= min && row.index <= max;
+                  if (isInRange) {
+                    var insertMethod = initselectedIndex < row.index ? 'push' : 'unshift';
+                    currentSelectedRows[insertMethod](row);
+                  }
+                  if (row.getIsSelected() || isInRange) {
+                    selectionConfig[row.id] = true;
+                    allSelectedRows.push(row);
+                  }
+                });
+                setRowSelection(function (prev) {
+                  return _objectSpread(_objectSpread({}, prev), selectionConfig);
+                });
+                currentRowIsSelected = true;
+              } else {
+                var _table$getRowModel2;
+                row.toggleSelected();
+                currentRowIsSelected = !row.getIsSelected();
+                currentSelectedRows = [row];
+                allSelectedRows = (_table$getRowModel2 = table.getRowModel()) === null || _table$getRowModel2 === void 0 ? void 0 : _table$getRowModel2.rows.filter(function (item) {
+                  if (item.id === row.id) {
+                    return !row.getIsSelected();
+                  }
+                  return item.getIsSelected();
+                });
+              }
+              recentlyCheckedRow.current = currentRowIsSelected ? row.index : recentlyCheckedRow.current;
+              // currentSelectedRows是数组
+              onRowCheckboxClick === null || onRowCheckboxClick === void 0 || onRowCheckboxClick(currentSelectedRows, currentSelectedRows.map(function (row) {
+                return row.original;
+              }), currentRowIsSelected, allSelectedRows);
               // 阻止点击事件冒泡，监听行双击事件时，点击这里会有问题
               e.stopPropagation();
             }
@@ -625,7 +679,7 @@ var TableMax = function TableMax(_ref) {
       });
     }
     return extraColumns;
-  }, [canSelection, selectionWithoutChecked, getRowCanExpand, columns]);
+  }, [canSelection, canSelectionUseShift, tableMaxConfig === null || tableMaxConfig === void 0 ? void 0 : tableMaxConfig.canSelectionUseShift, selectionWithoutChecked, getRowCanExpand, columns, rowKey]);
 
   // 初始化列
   useEffect(function () {
@@ -664,6 +718,7 @@ var TableMax = function TableMax(_ref) {
 
   var _rowSelectionChange = useCallback(debounce(function (rowOriginal, row) {
     if (rowSelectionChange) {
+      console.log(rowOriginal, row, 'rowSelectionChange1');
       rowSelectionChange(rowOriginal, row);
     }
   }, 100), [rowSelectionChange]);
@@ -876,8 +931,8 @@ var TableMax = function TableMax(_ref) {
     if (!canClickEditIcon) return;
     var selectedTableRows = table.getSelectedRowModel().rows;
     var selectedTableRowsLength = selectedTableRows.length;
-    var _table$getRowModel2 = table.getRowModel(),
-      tableRows = _table$getRowModel2.rows;
+    var _table$getRowModel3 = table.getRowModel(),
+      tableRows = _table$getRowModel3.rows;
     var selectRow =
     // eslint-disable-next-line eqeqeq
     (canSelection ? (_selectedTableRows = selectedTableRows[selectedTableRowsLength - 1]) === null || _selectedTableRows === void 0 ? void 0 : _selectedTableRows.original : (_tableRows$find = tableRows.find(function (item) {
@@ -896,7 +951,7 @@ var TableMax = function TableMax(_ref) {
   var save = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _tableRows$find2;
-      var newRow, _table$getRowModel3, tableRows, originRow;
+      var newRow, _table$getRowModel4, tableRows, originRow;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -904,7 +959,7 @@ var TableMax = function TableMax(_ref) {
             return form.validateFields();
           case 2:
             newRow = _context.sent;
-            _table$getRowModel3 = table.getRowModel(), tableRows = _table$getRowModel3.rows; // eslint-disable-next-line eqeqeq
+            _table$getRowModel4 = table.getRowModel(), tableRows = _table$getRowModel4.rows; // eslint-disable-next-line eqeqeq
             originRow = ((_tableRows$find2 = tableRows.find(function (item) {
               return item.id == editingRowId;
             })) === null || _tableRows$find2 === void 0 ? void 0 : _tableRows$find2.original) || {}; // eslint-disable-next-line @typescript-eslint/no-unused-expressions
@@ -957,8 +1012,8 @@ var TableMax = function TableMax(_ref) {
     } else {
       var _tableRows$find3;
       // 单选
-      var _table$getRowModel4 = table.getRowModel(),
-        tableRows = _table$getRowModel4.rows;
+      var _table$getRowModel5 = table.getRowModel(),
+        tableRows = _table$getRowModel5.rows;
       deleteFun === null || deleteFun === void 0 || deleteFun((_tableRows$find3 = tableRows.find(function (item) {
         return item.id === rowSelectedId;
       })) === null || _tableRows$find3 === void 0 ? void 0 : _tableRows$find3.original);

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/dist/components/TableMax/type.d.ts

@@ -169,6 +169,8 @@ export type TableMaxProps = {
     defaultCompactMode?: boolean;
     /**是否支持多选，默认不支持 */
     canSelection?: boolean;
+    /**是否支持shift多选，无默认值，可以在 ConfigProvider配置 */
+    canSelectionUseShift?: boolean;
     /**多选不显示勾选框，ctrl shift进行多选 */
     selectionWithoutChecked?: boolean;
     /** 行是否可拖动，默认不支持 */

package/package.json

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