@fe-free/core 1.5.1 → 1.5.3

package/CHANGELOG.md

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "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.1"
+    "@fe-free/tool": "1.5.3"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "^2.8.7",

package/src/crud/crud_of_simple.tsx

@@ -101,6 +101,8 @@ function CRUDOfSimpleComponent(props: CRUDOfSimpleProps, ref: React.ForwardedRef
           ghost: true,
           columns: newColumns,
           toolBarRender,
+          // 简单的隐藏搜索栏
+          search: false,
         }}
       />
     </div>

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;
@@ -33,24 +52,6 @@ function Edit<T>(props: {
   );
 }
 
-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 +70,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"

package/src/table/index.tsx

@@ -37,6 +37,23 @@ function Table<
 
   const hasSearch = !!newColumns?.find((column) => column.search);
 
+  let newSearch: any = undefined;
+  if (hasSearch) {
+    newSearch = {
+      labelWidth: 'auto',
+      defaultCollapsed: false,
+      ...search,
+    };
+  } else if (search === false) {
+    newSearch = false;
+  } else {
+    newSearch = {
+      ...search,
+    };
+  }
+
+  console.log('newSearch', newSearch);
+
   return (
     <ProTable<DataSource, Params>
       cardBordered
@@ -46,17 +63,7 @@ function Table<
       // @ts-ignore 不会处理这里的 ts，或者成本大
       columns={newColumns}
       scroll={getTableScroll(newColumns)}
-      search={
-        hasSearch
-          ? {
-              labelWidth: 'auto',
-              defaultCollapsed: false,
-              ...search,
-            }
-          : {
-              ...search,
-            }
-      }
+      search={newSearch}
       {...rest}
     />
   );