@arim-aisdc/public-components 2.3.88 → 2.3.89

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 | JSX.Element | Element;
+    text: string | Element | JSX.Element;
     units?: string;
     width?: string;
     labelWidth?: string;

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

@@ -124,7 +124,7 @@ var TextFilter = function TextFilter(_ref) {
   // 构建最终的 filterValue
   var buildResult = useCallback(function (finalFilterValue, finalOperator) {
     var _map$finalOperator;
-    var map = _defineProperty(_defineProperty({}, FilterOperator.IsNotNull, 'NOT NULL'), FilterOperator.IsNull, 'NULL');
+    var map = _defineProperty(_defineProperty({}, FilterOperator.IsNotNull, 'NOTNULL'), FilterOperator.IsNull, 'NULL');
     var result = {
       filterValue: (_map$finalOperator = map[finalOperator]) !== null && _map$finalOperator !== void 0 ? _map$finalOperator : finalFilterValue,
       operator: finalOperator
@@ -227,11 +227,11 @@ var TextFilter = function TextFilter(_ref) {
     };
   }, []);
 
-  // Quick input for NULL/NOT NULL
+  // Quick input for NULL/NOTNULL
   var renderQuickInput = useCallback(function () {
     if (!openNullValueFilter) return null;
     var isNullSelected = typeof value === 'string' && value.toUpperCase().trim() === 'NULL';
-    var isNotNullSelected = typeof value === 'string' && (value.toUpperCase().trim() === 'NOT NULL' || value.toUpperCase().trim() === 'NOTNULL');
+    var isNotNullSelected = typeof value === 'string' && (value.toUpperCase().trim() === 'NOTNULL' || value.toUpperCase().trim() === 'NOTNULL');
     return /*#__PURE__*/_jsxs("div", {
       className: "quickly-input",
       children: [/*#__PURE__*/_jsx("p", {
@@ -251,10 +251,10 @@ var TextFilter = function TextFilter(_ref) {
         onClick: function onClick() {
           return onChange({
             operator: FilterOperator.IsNotNull,
-            filterValue: 'NOT NULL'
+            filterValue: 'NOTNULL'
           });
         },
-        children: "\u975E\u7A7A\u503C(NOT NULL)"
+        children: "\u975E\u7A7A\u503C(NOTNULL)"
       })]
     });
   }, [openNullValueFilter, value, onChange]);
@@ -290,9 +290,11 @@ var TextFilter = function TextFilter(_ref) {
         onChange: handleBetweenValue1Change,
         placeholder: '起始值',
         allowClear: true
-      }), /*#__PURE__*/_jsx("span", {
-        className: "text-filter-between-separator",
-        children: "-"
+      }), /*#__PURE__*/_jsx("p", {
+        className: "split-wrapper",
+        children: /*#__PURE__*/_jsx("span", {
+          className: "horizontal-line"
+        })
       }), /*#__PURE__*/_jsx(Input, {
         className: "text-filter-input",
         value: betweenValue2,

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

@@ -49,11 +49,19 @@
         width: 100%
       }
 
-      .text-filter-between-separator {
-        color: #666;
-        flex-shrink: 0;
+    .split-wrapper {
+      margin: 5px 0px;
+      display: flex;
+      justify-content: center;
+      .horizontal-line {
+        height: 2px;
+        display: inline-block;
+        background: @tableColor4;
+        width: 12px;
       }
     }
+      
+    }
   }
 
   .quickly-input {

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) => 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;
 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) => 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;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/dist/components/TableMax/utils.js

@@ -201,7 +201,7 @@ export var getFormatFiltersV2 = function getFormatFiltersV2(columns, originFilte
       res.operator = JSON.stringify(res.value) === '["NULL"]' ? FilterOperator.IsNull : FilterOperator.In;
     } else if (filterType === FilterType.Input || filterType === FilterType.AutoComplete) {
       // Input组件
-      if (res.value === 'string') {
+      if (typeof value === 'string') {
         var _value$toUpperCase;
         var upperValue = value === null || value === void 0 || (_value$toUpperCase = value.toUpperCase()) === null || _value$toUpperCase === void 0 ? void 0 : _value$toUpperCase.trim();
         res.value = splitString(value + '');
@@ -209,10 +209,10 @@ export var getFormatFiltersV2 = function getFormatFiltersV2(columns, originFilte
       } else {
         var _operatorMap$_upperVa;
         // 1. 简化变量处理：合并空值判断 + 类型转换
-        var _upperValue = (value === null || value === void 0 ? void 0 : value.toString().toUpperCase().trim()) || '';
         var _ref7 = value || {},
           filterValue = _ref7.filterValue,
           operator = _ref7.operator;
+        var _upperValue = (filterValue === null || filterValue === void 0 ? void 0 : filterValue.toString().toUpperCase().trim()) || '';
 
         // 2. 拆分 operator 逻辑：用对象映射替代多层三元，更易维护
         var operatorMap = {

package/package.json

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