@teamias/rex-pro 0.0.10 → 0.0.11

package/dist/components/filter-form/v1/filter-form.js

@@ -71,8 +71,9 @@ export var FilterForm = function FilterForm(_ref) {
         fetchLoading: false,
         fields: [],
         currentInit: true,
-        customFields: [],
-        selectedCustomFields: []
+        allFields: [],
+        // 单一数据源
+        selectedCustomFieldKeys: new Set() // 使用 Set 存储选中的自定义字段 key
       };
     }),
     state = _useStateData.state,
@@ -134,40 +135,57 @@ export var FilterForm = function FilterForm(_ref) {
   useEffect(function () {
     if (loading) return;
     var allFields = cloneDeep(fields);
+    state.allFields = allFields;
 
-    // 分离自定义字段和普通字段
-    var customFields = allFields.filter(function (field) {
+    // 清理已选择的自定义字段keys，移除那些不再是自定义字段的项
+    var currentCustomFieldKeys = new Set(allFields.filter(function (field) {
       return field.isCustom;
-    });
+    }).map(function (field) {
+      return field.field;
+    }));
+
+    // 只保留仍然是自定义字段的选中项
+    var validSelectedKeys = new Set(_toConsumableArray(state.selectedCustomFieldKeys).filter(function (key) {
+      return currentCustomFieldKeys.has(key);
+    }));
+
+    // 如果选中的keys发生了变化，更新状态
+    if (validSelectedKeys.size !== state.selectedCustomFieldKeys.size) {
+      state.selectedCustomFieldKeys = validSelectedKeys;
+    }
+
+    // 筛选出普通字段（非自定义字段）
     var normalFields = allFields.filter(function (field) {
       return !field.isCustom;
     });
 
+    // 筛选出已选择的自定义字段
+    var selectedCustomFields = allFields.filter(function (field) {
+      return field.isCustom && state.selectedCustomFieldKeys.has(field.field);
+    });
+
     // 合并普通字段和已选择的自定义字段
-    var combinedFields = [].concat(_toConsumableArray(normalFields), _toConsumableArray(state.selectedCustomFields));
+    var combinedFields = [].concat(_toConsumableArray(normalFields), _toConsumableArray(selectedCustomFields));
     if (displayType === 'average') {
       state.fields = combinedFields;
-      state.customFields = customFields;
       state.currentInit = false;
       update();
     } else {
       handlerSelectStyle(combinedFields);
       state.fields = combinedFields;
-      state.customFields = customFields;
       state.currentInit = false;
       update();
     }
-  }, [fields, state.selectedCustomFields]);
+  }, [fields, state.selectedCustomFieldKeys]);
 
   // 创建下拉菜单内容
   var getDropdownMenu = function getDropdownMenu() {
-    var _state$customFields;
-    // 使用 Map 来快速查找已选择的字段
-    var selectedFieldsMap = new Map(state.selectedCustomFields.map(function (field) {
-      return [field.field, field];
-    }));
-    var items = (_state$customFields = state.customFields) === null || _state$customFields === void 0 ? void 0 : _state$customFields.map(function (field) {
-      var isSelected = selectedFieldsMap.has(field.field);
+    // 筛选出所有自定义字段
+    var customFields = state.allFields.filter(function (field) {
+      return field.isCustom;
+    });
+    var items = customFields.map(function (field) {
+      var isSelected = state.selectedCustomFieldKeys.has(field.field);
       return {
         key: field.field,
         label: /*#__PURE__*/_jsx("div", {
@@ -194,26 +212,17 @@ export var FilterForm = function FilterForm(_ref) {
 
   // 切换自定义字段的显示状态
   var handleToggleCustomField = function handleToggleCustomField(fieldKey) {
-    // 使用 Map 来快速查找已选择的字段
-    var selectedFieldsMap = new Map(state.selectedCustomFields.map(function (field) {
-      return [field.field, field];
-    }));
-    var customFieldsMap = new Map(state.customFields.map(function (field) {
-      return [field.field, field];
-    }));
-    var isSelected = selectedFieldsMap.has(fieldKey);
+    var isSelected = state.selectedCustomFieldKeys.has(fieldKey);
     if (isSelected) {
       // 移除字段
-      state.selectedCustomFields = state.selectedCustomFields.filter(function (field) {
-        return field.field !== fieldKey;
-      });
+      state.selectedCustomFieldKeys.delete(fieldKey);
     } else {
       // 添加字段
-      var fieldToAdd = customFieldsMap.get(fieldKey);
-      if (fieldToAdd) {
-        state.selectedCustomFields = [].concat(_toConsumableArray(state.selectedCustomFields), [fieldToAdd]);
-      }
+      state.selectedCustomFieldKeys.add(fieldKey);
     }
+
+    // 创建新的 Set 以触发状态更新
+    state.selectedCustomFieldKeys = new Set(state.selectedCustomFieldKeys);
     update();
   };
   useImperativeHandle(actionRef, function () {
@@ -300,7 +309,9 @@ export var FilterForm = function FilterForm(_ref) {
                   id: 'pro.components.filter-form.search',
                   defaultMessage: '查询'
                 })
-              }), state.customFields.length > 0 && /*#__PURE__*/_jsx(Dropdown, {
+              }), state.allFields.filter(function (field) {
+                return field.isCustom;
+              }).length > 0 && /*#__PURE__*/_jsx(Dropdown, {
                 menu: getDropdownMenu(),
                 trigger: ['click'],
                 placement: "bottomLeft",

package/dist/index.d.ts

@@ -49,6 +49,7 @@ export declare const proLocales: {
                 "filter-form": {
                     reset: string;
                     search: string;
+                    "custom-filters": string;
                 };
             };
         };

package/dist/locales/en-US.json

@@ -19,7 +19,8 @@
       },
       "filter-form": {
         "reset": "Reset",
-        "search": "Search"
+        "search": "Search",
+        "custom-filters": "Custom filters"
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-pro",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",