Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kne-components/components-admin",
"version": "1.1.48",
"version": "1.1.49",
"description": "用于实现一个后台管理系统的必要组件",
"scripts": {
"init": "husky",
Expand Down
6 changes: 3 additions & 3 deletions src/components/Admin/User/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const UserInner = createWithRemoteLoader({
const pageProps = Object.assign({}, contextProps?.pageProps, propsPageProps);
const [filter, setFilter] = useState([]);
const { SearchInput, getFilterValue, fields: filterFields } = Filter;
const { InputFilterItem, AdvancedSelectFilterItem } = filterFields;
const { InputFilterItem, SuperSelectFilterItem } = filterFields;
const { ajax, apis } = usePreset();
const formModal = useFormModal();
const { message } = App.useApp();
Expand Down Expand Up @@ -190,7 +190,7 @@ const UserInner = createWithRemoteLoader({
[
<InputFilterItem label={formatMessage({ id: 'FilterEmail' })} name="email" />,
<InputFilterItem label={formatMessage({ id: 'FilterPhone' })} name="phone" />,
<AdvancedSelectFilterItem
<SuperSelectFilterItem
label={formatMessage({ id: 'FilterStatus' })}
name="status"
single
Expand All @@ -209,7 +209,7 @@ const UserInner = createWithRemoteLoader({
}
}}
/>,
<AdvancedSelectFilterItem
<SuperSelectFilterItem
label={formatMessage({ id: 'FilterIsAdmin' })}
name="isSuperAdmin"
single
Expand Down
12 changes: 8 additions & 4 deletions src/components/BizUnit/TablePageRender.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ const TablePageRender = createWithRemoteLoader({
return (
<TablePage
{...tableOptions}
page={{
filter,
titleExtra
}}
page={Object.assign(
{},
{
filter,
titleExtra
},
tableOptions.page
)}
/>
);
});
Expand Down
4 changes: 2 additions & 2 deletions src/components/MessageQueue/DeadLetterList/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const DeadLetterList = createWithRemoteLoader({
const { formatMessage } = useIntl();
const { apis } = usePreset();
const { SearchInput, getFilterValue, fields: filterFields } = Filter;
const { InputFilterItem, AdvancedSelectFilterItem } = filterFields;
const { InputFilterItem, SuperSelectFilterItem } = filterFields;
const ref = useRef(null);
const [filter, setFilter] = useState([]);
const [selected, setSelected] = useState({
Expand Down Expand Up @@ -92,7 +92,7 @@ const DeadLetterList = createWithRemoteLoader({
list: [
[
<InputFilterItem label={formatMessage({ id: 'Topic' })} name="topic" />,
<AdvancedSelectFilterItem
<SuperSelectFilterItem
label={formatMessage({ id: 'Replayed' })}
name="replayed"
single
Expand Down
4 changes: 2 additions & 2 deletions src/components/Task/AllTask/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const AllTask = createWithRemoteLoader({
const { formatMessage } = useIntl();
const { apis, enums } = usePreset();
const { SearchInput, getFilterValue, fields: filterFields } = Filter;
const { InputFilterItem, AdvancedSelectFilterItem, SuperSelectFilterItem, TypeDateRangePickerFilterItem } = filterFields;
const { InputFilterItem, SuperSelectFilterItem, TypeDateRangePickerFilterItem } = filterFields;
const ref = useRef(null);
const [filter, setFilter] = useState([]);
const [sort, setSortChange] = useState([]);
Expand Down Expand Up @@ -174,7 +174,7 @@ const AllTask = createWithRemoteLoader({
);
}}
/>,
<AdvancedSelectFilterItem
<SuperSelectFilterItem
label={formatMessage({ id: 'ExecutionMode' })}
name="runnerType"
single
Expand Down
3 changes: 1 addition & 2 deletions src/components/Tenant/UserList/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const UserList = createWithRemoteLoader({
multiSelectInterceptor,
fields: filterFields
} = Filter;
const { InputFilterItem, AdvancedSelectFilterItem, SuperSelectFilterItem } = filterFields;
const { InputFilterItem, SuperSelectFilterItem } = filterFields;
const { plugins } = usePreset();

const selectedRow = useSelectedRow();
Expand Down Expand Up @@ -119,7 +119,6 @@ const UserList = createWithRemoteLoader({
formatMessage,
apis,
InputFilterItem,
AdvancedSelectFilterItem,
SuperSelectFilterItem,
multiSelectInterceptor
});
Expand Down
8 changes: 4 additions & 4 deletions src/components/Tenant/UserList/useFilterList.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import merge from 'lodash/merge';
import DepartmentTreeFilterItem from './DepartmentTreeFilterItem';
import getRoleListApi from '../Role/getRoleListApi';

const useFilterList = ({ formatMessage, apis, InputFilterItem, AdvancedSelectFilterItem, SuperSelectFilterItem, multiSelectInterceptor }) => {
const useFilterList = ({ formatMessage, apis, InputFilterItem, SuperSelectFilterItem, multiSelectInterceptor }) => {
return useMemo(
() => [
[
Expand All @@ -23,7 +23,7 @@ const useFilterList = ({ formatMessage, apis, InputFilterItem, AdvancedSelectFil
name="tenantOrgId"
api={merge({}, apis.orgList, { params: apis.orgList?.params || {} })}
/>,
<AdvancedSelectFilterItem
<SuperSelectFilterItem
key="status"
label={formatMessage({ id: 'FilterStatus' })}
name="status"
Expand All @@ -37,7 +37,7 @@ const useFilterList = ({ formatMessage, apis, InputFilterItem, AdvancedSelectFil
})
}}
/>,
<AdvancedSelectFilterItem
<SuperSelectFilterItem
key="synced"
label={formatMessage({ id: 'FilterSynced' })}
name="synced"
Expand All @@ -54,7 +54,7 @@ const useFilterList = ({ formatMessage, apis, InputFilterItem, AdvancedSelectFil
/>
]
],
[formatMessage, apis.roleList, apis.orgList, InputFilterItem, AdvancedSelectFilterItem, SuperSelectFilterItem]
[formatMessage, apis.roleList, apis.orgList, InputFilterItem, SuperSelectFilterItem]
);
};

Expand Down