@arim-aisdc/public-components 2.3.39 → 2.3.41

package/dist/components/TableMax/TableHeader/index.less

@@ -1,225 +1,225 @@
-table {
-  table-layout: fixed;
-  // background: @globalColor_14;
-  width: 100%;
-  border-collapse: collapse;
-  
-  // overflow: hidden;
-
-  th {
-    position: relative;
-    padding: 0;
-    border: 0;
-    background: @globalColor_14;
-    z-index: 1;
-  }
-
-  .th-scroll {
-    position: sticky;
-    right: 0;
-  }
-}
-
-.cell-wapper {
-  background: @globalColor_14;
-  height: fit-content;
-  line-height: 16px;
-  display: flex;
-  font-weight: 400;
-  padding: 8px;
-  text-align: left;
-  font-size: 14px;
-  // border-bottom: 1px solid @tableColor2;
-
-  .cell-left {
-    flex: 1;
-    // text-align: center;
-    user-select: none;
-    touch-action: none;
-    color: @tableColor1;
-    cursor: pointer;
-    overflow: hidden;
-    white-space: nowrap;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 100%;
-
-    .cell-left-header {
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: normal;
-      word-break: break-all;
-
-      .ant-checkbox-wrapper {
-        line-height: 16px;
-      }
-    }
-  }
-
-  .cell-right {
-    display: flex;
-    // gap: 4px;
-    align-items: center;
-  }
-
-  .drag-handler {
-    color: @tableColor3;
-    display: none;
-    // opacity: 0;
-    cursor: move;
-    position: absolute;
-    right: 5px;
-  }
-
-  &:hover .drag-handler {
-    display: inline-block;
-    // opacity: 1;
-  }
-  &:hover {
-    .sort-flag {
-      display: flex;
-    }
-    .filter-icon {
-      display: inline-block;
-    }
-  }
-
-  .cell-resize-handler {
-    position: absolute;
-    right: 0;
-    top: 30%;
-    height: 40%;
-    width: 5px;
-    border-right: 2px solid @globalColor_15;
-    cursor: ew-resize;
-    user-select: none;
-    touch-action: none;
-    z-index: 99999;
-
-    &:hover {
-      border-right: 5px solid @globalColor_15;
-      top: 0%;
-      height: 100%;
-      z-index: 99999;
-      cursor: ew-resize;
-    }
-  }
-
-  .cell-resize-handler::after {
-    content: '';
-    position: absolute;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    width: 5px;
-    cursor: ew-resize;
-  }
-
-  .column-resizer.column-is-resizing {
-    height: 60%;
-    top: 20%;
-  }
-
-
-
-  
-
-}
-
-.table-thead-tr:nth-last-child(2) {
-  .table-max-header-cell-wrapper {
-    border-bottom: none !important;
-  }
-}
-
-.table-max-header-cell-wrapper {
-  font-weight: @global-table-max-header-font-weight;
-}
-
-.table-filter-tr {
-  border-top: 1px solid @tableColor2;
-
-  .table-filter-th {
-    text-align: center;
-    vertical-align: top;
-    padding: 6px 4px;
-
-    .custom-light-select:not(.custom-light-select-customize-input) .custom-light-select-selector {
-      border-radius: 2px;
-      background-color: @global-curd-input-background-color;
-      padding: 0 2px;
-    }
-
-    .custom-dark-select:not(.custom-dark-select-customize-input) .custom-dark-select-selector {
-      border-radius: 2px;
-      background-color: @global-curd-input-background-color;
-      padding: 0 2px;
-    }
-
-    .custom-light-input-number {
-      width: 100% !important;
-      border-radius: 2px;
-      background-color: @global-curd-input-background-color;
-    }
-
-    .custom-dark-input-number {
-      width: 100% !important;
-      border-radius: 2px;
-      background-color: @global-curd-input-background-color;
-    }
-
-    .custom-dark-select-single .custom-dark-select-selector .custom-dark-select-selection-search {
-      left: 2px;
-      right: 2px;
-    }
-
-    .custom-dark-select-single .custom-dark-select-clear {
-      background: transparent;
-    }
-
-    .custom-light-select-single .custom-light-select-selector .custom-light-select-selection-search {
-      left: 2px;
-      right: 2px;
-    }
-
-    .custom-dark-picker {
-      padding: 4px;
-      background: @global-curd-input-background-color;
-    }
-
-    .custom-dark-input-affix-wrapper,
-    .custom-dark-picker-input .custom-dark-picker-clear {
-      background: @global-curd-input-background-color;
-    }
-
-    .custom-light-picker {
-      padding: 4px;
-      background: @global-curd-input-background-color;
-    }
-
-    .custom-light-input-affix-wrapper,
-    .custom-light-input,
-    .custom-light-picker-input .custom-light-picker-clear {
-      background: @global-curd-input-background-color;
-    }
-  }
-}
-
-.column-resizing-divide-line {
-  height: 300px;
-  width: 2px;
-  position: fixed;
-  z-index: 99999;
-  // background-color: #000;
-  background-color: green;
-}
-.column-resizing-divide-line {
-  will-change: transform;
-  backface-visibility: hidden;
-  transform: translate3d(0, 0, 0);
-  contain: strict;
-  cursor: ew-resize;
+table {
+  table-layout: fixed;
+  // background: @globalColor_14;
+  width: 100%;
+  border-collapse: collapse;
+  
+  // overflow: hidden;
+
+  th {
+    position: relative;
+    padding: 0;
+    border: 0;
+    background: @globalColor_14;
+    z-index: 1;
+  }
+
+  .th-scroll {
+    position: sticky;
+    right: 0;
+  }
+}
+
+.cell-wapper {
+  background: @globalColor_14;
+  height: fit-content;
+  line-height: 16px;
+  display: flex;
+  font-weight: 400;
+  padding: 8px;
+  text-align: left;
+  font-size: 14px;
+  // border-bottom: 1px solid @tableColor2;
+
+  .cell-left {
+    flex: 1;
+    // text-align: center;
+    user-select: none;
+    touch-action: none;
+    color: @tableColor1;
+    cursor: pointer;
+    overflow: hidden;
+    white-space: nowrap;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 100%;
+
+    .cell-left-header {
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: normal;
+      word-break: break-all;
+
+      .ant-checkbox-wrapper {
+        line-height: 16px;
+      }
+    }
+  }
+
+  .cell-right {
+    display: flex;
+    // gap: 4px;
+    align-items: center;
+  }
+
+  .drag-handler {
+    color: @tableColor3;
+    display: none;
+    // opacity: 0;
+    cursor: move;
+    position: absolute;
+    right: 5px;
+  }
+
+  &:hover .drag-handler {
+    display: inline-block;
+    // opacity: 1;
+  }
+  &:hover {
+    .sort-flag {
+      display: flex;
+    }
+    .filter-icon {
+      display: inline-block;
+    }
+  }
+
+  .cell-resize-handler {
+    position: absolute;
+    right: 0;
+    top: 30%;
+    height: 40%;
+    width: 5px;
+    border-right: 2px solid @globalColor_15;
+    cursor: ew-resize;
+    user-select: none;
+    touch-action: none;
+    z-index: 99999;
+
+    &:hover {
+      border-right: 5px solid @globalColor_15;
+      top: 0%;
+      height: 100%;
+      z-index: 99999;
+      cursor: ew-resize;
+    }
+  }
+
+  .cell-resize-handler::after {
+    content: '';
+    position: absolute;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    width: 5px;
+    cursor: ew-resize;
+  }
+
+  .column-resizer.column-is-resizing {
+    height: 60%;
+    top: 20%;
+  }
+
+
+
+  
+
+}
+
+.table-thead-tr:nth-last-child(2) {
+  .table-max-header-cell-wrapper {
+    border-bottom: none !important;
+  }
+}
+
+.table-max-header-cell-wrapper {
+  font-weight: @global-table-max-header-font-weight;
+}
+
+.table-filter-tr {
+  border-top: 1px solid @tableColor2;
+
+  .table-filter-th {
+    text-align: center;
+    vertical-align: top;
+    padding: 6px 4px;
+
+    .custom-light-select:not(.custom-light-select-customize-input) .custom-light-select-selector {
+      border-radius: 2px;
+      background-color: @global-curd-input-background-color;
+      padding: 0 2px;
+    }
+
+    .custom-dark-select:not(.custom-dark-select-customize-input) .custom-dark-select-selector {
+      border-radius: 2px;
+      background-color: @global-curd-input-background-color;
+      padding: 0 2px;
+    }
+
+    .custom-light-input-number {
+      width: 100% !important;
+      border-radius: 2px;
+      background-color: @global-curd-input-background-color;
+    }
+
+    .custom-dark-input-number {
+      width: 100% !important;
+      border-radius: 2px;
+      background-color: @global-curd-input-background-color;
+    }
+
+    .custom-dark-select-single .custom-dark-select-selector .custom-dark-select-selection-search {
+      left: 2px;
+      right: 2px;
+    }
+
+    .custom-dark-select-single .custom-dark-select-clear {
+      background: transparent;
+    }
+
+    .custom-light-select-single .custom-light-select-selector .custom-light-select-selection-search {
+      left: 2px;
+      right: 2px;
+    }
+
+    .custom-dark-picker {
+      padding: 4px;
+      background: @global-curd-input-background-color;
+    }
+
+    .custom-dark-input-affix-wrapper,
+    .custom-dark-picker-input .custom-dark-picker-clear {
+      background: @global-curd-input-background-color;
+    }
+
+    .custom-light-picker {
+      padding: 4px;
+      background: @global-curd-input-background-color;
+    }
+
+    .custom-light-input-affix-wrapper,
+    .custom-light-input,
+    .custom-light-picker-input .custom-light-picker-clear {
+      background: @global-curd-input-background-color;
+    }
+  }
+}
+
+.column-resizing-divide-line {
+  height: 300px;
+  width: 2px;
+  position: fixed;
+  z-index: 99999;
+  // background-color: #000;
+  background-color: green;
+}
+.column-resizing-divide-line {
+  will-change: transform;
+  backface-visibility: hidden;
+  transform: translate3d(0, 0, 0);
+  contain: strict;
+  cursor: ew-resize;
 }

package/dist/components/TableMax/TableMax.js

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { MinusSquareOutlined, PlusSquareOutlined } from '@ant-design/icons';
 import { getCoreRowModel, getExpandedRowModel, getFacetedUniqueValues, getFilteredRowModel, getSortedRowModel, useReactTable } from '@tanstack/react-table';
 import { useUpdateEffect } from 'ahooks';
-import { Button, Checkbox, Form, Pagination, Upload } from 'antd';
+import { Button, Checkbox, Form, Pagination, Tooltip, Upload } from 'antd';
 import dayjs from 'dayjs';
 import { cloneDeep, debounce } from 'lodash';
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
@@ -195,7 +195,8 @@ var TableMax = function TableMax(_ref) {
     hasTotalRow = _ref.hasTotalRow,
     totalDatas = _ref.totalDatas,
     pageSizeOptions = _ref.pageSizeOptions,
-    openMemo = _ref.openMemo;
+    openMemo = _ref.openMemo,
+    getDynamicFilterOptionsFn = _ref.getDynamicFilterOptionsFn;
   var tableMaxRef = useRef(null);
   // 表格元素
   var tableContentRef = useRef(null);
@@ -984,7 +985,8 @@ var TableMax = function TableMax(_ref) {
     columnResizeMode: columnResizeMode,
     disableColumnDrag: disableColumnDrag,
     compactMode: compactMode,
-    manualFiltering: manualFiltering
+    manualFiltering: manualFiltering,
+    getDynamicFilterOptionsFn: getDynamicFilterOptionsFn
   };
   var tableBodyProps = {
     tableContentRef: tableContentRef,
@@ -1116,39 +1118,68 @@ var TableMax = function TableMax(_ref) {
                 request: request
               })));
             }
-          }), canRefresh && /*#__PURE__*/_jsx("i", {
-            className: "iconfont-table icon-table-shuaxin handleRightItem",
-            style: {
-              fontSize: '16px',
-              marginRight: 0
-            },
-            onClick: function onClick() {
-              return refreshFun === null || refreshFun === void 0 ? void 0 : refreshFun();
-            }
+          }), canRefresh && /*#__PURE__*/_jsx(Tooltip, {
+            placement: "top",
+            title: '刷新',
+            children: /*#__PURE__*/_jsx("i", {
+              className: "iconfont-table icon-table-shuaxin handleRightItem",
+              style: {
+                fontSize: '16px',
+                marginRight: 0
+              },
+              onClick: function onClick() {
+                return refreshFun === null || refreshFun === void 0 ? void 0 : refreshFun();
+              }
+            })
           }), canEditting && /*#__PURE__*/_jsx("span", {
             className: canClickEditIcon ? undefined : 'disableBtn',
+            children: /*#__PURE__*/_jsx(Tooltip, {
+              placement: "top",
+              title: '编辑',
+              children: /*#__PURE__*/_jsx("i", {
+                className: "iconfont-other icon-other-bianji handleRightItem",
+                style: {
+                  fontSize: '16px',
+                  marginRight: 0
+                },
+                onClick: editFun
+              })
+            })
+          }), canDelete && /*#__PURE__*/_jsx(Tooltip, {
+            placement: "top",
+            title: '删除',
             children: /*#__PURE__*/_jsx("i", {
-              className: "iconfont-other icon-other-bianji handleRightItem",
+              className: "iconfont-table icon-table-delete handleRightItem",
               style: {
                 fontSize: '16px',
                 marginRight: 0
               },
-              onClick: editFun
+              onClick: handleClickDelete
+            })
+          }), canFilter && /*#__PURE__*/_jsx(Tooltip, {
+            placement: "top",
+            title: '重置筛选',
+            children: /*#__PURE__*/_jsx("i", {
+              className: "iconfont-table icon-table-refresh handleRightItem",
+              style: {
+                fontSize: '16px',
+                marginRight: 0
+              },
+              onClick: function onClick() {
+                setColumnFilters(defaultColumnFilters);
+              }
+            })
+          }), canCompact && /*#__PURE__*/_jsx(Tooltip, {
+            placement: "top",
+            title: compactMode ? '标准模式' : '紧凑模式',
+            children: /*#__PURE__*/_jsx("i", {
+              className: "iconfont-table ".concat(compactMode ? 'icon-table-normal' : 'icon-table-tight', "  handleRightItem"),
+              style: {
+                fontSize: '16px',
+                marginRight: 0
+              },
+              onClick: changeCompactMode
             })
-          }), canDelete && /*#__PURE__*/_jsx("i", {
-            className: "iconfont-table icon-table-delete handleRightItem",
-            style: {
-              fontSize: '16px',
-              marginRight: 0
-            },
-            onClick: handleClickDelete
-          }), canCompact && /*#__PURE__*/_jsx("i", {
-            className: "iconfont-table ".concat(compactMode ? 'icon-table-normal' : 'icon-table-tight', "  handleRightItem"),
-            style: {
-              fontSize: '16px',
-              marginRight: 0
-            },
-            onClick: changeCompactMode
           }), canSetting && /*#__PURE__*/_jsx(ColumnSetting, {
             table: table,
             tableId: tableId,

package/dist/components/TableMax/components/ColumnEdit/components/numberRange/index.less

@@ -1,3 +1,3 @@
-.tableMax-edit-numberRangeWrapper {
-  display: flex;
+.tableMax-edit-numberRangeWrapper {
+  display: flex;
 }