@fe-free/core 1.5.2 → 1.5.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 1.5.4
+
+### Patch Changes
+
+- fix: form_list_modal_helper
+  - @fe-free/tool@1.5.4
+
+## 1.5.3
+
+### Patch Changes
+
+- feat: ProFormListModalHelper
+  - @fe-free/tool@1.5.3
+
 ## 1.5.2
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -36,7 +36,7 @@
     "react-syntax-highlighter": "^15.5.0",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "1.5.2"
+    "@fe-free/tool": "1.5.4"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "^2.8.7",

package/src/form/form_list/form_list_modal_helper.tsx

@@ -5,6 +5,25 @@ import React from 'react';
 
 const emptyArr = [];
 
+interface ProFormListModalHelperProps<T> {
+  value?: T[];
+  onChange?: (value: T[]) => void;
+  children: (props: { value?: T[]; item: T; index: number }) => React.ReactNode;
+  readOnly?: boolean;
+  detailForm: JSX.Element;
+  // 如果 addForm 存在，则使用 addForm 作为添加按钮
+  addForm?: JSX.Element;
+  // 禁用添加的提交按钮
+  disabledSubmitter?: boolean;
+  // 禁用添加
+  disabledAdd?: boolean;
+  // 禁用编辑
+  disabledEdit?: boolean;
+  // 触发添加
+  addTrigger?: JSX.Element;
+  editForm?: any;
+}
+
 function Edit<T>(props: {
   children: JSX.Element;
   values?: T;
@@ -27,30 +46,15 @@ function Edit<T>(props: {
       formRef={props?.editForm}
       initialValues={props.values || undefined}
       submitter={props.disabledSubmitter ? false : undefined}
+      modalProps={{
+        destroyOnHidden: true,
+      }}
     >
       {props.detailForm}
     </ModalForm>
   );
 }
 
-interface ProFormListModalHelperProps<T> {
-  value?: T[];
-  onChange?: (value: T[]) => void;
-  children: (props: { value?: T[]; item: T; index: number }) => React.ReactNode;
-  readOnly?: boolean;
-  detailForm: JSX.Element;
-  // 如果 addForm 存在，则使用 addForm 作为添加按钮
-  addForm?: JSX.Element;
-  // 禁用添加的提交按钮
-  disabledSubmitter?: boolean;
-
-  disabledAdd?: boolean;
-  // 触发添加
-  addTrigger?: JSX.Element;
-
-  editForm?: any;
-}
-
 function ProFormListModalHelper<T = any>(props: ProFormListModalHelperProps<T>) {
   const options = props.value || emptyArr;
 
@@ -69,18 +73,20 @@ function ProFormListModalHelper<T = any>(props: ProFormListModalHelperProps<T>)
               </div>
               {!props.readOnly && (
                 <div className="absolute right-1 top-1 hidden items-center bg-white group-hover:flex">
-                  <Edit<T>
-                    values={item}
-                    onChange={(newValues) => {
-                      const newOptions = [...options];
-                      newOptions[index] = newValues;
-                      props.onChange?.(newOptions);
-                    }}
-                    detailForm={props.detailForm}
-                    editForm={props?.editForm}
-                  >
-                    <Button icon={<EditOutlined />} type="text" size="small" />
-                  </Edit>
+                  {!props.disabledEdit && (
+                    <Edit<T>
+                      values={item}
+                      onChange={(newValues) => {
+                        const newOptions = [...options];
+                        newOptions[index] = newValues;
+                        props.onChange?.(newOptions);
+                      }}
+                      detailForm={props.detailForm}
+                      editForm={props?.editForm}
+                    >
+                      <Button icon={<EditOutlined />} type="text" size="small" />
+                    </Edit>
+                  )}
                   <Button
                     icon={<DeleteOutlined />}
                     type="text"