@arim-aisdc/public-components 2.3.27 → 2.3.28

package/dist/components/TableMax/TableMax.js

@@ -25,6 +25,7 @@ import { Button, Checkbox, Form, Pagination, Upload } from 'antd';
 import dayjs from 'dayjs';
 import { cloneDeep, debounce } from 'lodash';
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import { useTranslation } from "../../hooks/useTranslation";
 import { useConfig } from "../ConfigProvider";
 import TableBody from "./TableBody";
 import TableHeader from "./TableHeader";
@@ -37,7 +38,6 @@ import PaginationV2 from "./components/PaginationV2";
 import { useColumnWidth } from "./hooks/useColumnWidth";
 import "./tableMax.less";
 import { downloadExcel, getFormatFilters, getFormatFiltersV2, getFormatSorting, operationColumnNoTooltips } from "./utils";
-import { useTranslation } from "../../hooks/useTranslation";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var ColumnType = /*#__PURE__*/function (ColumnType) {
@@ -678,6 +678,7 @@ var TableMax = function TableMax(_ref) {
 
   // 筛选回调
   useEffect(function () {
+    if ((columns === null || columns === void 0 ? void 0 : columns.length) === 0) return;
     // console.log('columnFilters :>> ', tableId, columnFilters);
     var filteredRowModel = table.getRowModel();
     var filteredData = filteredRowModel.rows.map(function (item) {
@@ -697,7 +698,7 @@ var TableMax = function TableMax(_ref) {
         formatFiltersV2: getFormatFiltersV2(columns, columnFilters) // 动态化查询格式：https://arim-jyzx.coding.net/p/infra/wiki/3252
       });
     }
-  }, [JSON.stringify(columnFilters), manualFiltering, tableId]);
+  }, [JSON.stringify(columnFilters), columns, manualFiltering, tableId]);
 
   // 排序回调
   useEffect(function () {
@@ -1108,8 +1109,11 @@ var TableMax = function TableMax(_ref) {
               children: "\u4FDD\u5B58"
             })]
           })
-        }) : /*#__PURE__*/_jsxs("div", {
+        }) : null, /*#__PURE__*/_jsxs("div", {
           className: "table-max-header-right",
+          style: {
+            display: editingRowId ? 'none' : 'flex'
+          },
           children: [renderOperateRight ? renderOperateRight : null, canUpload && /*#__PURE__*/_jsx(Upload, _objectSpread(_objectSpread({
             className: "upload-btn handleRightItem"
           }, uploadProps), {}, {

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

@@ -98,19 +98,20 @@ export var setInitColumnsSize = function setInitColumnsSize(tableColumns, column
   };
 };
 export var getFormatFilters = function getFormatFilters(columns, originFilters) {
-  // console.log('getFormatFilters :>> ', columns, originFilters);
+  console.log('getFormatFilters :>> ', columns, originFilters);
   var formatFilters = {};
-  originFilters.forEach(function (filter) {
+  originFilters === null || originFilters === void 0 || originFilters.forEach(function (filter) {
     var id = filter.id,
       value = filter.value;
     var curColumn = columns.find(function (item) {
       return item.id === id;
     });
-    var filterType = curColumn.filterType,
-      filterKey = curColumn.filterKey;
-    var _ref4 = curColumn.filterComProps || {},
-      _ref4$format = _ref4.format,
-      format = _ref4$format === void 0 ? defaultDateFormat : _ref4$format;
+    var _ref4 = curColumn || {},
+      filterType = _ref4.filterType,
+      filterKey = _ref4.filterKey;
+    var _ref5 = curColumn.filterComProps || {},
+      _ref5$format = _ref5.format,
+      format = _ref5$format === void 0 ? defaultDateFormat : _ref5$format;
     // 优先取formattedFilterKey作为key
     var formatKey = filterKey || id;
     if (filterType === FilterType.Date || filterType === FilterType.DateRange) {
@@ -149,16 +150,17 @@ export var getFormatFilters = function getFormatFilters(columns, originFilters)
  * 4. SingleDate/SingleNumber/SingleSelect：Eq
  */
 export var getFormatFiltersV2 = function getFormatFiltersV2(columns, originFilters) {
-  // console.log('getFormatFilters :>> ', columns, originFilters);
+  console.log('getFormatFilters :>> ', columns, originFilters);
   var formatFilters = [];
-  originFilters.forEach(function (filter) {
+  originFilters === null || originFilters === void 0 || originFilters.forEach(function (filter) {
     var id = filter.id,
       value = filter.value;
     var curColumn = columns.find(function (item) {
       return item.id === id;
     });
-    var filterType = curColumn.filterType,
-      filterKey = curColumn.filterKey;
+    var _ref6 = curColumn || {},
+      filterType = _ref6.filterType,
+      filterKey = _ref6.filterKey;
     // const { format = defaultDateFormat } = curColumn.filterComProps || {};
     // 优先取formattedFilterKey作为key
     var formatKey = filterKey || id;
@@ -216,8 +218,8 @@ export var getFormatSorting = function getFormatSorting(columns, originSorting)
     var curColumn = columns.find(function (item) {
       return item.id === sort.id;
     });
-    var _ref5 = curColumn || {},
-      sortingKey = _ref5.sortingKey;
+    var _ref7 = curColumn || {},
+      sortingKey = _ref7.sortingKey;
     // 优先取formattedFilterKey作为key
     var formatKey = sortingKey || sort.id;
     return _objectSpread(_objectSpread({}, sort), {}, {
@@ -242,13 +244,13 @@ export var operationColumnNoTooltips = function operationColumnNoTooltips(column
 };
 
 //下载
-export var downloadExcel = function downloadExcel(_ref6) {
-  var url = _ref6.url,
-    data = _ref6.data,
-    title = _ref6.title,
-    setDownLoading = _ref6.setDownLoading,
-    method = _ref6.method,
-    request = _ref6.request;
+export var downloadExcel = function downloadExcel(_ref8) {
+  var url = _ref8.url,
+    data = _ref8.data,
+    title = _ref8.title,
+    setDownLoading = _ref8.setDownLoading,
+    method = _ref8.method,
+    request = _ref8.request;
   setDownLoading(true);
   request(url, {
     method: method || 'post',

package/package.json

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