@arim-aisdc/public-components 2.3.23 → 2.3.25

package/dist/components/TableMax/components/ColumnFilterV2/Filter.js

@@ -163,7 +163,10 @@ var Filter = function Filter(_ref) {
     fetchOptions(value);
   }, 500), [fetchOptions]);
   useEffect(function () {
-    if ([FilterType.MultiSelect, FilterType.SingleSelect].includes(filterType)) {
+    if ([FilterType.MultiSelect].includes(filterType)) {
+      // 打开后自动获取可选值
+      fetchOptions(columnFilterValue);
+    } else if ([FilterType.SingleSelect].includes(filterType)) {
       // 打开后自动获取可选值
       var _ref3 = columnFilterValue || {},
         optionsParam = _ref3.optionsParam;

package/dist/components/TableMax/components/ColumnFilterV2/SingleSelect/index.js

@@ -61,11 +61,12 @@ var SingleSelect = function SingleSelect(_ref) {
       optionsParam = _ref3.optionsParam;
     setInnerValue(filterValue);
     setInputSearchValue(optionsParam);
-    if (!isFrontSearch) {
-      onSearch(optionsParam);
-    }
+    // if (!isFrontSearch) {
+    //   onSearch(optionsParam);
+    // } 
   }, [value]);
   var handleInputChange = function handleInputChange(e) {
+    isFirstScroll.current = false;
     var value = e.target.value;
     setInputSearchValue(value);
     if (!isFrontSearch) {
@@ -79,7 +80,6 @@ var SingleSelect = function SingleSelect(_ref) {
     function scrollToSelectedItem() {
       var selectedElement = document.querySelector(".item[data-id=".concat(value.filterValue, "]"));
       if (!selectedElement) return;
-      isFirstScroll.current = false;
       if (selectedElement) {
         selectedElement.scrollIntoView({
           behavior: 'smooth',

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

@@ -10,18 +10,27 @@
 
 .filter-panel-wrapper {
   position: fixed;
-  z-index: 9999;
+  // z-index: 9999;
   border-radius: 2px;
   width: fit-content;
+  height: fit-content;
   box-shadow: 0px 5px 12px 4px rgba(3, 6, 33, 0.15);
   background: @tableSettingModalBgc;
   // border: 1px solid #d9d9d9;
   transform: translateX(-100%);
 }
 
+:global {
+  .ant-select-dropdown {
+    position: relative;
+    z-index: 9999;
+  }
+}
+
 .single-com-wrapper {
   padding: 8px 12px;
   border-radius: 2px;
+  position: relative;
 }
 
 .filter-icon-wrapper {

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 | -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) => 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 | -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

@@ -125,6 +125,10 @@ export var getFormatFilters = function getFormatFilters(columns, originFilters)
       // 多选组件
       formatFilters["".concat(formatKey, "List")] = value;
       // formatFilters[formatKey] = value;
+    } else if (filterType === FilterType.SingleSelect) {
+      // 单选组件
+      formatFilters[formatKey] = value.filterValue;
+      // formatFilters[formatKey] = value;
     } else {
       // 其他
       formatFilters[formatKey] = value;
@@ -195,8 +199,11 @@ export var getFormatFiltersV2 = function getFormatFiltersV2(columns, originFilte
       // Input组件
       res.operator = FilterOperator.Contains;
       res.value = value;
+    } else if (filterType === FilterType.SingleSelect) {
+      res.operator = FilterOperator.Eq;
+      res.value = value.filterValue;
     } else {
-      // 其他组件: SingleDate/SingleNumber/SingleSelect
+      // 其他组件: SingleDate/SingleNumber
       res.operator = FilterOperator.Eq;
       res.value = value;
     }

package/package.json

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