@arim-aisdc/public-components 2.3.90 → 2.3.92

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/CustomForm/CustomForm.js

@@ -328,6 +328,7 @@ var CustomForm = function CustomForm(_ref, ref) {
                   return /*#__PURE__*/_jsx(Option, {
                     value: el2.value,
                     label: el2.label,
+                    disabled: (el2 === null || el2 === void 0 ? void 0 : el2.disabled) || false,
                     children: el2.color ? /*#__PURE__*/_jsx(Badge, {
                       color: el2.color,
                       text: el2.label
@@ -339,6 +340,7 @@ var CustomForm = function CustomForm(_ref, ref) {
               return /*#__PURE__*/_jsx(Option, {
                 value: el.value,
                 label: el.label,
+                disabled: (el === null || el === void 0 ? void 0 : el.disabled) || false,
                 children: el.color ? /*#__PURE__*/_jsx(Badge, {
                   color: el.color,
                   text: el.label

package/dist/components/TableMax/TableMax.js

@@ -533,22 +533,18 @@ var TableMax = function TableMax(_ref) {
     var arr = newColumnOrder;
     if (!tableId) {
       setColumnOrder(arr);
-      console.log(arr, '表格列顺序1');
       return;
     }
     var cache = JSON.parse((_localStorage$getItem = localStorage.getItem(tableKey)) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : '{}');
     if (version && version !== (cache === null || cache === void 0 ? void 0 : cache.version)) {
       setColumnOrder(arr);
-      console.log(arr, '表格列顺序2');
       return;
     }
     ;
     if (cache && tableMaxConfig.cacheMaxAge && cache !== null && cache !== void 0 && cache.editTime && +new Date() - cache.editTime > ((_tableMaxConfig$cache = tableMaxConfig.cacheMaxAge) !== null && _tableMaxConfig$cache !== void 0 ? _tableMaxConfig$cache : CACHE_MAX_AGE)) {
       setColumnOrder(arr);
-      console.log(arr, '表格列顺序3');
       return;
     }
-    console.log(tableKey, cache, '表格缓存数据');
     var columnsIdSet = new Set(tableColumns.map(function (column) {
       return column.id;
     }));
@@ -598,7 +594,7 @@ var TableMax = function TableMax(_ref) {
       var newColumnSorting = (cacheColumnSorting === null || cacheColumnSorting === void 0 ? void 0 : cacheColumnSorting.filter(function (item) {
         return tableColumnIds.includes(item.id);
       })) || [];
-      setColumnFilters(newColumnFilters);
+      setColumnFilters(canFilter ? newColumnFilters : []);
       setSorting(newColumnSorting);
     }
 
@@ -765,7 +761,7 @@ var TableMax = function TableMax(_ref) {
 
   // 初始化列
   useEffect(function () {
-    console.log("tableId", tableId, !tableMaxRef.current || !tableContentRef.current || !tableId);
+    // console.log("tableId", tableId, !tableMaxRef.current || !tableContentRef.current || !tableId)
     if (!tableMaxRef.current || !tableContentRef.current || !tableId) return;
     if (!Array.isArray(columns) || columns.length === 0) return;
     // 根据props，自动增加勾选列/展开列
@@ -779,7 +775,7 @@ var TableMax = function TableMax(_ref) {
       var _column$columns;
       return (column === null || column === void 0 ? void 0 : column.columns) && ((_column$columns = column.columns) === null || _column$columns === void 0 ? void 0 : _column$columns.length) > 0;
     }) > -1);
-  }, [columns, tableId]);
+  }, [columns, tableId, canFilter]);
   var _rowSelectionChange = useCallback(debounce(function (rowOriginal, row) {
     if (rowSelectionChange) {
       rowSelectionChange(rowOriginal, row);
@@ -856,7 +852,7 @@ var TableMax = function TableMax(_ref) {
     if (!tableId) return;
     cacheTimer.current = setTimeout(function () {
       var tableState = table.getState();
-      console.log('缓存表格状态：', {
+      console.log('缓存表格状态：', tableKey, {
         enableFilters: enableFilters,
         headerRowNum: headerRowNum,
         compactMode: compactMode,

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

@@ -47,36 +47,12 @@ var TextFilter = function TextFilter(_ref) {
       value: FilterOperator.IsNotNull
     }];
   }, [t]);
-
-  // Parse initial value
-  var parseInitialValue = useCallback(function () {
-    var _value$filterValue;
-    if (value === undefined || value === null || value === '') {
-      return {
-        operator: FilterOperator.Contains,
-        filterValue: ''
-      };
-    }
-
-    // Old format: string
-    if (typeof value === 'string') {
-      return {
-        operator: FilterOperator.Contains,
-        filterValue: value
-      };
-    }
-
-    // New format: { filterValue, operator }
-    return {
-      operator: value.operator || FilterOperator.Contains,
-      filterValue: (_value$filterValue = value.filterValue) !== null && _value$filterValue !== void 0 ? _value$filterValue : ''
-    };
-  }, [value]);
-  var _useState = useState(parseInitialValue().operator),
+  var prevResult = useRef();
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     operator = _useState2[0],
     setOperator = _useState2[1];
-  var _useState3 = useState(parseInitialValue().filterValue),
+  var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
     filterValue = _useState4[0],
     setFilterValue = _useState4[1];
@@ -92,7 +68,7 @@ var TextFilter = function TextFilter(_ref) {
     setBetweenValue2 = _useState8[1];
 
   // 记录上一次的 filterValue，用于判断空值切换
-  var _useState9 = useState(parseInitialValue().filterValue),
+  var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
     prevFilterValue = _useState10[0],
     setPrevFilterValue = _useState10[1];
@@ -109,9 +85,37 @@ var TextFilter = function TextFilter(_ref) {
     return !val || val.trim() === '';
   }, []);
 
+  // Parse initial value
+  var parseInitialValue = useMemo(function () {
+    var _value$filterValue;
+    if (value === undefined || value === null || value === '') {
+      if (prevResult.current) {
+        return prevResult.current;
+      }
+      return {
+        operator: FilterOperator.Contains,
+        filterValue: ''
+      };
+    }
+
+    // Old format: string
+    if (typeof value === 'string') {
+      return {
+        operator: FilterOperator.Contains,
+        filterValue: value
+      };
+    }
+
+    // New format: { filterValue, operator }
+    return {
+      operator: value.operator || FilterOperator.Contains,
+      filterValue: (_value$filterValue = value.filterValue) !== null && _value$filterValue !== void 0 ? _value$filterValue : ''
+    };
+  }, [value]);
+
   // Sync with external value changes
   useEffect(function () {
-    var parsed = parseInitialValue();
+    var parsed = parseInitialValue;
     setOperator(parsed.operator);
     setFilterValue(parsed.filterValue);
     setPrevFilterValue(parsed.filterValue);
@@ -125,17 +129,18 @@ var TextFilter = function TextFilter(_ref) {
   var buildResult = useCallback(function (finalFilterValue, finalOperator) {
     var _map$finalOperator;
     var map = _defineProperty(_defineProperty({}, FilterOperator.IsNotNull, 'NOTNULL'), FilterOperator.IsNull, 'NULL');
-    var result = {
+    prevResult.current = {
       filterValue: (_map$finalOperator = map[finalOperator]) !== null && _map$finalOperator !== void 0 ? _map$finalOperator : finalFilterValue,
       operator: finalOperator
     };
-
-    // // Backward compatibility: if operator is FilterOperator.Contains and value is simple string, also support old format
-    // if (finalOperator === FilterOperator.Contains && typeof finalFilterValue === 'string' && !finalFilterValue.includes(',')) {
-    //   return finalFilterValue;
-    // }
-
-    return result;
+    if (map[finalOperator] || typeof finalFilterValue === 'string' && finalFilterValue || _typeof(finalFilterValue) === 'object' && (finalFilterValue !== null && finalFilterValue !== void 0 && finalFilterValue[0] || finalFilterValue !== null && finalFilterValue !== void 0 && finalFilterValue[1])) {
+      var _map$finalOperator2;
+      return {
+        filterValue: (_map$finalOperator2 = map[finalOperator]) !== null && _map$finalOperator2 !== void 0 ? _map$finalOperator2 : finalFilterValue,
+        operator: finalOperator
+      };
+    }
+    return undefined;
   }, []);
 
   // 处理空值切换判断和触发回调
@@ -276,7 +281,8 @@ var TextFilter = function TextFilter(_ref) {
       value: inputValue,
       onChange: handleInputChange,
       placeholder: '请输入',
-      allowClear: true
+      allowClear: true,
+      disabled: inputValue === 'NULL' || inputValue === 'NOTNULL'
     });
   }, [operator, filterValue, handleInputChange, t]);
 
@@ -329,7 +335,8 @@ var TextFilter = function TextFilter(_ref) {
       color: "default",
       type: "link",
       onClick: function onClick() {
-        return onChange(null);
+        prevResult.current = null;
+        onChange(null);
       },
       style: {
         marginLeft: '140px'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.90",
+  "version": "2.3.92",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",
@@ -48,7 +48,7 @@
   "dependencies": {
     "@ant-design/icons": "^5.3.7",
     "@ant-design/pro-components": "^2.7.10",
-    "@arim-aisdc/public-components": "^2.3.82",
+    "@arim-aisdc/public-components": "^2.3.90",
     "@tanstack/match-sorter-utils": "^8.8.4",
     "@tanstack/react-table": "^8.9.1",
     "@tanstack/react-virtual": "^3.13.12",