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
黄庭坚
jinfa-platform
Commits
1fc4e396
Commit
1fc4e396
authored
Sep 22, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix(商家营销活动): 修复批量操作
parent
5806a28f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
index.tsx
src/pages/transaction/components/tableLayout/index.tsx
+6
-5
columns_3.tsx
...bility/components/productListLayout/columns/columns_3.tsx
+2
-2
No files found.
src/pages/transaction/components/tableLayout/index.tsx
View file @
1fc4e396
import
React
,
{
useRef
,
use
State
,
useImperativeHandle
}
from
'react'
;
import
React
,
{
useRef
,
use
ImperativeHandle
,
useEffect
}
from
'react'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
Card
}
from
'antd'
;
import
{
StandardTable
}
from
'god'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
ColumnType
,
TableRowSelection
}
from
'antd/lib/table/interface'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
...
...
@@ -62,9 +62,6 @@ const Table: React.FC<Iprops> = (props: any) => {
const
[
selectRow
,
selectRowFns
]
=
useRowSelectionTable
({
customKey
:
rowKey
||
'id'
,
extendsSelection
:
{
onChange
:
(
_rowKeys
:
any
)
=>
{
fetchRowkeys
(
selectRowFns
.
selectedRowKeys
)
},
getCheckboxProps
:
(
record
)
=>
getCheckboxProps
&&
getCheckboxProps
(
record
)
}
});
...
...
@@ -122,6 +119,10 @@ const Table: React.FC<Iprops> = (props: any) => {
}
useEffect
(()
=>
{
fetchRowkeys
&&
fetchRowkeys
(
selectRowFns
.
selectedRowKeys
)
},
[
selectRowFns
])
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_3.tsx
View file @
1fc4e396
...
...
@@ -96,9 +96,9 @@ const columns_3 = ({
},
()
=>
({
validator
:
(
_rule
,
value
)
=>
{
const
pattern
=
/^
(\
-)?\d
+
(\.\d
{1,3}
)?
$/
;
const
pattern
=
/^
(\
d
|
[
1-9
]\d
|99.999
)
(\.\d
{1,3}
)?
$/
;
if
(
!
pattern
.
test
(
value
))
{
return
Promise
.
reject
(
new
Error
(
'折扣必须大于0'
));
return
Promise
.
reject
(
new
Error
(
'折扣必须大于0
且小于100最多保留3为小数
'
));
}
return
Promise
.
resolve
();
},
...
...
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