Commit 2f3b9f57 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:

parent 76c46069
......@@ -12,7 +12,7 @@ export interface ModalTableProps extends IStandardTableProps<any> {
}
const ModalTable:React.FC<ModalTableProps> = (props) => {
const { width = 704,modalTitle, confirm, cancel, visible, currentRef, ...resetTable } = props
const { width = 704, modalTitle, confirm, cancel, visible, currentRef, ...resetTable } = props
const selfRef = currentRef || useRef<any>({})
useEffect(() => {
if (visible) {
......
......@@ -5,7 +5,7 @@ import EyePreview from '@/components/EyePreview'
import { findItemAndDelete } from '@/utils'
import { ISchemaFormActions, ISchema, FormEffectHooks } from '@formily/antd'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { createAddContractTemplateEffect, useUnitPreview, createMemberListFilterEffect } from '../effects'
import { createAddContractTemplateEffect, useUnitPreview } from '../effects'
import { PublicApi } from '@/services/api'
import {
PlusOutlined,
......@@ -21,6 +21,7 @@ import Search from '@/components/NiceForm/components/Search'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import Submit from '@/components/NiceForm/components/Submit'
import LevelBrand from '@/pages/member/components/LevelBrand'
import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect'
export interface RuleSettingProps {
addSchemaAction: ISchemaFormActions,
......@@ -184,9 +185,9 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
enum: [],
"x-component-props": {
placeholder: '请选择会员类型',
style: {
width: 160
}
// style: {
// width: 160
// }
}
},
roleId: {
......@@ -194,9 +195,9 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
enum: [],
"x-component-props": {
placeholder: '请选择会员角色',
style: {
width: 160
}
// style: {
// width: 160
// }
}
},
level: {
......@@ -204,9 +205,9 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
enum: [],
"x-component-props": {
placeholder: '请选择会员等级',
style: {
width: 160
}
// style: {
// width: 160
// }
}
},
submit: {
......@@ -223,6 +224,27 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
}
}
// 会员弹框筛选select值
const fetchSelectOptions = async () => {
const res = await PublicApi.getMemberManagePageitems()
if (res.code === 1000) {
const { data = {} }: any = res
const {
memberTypes = [],
roles = [],
levels = [],
} = data
return {
memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
roleId: roles.map(item => ({ label: item.roleName, value: item.roleId })),
level: levels.map(item => ({ label: item.levelTag, value: item.level })),
}
}
return {}
}
return (
<>
<NiceForm
......@@ -238,7 +260,6 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
onFieldChange()
})
createAddContractTemplateEffect(addSchemaAction)
createMemberListFilterEffect(addSchemaAction)
}}
onSubmit={handleSubmit}
actions={addSchemaAction}
......@@ -266,12 +287,18 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
'name',
FORM_FILTER_PATH,
);
useAsyncInitSelect(
['memberTypeId', 'roleId', 'level'],
fetchSelectOptions,
);
}
}
}
}
tableProps={{
rowKey: 'memberId',
// pagination: { position: ['none', 'topRight'], size: 'small', simple: true, disabled: true}
// pagination: false
}}
/>
......
......@@ -19,48 +19,6 @@ export const createAddContractTemplateEffect = (context: ISchemaFormActions) =>
useAsyncSelect('contractTemplateId', fetchListContractTemplateAll)
}
// 会员Modal的高级筛选
type ICondition = () => Promise<{
memberTypeCondition: { value: number; label: string; }[];
memberRoleCondition: { value: number; label: string; }[];
memberLevelCondition: { value: number; label: string; }[];
}>
export const createMemberListFilterEffect = (context: ISchemaFormActions) => {
PublicApi.getMemberManagePageitems().then(res => {
console.log(res.data)
})
// const fetchListSearchConditionAll: ICondition = async () => {
// const { data } = await PublicApi.getMemberManagePageitems()
// let memberTypeCondition = data.memberTypes.map(v => ({
// value: v.memberTypeId,
// label: v.memberTypeName
// }))
// let memberRoleCondition = data.roles.map(v => ({
// value: v.roleId,
// label: v.roleName
// }))
// let memberLevelCondition = data.levels.map(v => ({
// value: v.level,
// label: v.levelTag
// }))
// console.log(data, memberTypeCondition, memberRoleCondition, memberLevelCondition)
// return {
// memberTypeCondition,
// memberRoleCondition,
// memberLevelCondition
// }
// }
// console.log(fetchListSearchConditionAll)
// useAsyncSelect('memberTypeId', fetchListSearchConditionAll.memberTypeCondition)
// useAsyncSelect('roleId', fetchListSearchConditionAll.memberRoleCondition)
// useAsyncSelect('level', fetchListSearchConditionAll.memberLevelCondition)
}
export const useUnitPreview = (initValue, context) => {
useEffect(() => {
if (initValue) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment