@fe-free/core 1.5.0 → 1.5.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 1.5.2
+
+### Patch Changes
+
+- fix: crud search
+  - @fe-free/tool@1.5.2
+
+## 1.5.1
+
+### Patch Changes
+
+- fix: form
+  - @fe-free/tool@1.5.1
+
 ## 1.5.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "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.0"
+    "@fe-free/tool": "1.5.2"
   },
   "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

@@ -11,7 +11,7 @@ function Edit<T>(props: {
   onChange: (values: T) => void;
   detailForm: JSX.Element;
   editForm?: any;
-  disabledAddFormSubmitter?: boolean;
+  disabledSubmitter?: boolean;
 }) {
   const handleFinish = async (newValues) => {
     props.onChange(newValues as T);
@@ -26,31 +26,7 @@ function Edit<T>(props: {
       onFinish={handleFinish}
       formRef={props?.editForm}
       initialValues={props.values || undefined}
-      submitter={
-        props.disabledAddFormSubmitter
-          ? false
-          : {
-              render: (props, defaultDoms) => {
-                return [
-                  <div
-                    key="cancel"
-                    className="pr-[20px] w-[500px] pt-[12px]"
-                    style={{ borderTop: '1px solid rgba(0, 0, 0, 0.1)' }}
-                  >
-                    <div className="custom-button-container">
-                      {React.Children.map(defaultDoms, (dom) => {
-                        return React.cloneElement(dom, {
-                          className:
-                            'w-[88px] h-[40px] text-base rounded-[0.5rem] ml-3' +
-                            (dom.props?.className || ''),
-                        });
-                      })}
-                    </div>
-                  </div>,
-                ];
-              },
-            }
-      }
+      submitter={props.disabledSubmitter ? false : undefined}
     >
       {props.detailForm}
     </ModalForm>
@@ -66,7 +42,7 @@ interface ProFormListModalHelperProps<T> {
   // 如果 addForm 存在，则使用 addForm 作为添加按钮
   addForm?: JSX.Element;
   // 禁用添加的提交按钮
-  disabledAddFormSubmitter?: boolean;
+  disabledSubmitter?: boolean;
 
   disabledAdd?: boolean;
   // 触发添加
@@ -129,7 +105,7 @@ function ProFormListModalHelper<T = any>(props: ProFormListModalHelperProps<T>)
             }}
             detailForm={props.addForm || props.detailForm}
             editForm={props?.editForm}
-            disabledAddFormSubmitter={props.disabledAddFormSubmitter}
+            disabledSubmitter={props.disabledSubmitter}
           >
             {props.addTrigger || (
               <Button size="small" icon={<PlusOutlined />}>

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}
     />
   );