Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shenshaokai
jinfa-admin
Commits
2f3b9f57
Commit
2f3b9f57
authored
Sep 21, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
76c46069
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
54 deletions
+39
-54
index.tsx
src/components/ModalTable/index.tsx
+1
-1
RuleSetting.tsx
...SettingManage/transactionRules/components/RuleSetting.tsx
+38
-11
index.tsx
...ages/ruleSettingManage/transactionRules/effects/index.tsx
+0
-42
No files found.
src/components/ModalTable/index.tsx
View file @
2f3b9f57
...
...
@@ -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
)
{
...
...
src/pages/ruleSettingManage/transactionRules/components/RuleSetting.tsx
View file @
2f3b9f57
...
...
@@ -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
}
}
/>
...
...
src/pages/ruleSettingManage/transactionRules/effects/index.tsx
View file @
2f3b9f57
...
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment