Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
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-platform
Commits
aa969d0b
Commit
aa969d0b
authored
Apr 21, 2022
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复检索条件展示不对的问题
parent
a3884c1b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
77 deletions
+76
-77
index.tsx
src/pages/member/memberRectification/common/schema/index.tsx
+0
-11
index.tsx
...s/member/memberRectification/rectificationQuery/index.tsx
+1
-1
index.tsx
...er/memberRectification/tobeConfirmRectification/index.tsx
+1
-1
schema.tsx
...r/memberRectification/tobeConfirmRectification/schema.tsx
+74
-64
No files found.
src/pages/member/memberRectification/common/schema/index.tsx
View file @
aa969d0b
...
...
@@ -68,17 +68,6 @@ export const rectificationListSchema: ISchema = {
},
},
},
outerStatus
:
{
type
:
'string'
,
enum
:
[],
'x-component-props'
:
{
placeholder
:
`
${
intl
.
formatMessage
({
id
:
'member.memberRectification.common.columns.queryColumns.outState'
})}
`
,
allowClear
:
true
,
style
:
{
width
:
160
,
},
},
},
submit
:
{
'x-component'
:
'Submit'
,
'x-mega-props'
:
{
...
...
src/pages/member/memberRectification/rectificationQuery/index.tsx
View file @
aa969d0b
...
...
@@ -39,7 +39,7 @@ const List: React.FC<Iprops> = (props: Iprops) => {
<
Card
>
<
CustomizeQueryList
columns=
{
columns
}
schema=
{
querySchema
}
schema=
{
querySchema
(
true
)
}
fetchListData=
{
handleFetch
}
expressionScope=
{
{
controllerBtns
,
...
...
src/pages/member/memberRectification/tobeConfirmRectification/index.tsx
View file @
aa969d0b
...
...
@@ -56,7 +56,7 @@ const List: React.FC<Iprops> = (props: Iprops) => {
<
Card
>
<
CustomizeQueryList
columns=
{
columns
}
schema=
{
querySchema
}
schema=
{
querySchema
(
false
)
}
fetchListData=
{
handleFetch
}
effects=
{
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'name'
,
FORM_FILTER_PATH
,);
...
...
src/pages/member/memberRectification/tobeConfirmRectification/schema.tsx
View file @
aa969d0b
...
...
@@ -77,77 +77,87 @@ export default confirmEditResultSchema
/**
* 会员考评页scheam
* @param visibleOuterStatus 是否可见外部状态
* @returns
*/
export
const
querySchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
megaLayout
:
{
type
:
'object'
,
'x-component'
:
'mega-layout'
,
properties
:
{
name
:
{
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
`
${
intl
.
formatMessage
({
id
:
'member.memberInspection.common.schema.add.searchMemberName'
})}
`
,
align
:
'flex-left'
,
tip
:
`
${
intl
.
formatMessage
({
id
:
'member.memberEvaluate.allQuery.schema.searchForMemberName'
})}
`
,
},
export
const
querySchema
:
(
visibleOuterStatus
:
boolean
)
=>
ISchema
=
(
visibleOuterStatus
)
=>
{
const
extraProperties
=
{
subject
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
`
${
intl
.
formatMessage
({
id
:
'member.memberRectification.common.hooks.useGetDetailCommon.rectifyTopic'
})}
`
,
allowClear
:
true
,
style
:
{
width
:
160
,
},
[
FORM_FILTER_PATH
]:
{
type
:
'object'
,
'x-component'
:
'mega-layout'
,
'x-component-props'
:
{
grid
:
true
,
full
:
true
,
autoRow
:
true
,
columns
:
6
,
},
properties
:
{
subject
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
`
${
intl
.
formatMessage
({
id
:
'member.memberRectification.common.hooks.useGetDetailCommon.rectifyTopic'
})}
`
,
allowClear
:
true
,
style
:
{
width
:
160
,
},
},
},
'[rectifyDayStart,rectifyDayEnd]'
:
{
type
:
'daterange'
,
'x-component-props'
:
{
placeholder
:
[
`
${
intl
.
formatMessage
({
id
:
'member.memberRectification.common.schema.index.rectifyBeginTime'
})}
`
,
`
${
intl
.
formatMessage
({
id
:
'member.memberRectification.tobeConfirmRectification.schema.rectifyCompleteTime'
})}
`
],
allowClear
:
true
,
style
:
{
width
:
240
,
},
},
},
outerStatus
:
{
type
:
'string'
,
enum
:
[],
'x-component-props'
:
{
placeholder
:
`
${
intl
.
formatMessage
({
id
:
'member.memberRectification.common.columns.queryColumns.outState'
})}
`
,
allowClear
:
true
,
style
:
{
width
:
160
,
},
},
},
},
'[rectifyDayStart,rectifyDayEnd]'
:
{
type
:
'daterange'
,
'x-component-props'
:
{
placeholder
:
[
`
${
intl
.
formatMessage
({
id
:
'member.memberRectification.common.schema.index.rectifyBeginTime'
})}
`
,
`
${
intl
.
formatMessage
({
id
:
'member.memberRectification.tobeConfirmRectification.schema.rectifyCompleteTime'
})}
`
],
allowClear
:
true
,
style
:
{
width
:
240
,
},
},
},
outerStatus
:
{
type
:
'string'
,
enum
:
[],
'x-component-props'
:
{
placeholder
:
`
${
intl
.
formatMessage
({
id
:
'member.memberRectification.common.columns.queryColumns.outState'
})}
`
,
allowClear
:
true
,
style
:
{
width
:
160
,
},
},
},
submit
:
{
'x-component'
:
'Submit'
,
'x-mega-props'
:
{
span
:
1
,
},
'x-component-props'
:
{
children
:
`
${
intl
.
formatMessage
({
id
:
'member.memberInspection.common.schema.add.query'
})}
`
,
},
},
};
if
(
!
visibleOuterStatus
)
{
delete
extraProperties
.
outerStatus
;
}
return
{
type
:
'object'
,
properties
:
{
megaLayout
:
{
type
:
'object'
,
'x-component'
:
'mega-layout'
,
properties
:
{
name
:
{
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
`
${
intl
.
formatMessage
({
id
:
'member.memberInspection.common.schema.add.searchMemberName'
})}
`
,
align
:
'flex-left'
,
tip
:
`
${
intl
.
formatMessage
({
id
:
'member.memberEvaluate.allQuery.schema.searchForMemberName'
})}
`
,
},
submit
:
{
'x-component'
:
'Submit'
,
'x-mega-props'
:
{
span
:
1
,
},
'x-component-props'
:
{
children
:
`
${
intl
.
formatMessage
({
id
:
'member.memberInspection.common.schema.add.query'
})}
`
,
},
},
[
FORM_FILTER_PATH
]:
{
type
:
'object'
,
'x-component'
:
'mega-layout'
,
'x-component-props'
:
{
grid
:
true
,
full
:
true
,
autoRow
:
true
,
columns
:
6
,
},
properties
:
extraProperties
,
},
},
},
},
}
,
}
};
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