Commit 5711c1d3 by zhaochengxiang

bug fix

parent 1eabae4e
...@@ -118,17 +118,6 @@ const Basic = React.forwardRef(function ({}, ref) { ...@@ -118,17 +118,6 @@ const Basic = React.forwardRef(function ({}, ref) {
const getUsers = () => { const getUsers = () => {
setLoadingUsers(true) setLoadingUsers(true)
// setTimeout(() => {
// setLoadingUsers(false)
// setUsers(
// Array.from({ length: 10000 }).map((_, i) => ({
// id: `${i}`,
// loginName: `test${i}`,
// realName: `测试${i}`,
// }))
// )
// }, 1000)
dispatch({ dispatch({
type: 'datamodel.getCooperationUsers', type: 'datamodel.getCooperationUsers',
callback: data => { callback: data => {
...@@ -251,10 +240,10 @@ const RuleReviewItem = ({ value = {}, onChange, loading, users }) => { ...@@ -251,10 +240,10 @@ const RuleReviewItem = ({ value = {}, onChange, loading, users }) => {
useDebounceEffect(() => { useDebounceEffect(() => {
setOptions( setOptions(
(users??[]) (users??[])
.filter(item => !searchValue|| (item.loginName??'').indexOf(searchValue)!==-1 || (item.realName??'').indexOf(searchValue)!==-1) .filter(item => !searchValue|| (item.name??'').indexOf(searchValue)!==-1 || (item.dname??'').indexOf(searchValue)!==-1)
.map(item => ({ .map(item => ({
label: `${item.realName}(${item.loginName})`, label: item.name,
value: `${item.id}`, value: item.name,
})) }))
) )
}, [searchValue, users], { wait: 300 }) }, [searchValue, users], { wait: 300 })
...@@ -291,8 +280,8 @@ const RuleReviewItem = ({ value = {}, onChange, loading, users }) => { ...@@ -291,8 +280,8 @@ const RuleReviewItem = ({ value = {}, onChange, loading, users }) => {
onChange={(val) => { onChange={(val) => {
triggerChange({ triggerChange({
standardApprovalUserList: (users??[]) standardApprovalUserList: (users??[])
.filter(item => val===item.id) .filter(item => val===item.name)
.map(item => ({ userId: item.id, userName: item.loginName, userCnName: item.realName })) .map(item => ({ userId: item.id, userName: item.name, userCnName: item.dname }))
}) })
}} }}
/> />
......
...@@ -204,12 +204,6 @@ const Basic = React.forwardRef(function ({ type, item, user }, ref) { ...@@ -204,12 +204,6 @@ const Basic = React.forwardRef(function ({ type, item, user }, ref) {
type: 'datamodel.getCooperationUsers', type: 'datamodel.getCooperationUsers',
callback: data => { callback: data => {
setLoadingUsers(false) setLoadingUsers(false)
//id int转string
const newData = produce(data??[], (draft) => {
draft.forEach(item => {
item.id = `${item.id}`
})
})
setUsers(newData) setUsers(newData)
}, },
error: () => { error: () => {
......
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