fix(search): update use search component

src/components/BaseCrud/index.tsx

@@ -83,11 +83,11 @@ const BaseCrud = <T extends Record<string, any>>(props: Props<T>) => {
           setParam(data);
         }}
         target={moduleName}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setParam({});
+        // }}
       />
       <ProTable<T>
         params={param}

src/pages/device/Instance/Detail/ChildDevice/BindChildDevice/index.tsx

@@ -122,17 +122,18 @@ const BindChildDevice = (props: Props) => {
       <SearchComponent<DeviceInstance>
         field={[...columns]}
         target="child-device-bind"
-        pattern={'simple'}
+        enableSave={false}
+        // pattern={'simple'}
         defaultParam={[{ column: 'parentId$isnull', value: '1' }]}
         onSearch={(param) => {
           actionRef.current?.reset?.();
           setSearchParams(param);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParams({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParams({});
+        // }}
       />
       <ProTable<DeviceInstance>
         search={false}

src/pages/device/Instance/Detail/ChildDevice/index.tsx

@@ -116,7 +116,8 @@ const ChildDevice = () => {
       <SearchComponent<LogItem>
         field={[...columns]}
         target="child-device"
-        pattern={'simple'}
+        enableSave={false}
+        // pattern={'simple'}
         defaultParam={[
           { column: 'parentId', value: InstanceModel?.detail?.id || '', termType: 'eq' },
         ]}
@@ -124,11 +125,11 @@ const ChildDevice = () => {
           actionRef.current?.reset?.();
           setSearchParams(param);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParams({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParams({});
+        // }}
       />
       <ProTable<LogItem>
         search={false}

src/pages/device/Instance/Detail/Log/index.tsx

@@ -86,16 +86,17 @@ const Log = () => {
       <SearchComponent<LogItem>
         field={[...columns]}
         target="logs"
-        pattern={'simple'}
+        enableSave={false}
+        // pattern={'simple'}
         onSearch={(param) => {
           actionRef.current?.reset?.();
           setSearchParams(param);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParams({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParams({});
+        // }}
       />
       <ProTable<LogItem>
         search={false}

src/pages/device/Instance/Detail/Running/Event/index.tsx

@@ -112,17 +112,18 @@ const EventLog = (props: Props) => {
       <SearchComponent<any>
         field={[...createColumn(), ...columns]}
         target="events"
-        pattern={'simple'}
+        enableSave={false}
+        // pattern={'simple'}
         onSearch={(param) => {
           // 重置分页数据
           actionRef.current?.reset?.();
           setSearchParams(param);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParams({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParams({});
+        // }}
       />
       <ProTable
         size="small"

src/pages/device/Instance/index.tsx

@@ -354,11 +354,11 @@ const Instance = () => {
           actionRef.current?.reset?.();
           setSearchParams(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParams({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParams({});
+        // }}
       />
       <ProTableCard<DeviceInstance>
         columns={columns}

src/pages/device/Product/Detail/Access/AccessConfig/index.tsx

@@ -111,7 +111,8 @@ const AccessConfig = (props: Props) => {
       <div className={styles.search}>
         <SearchComponent
           field={columns}
-          pattern={'simple'}
+          // pattern={'simple'}
+          enableSave={false}
           onSearch={(data: any) => {
             const dt = {
               pageSize: 4,
@@ -119,9 +120,9 @@ const AccessConfig = (props: Props) => {
             };
             handleSearch(dt);
           }}
-          onReset={() => {
-            handleSearch({ pageSize: 4 });
-          }}
+          // onReset={() => {
+          //   handleSearch({ pageSize: 4 });
+          // }}
         />
         <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
           <Button

src/pages/device/Product/index.tsx

@@ -261,11 +261,11 @@ const Product = observer(() => {
       <SearchComponent
         field={columns}
         onSearch={searchFn}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          searchFn({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   searchFn({});
+        // }}
       />
       <ProTableCard<ProductItem>
         columns={columns}

src/pages/link/AccessConfig/index.tsx

@@ -66,7 +66,8 @@ const AccessConfig = () => {
       <Card>
         <SearchComponent
           field={columns}
-          pattern={'simple'}
+          // pattern={'simple'}
+          enableSave={false}
           onSearch={(data: any) => {
             const dt = {
               pageSize: 10,
@@ -74,9 +75,9 @@ const AccessConfig = () => {
             };
             handleSearch(dt);
           }}
-          onReset={() => {
-            handleSearch({ pageSize: 10 });
-          }}
+          // onReset={() => {
+          //   handleSearch({ pageSize: 10 });
+          // }}
         />
         <div style={{ width: '100%', display: 'flex', justifyContent: 'flex-end' }}>
           <Button

src/pages/system/Department/Assets/deivce/bind.tsx

@@ -102,7 +102,8 @@ const Bind = observer((props: Props) => {
       />
       <SearchComponent<DeviceItem>
         field={columns}
-        pattern={'simple'}
+        enableSave={false}
+        // pattern={'simple'}
         defaultParam={[
           {
             column: 'id',
@@ -122,11 +123,11 @@ const Bind = observer((props: Props) => {
           actionRef.current?.reset?.();
           setSearchParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParam({});
+        // }}
         target="department-assets-device"
       />
       <ProTable<DeviceItem>

src/pages/system/Department/Assets/deivce/index.tsx

@@ -205,11 +205,11 @@ export default observer(() => {
           actionRef.current?.reset?.();
           setSearchParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParam({});
+        // }}
         target="department-assets-device"
       />
       <ProTable<DeviceItem>

src/pages/system/Department/Assets/product/bind.tsx

@@ -90,7 +90,8 @@ const Bind = observer((props: Props) => {
       />
       <SearchComponent<ProductItem>
         field={columns}
-        pattern={'simple'}
+        // pattern={'simple'}
+        enableSave={false}
         defaultParam={[
           {
             column: 'id',
@@ -110,11 +111,11 @@ const Bind = observer((props: Props) => {
           actionRef.current?.reset?.();
           setSearchParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParam({});
+        // }}
         target="department-assets-product"
       />
       <ProTable<ProductItem>

src/pages/system/Department/Assets/product/index.tsx

@@ -146,11 +146,11 @@ export default observer(() => {
           actionRef.current?.reset?.();
           setSearchParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParam({});
+        // }}
         target="department-assets-product"
       />
       <ProTable<ProductItem>

src/pages/system/Department/Assets/productCategory/bind.tsx

@@ -89,7 +89,8 @@ const Bind = observer((props: Props) => {
       />
       <SearchComponent<ProductCategoryItem>
         field={columns}
-        pattern="simple"
+        enableSave={false}
+        // pattern="simple"
         defaultParam={[
           {
             column: 'id',
@@ -109,11 +110,11 @@ const Bind = observer((props: Props) => {
           actionRef.current?.reset?.();
           setSearchParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParam({});
+        // }}
         target="department-assets-category"
       />
       <ProTable<ProductCategoryItem>

src/pages/system/Department/Assets/productCategory/index.tsx

@@ -166,11 +166,11 @@ export default observer(() => {
           actionRef.current?.reset?.();
           setSearchParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParam({});
+        // }}
         target="department-assets-category"
       />
       <ProTable<ProductCategoryItem>

src/pages/system/Department/Member/bind.tsx

@@ -77,18 +77,19 @@ const Bind = observer((props: Props) => {
       title="绑定"
     >
       <SearchComponent<UserItem>
-        pattern={'simple'}
+        // pattern={'simple'}
+        enableSave={false}
         field={columns}
         defaultParam={[{ column: 'id$in-dimension$org$not', value: param.id }]}
         onSearch={async (data) => {
           actionRef.current?.reset?.();
           setSearchParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParam({});
+        // }}
         target="department-user"
       />
       <ProTable

src/pages/system/Department/Member/index.tsx

@@ -164,11 +164,11 @@ const Member = observer(() => {
           actionRef.current?.reset?.();
           setSearchParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setSearchParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setSearchParam({});
+        // }}
         target="department-user"
       />
       <ProTable<MemberItem>

src/pages/system/Department/index.tsx

@@ -258,11 +258,11 @@ export default observer(() => {
           actionRef.current?.reset?.();
           setParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setParam({});
+        // }}
         target="department"
       />
       <ProTable<DepartmentItem>

src/pages/system/Menu/index.tsx

@@ -224,12 +224,13 @@ export default observer(() => {
     <PageContainer>
       <SearchComponent
         field={columns}
+        target="menu"
         onSearch={searchFn}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          searchFn({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   searchFn({});
+        // }}
       />
       <ProTable<MenuItem>
         columns={columns}

src/pages/system/Permission/index.tsx

@@ -9,12 +9,12 @@ import {
 } from '@ant-design/icons';
 import { Badge, Button, Dropdown, Menu, message, Popconfirm, Tooltip, Upload } from 'antd';
 import type { ActionType, ProColumns } from '@jetlinks/pro-table';
+import ProTable from '@jetlinks/pro-table';
 import { useIntl } from '@@/plugin-locale/localeExports';
 import type { PermissionItem } from '@/pages/system/Permission/typings';
 import Service from '@/pages/system/Permission/service';
 import { observer } from '@formily/react';
 import SearchComponent from '@/components/SearchComponent';
-import ProTable from '@jetlinks/pro-table';
 import Save from './Save';
 import SystemConst from '@/utils/const';
 import { downloadObject } from '@/utils/util';
@@ -234,11 +234,11 @@ const Permission: React.FC = observer(() => {
           actionRef.current?.reset?.();
           setParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setParam({});
+        // }}
       />
       <ProTable<PermissionItem>
         actionRef={actionRef}

src/pages/system/Role/Edit/UserManage/BindUser.tsx

@@ -75,18 +75,19 @@ const BindUser = (props: Props) => {
       <SearchComponent<UserItem>
         field={columns}
         target="user"
-        pattern={'simple'}
+        // pattern={'simple'}
+        enableSave={false}
         onSearch={(data) => {
           // console.log(data);
           // 重置分页数据
           actionRef.current?.reset?.();
           setParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setParam({});
+        // }}
       />
       <ProTable
         actionRef={actionRef}

src/pages/system/Role/Edit/UserManage/index.tsx

@@ -97,11 +97,11 @@ const UserManage = () => {
           actionRef.current?.reset?.();
           setParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setParam({});
-        }}
+        // onReset={() => {
+        //   // 重置分页及搜索参数
+        //   actionRef.current?.reset?.();
+        //   setParam({});
+        // }}
       />
       <ProTable
         actionRef={actionRef}

src/pages/system/User/index.tsx

@@ -176,17 +176,11 @@ const User = observer(() => {
       <SearchComponent<UserItem>
         field={columns}
         target="user"
-        pattern="simple"
         onSearch={(data) => {
           // 重置分页数据
           actionRef.current?.reset?.();
           setParam(data);
         }}
-        onReset={() => {
-          // 重置分页及搜索参数
-          actionRef.current?.reset?.();
-          setParam({});
-        }}
       />
       <ProTable<UserItem>
         actionRef={actionRef}