|
@@ -10,7 +10,7 @@ import { RootState } from '@/store'
|
|
|
import { D4_APIgetTree } from '@/store/action/Z4organization'
|
|
|
import { MessageFu } from '@/utils/message'
|
|
|
import { Z3proListType } from '../type'
|
|
|
-import { findMissingIds } from '../Z3edit/data'
|
|
|
+// import { findMissingIds } from '../Z3edit/data'
|
|
|
|
|
|
const baseFormData = {
|
|
|
id: -1,
|
|
@@ -37,36 +37,33 @@ function Z3addPro({ sId, closeFu, succFu, userList, flowId }: Props) {
|
|
|
|
|
|
const [form, setForm] = useState(baseFormData)
|
|
|
|
|
|
- const getInfoFu = useCallback(
|
|
|
- async (id: number) => {
|
|
|
- const res = await Z3_APIgetProInfo(id)
|
|
|
- if (res.code === 0) {
|
|
|
- const data: Z3proListType = res.data
|
|
|
+ const getInfoFu = useCallback(async (id: number) => {
|
|
|
+ const res = await Z3_APIgetProInfo(id)
|
|
|
+ if (res.code === 0) {
|
|
|
+ const data: Z3proListType = res.data
|
|
|
|
|
|
- let moduleIds: any = data.moduleIds.split(',')
|
|
|
+ let moduleIds: any = data.moduleIds.split(',')
|
|
|
|
|
|
- data.type === 'user'
|
|
|
- ? setIdsArr1(moduleIds.map((v: any) => Number(v)))
|
|
|
- : data.type === 'role'
|
|
|
- ? setIdsArr2(moduleIds.map((v: any) => Number(v)))
|
|
|
- : setIdsArr3(moduleIds)
|
|
|
+ data.type === 'user'
|
|
|
+ ? setIdsArr1(moduleIds.map((v: any) => Number(v)))
|
|
|
+ : data.type === 'role'
|
|
|
+ ? setIdsArr2(moduleIds.map((v: any) => Number(v)))
|
|
|
+ : setIdsArr3(moduleIds)
|
|
|
|
|
|
- if (data.type === 'user') {
|
|
|
- const arr = moduleIds.map((v: any) => Number(v))
|
|
|
- const isDelIdArrRef = findMissingIds(userList, arr)
|
|
|
+ // if (data.type === 'user') {
|
|
|
+ // const arr = moduleIds.map((v: any) => Number(v))
|
|
|
+ // const isDelIdArrRef = findMissingIds(userList, arr)
|
|
|
|
|
|
- if (isDelIdArrRef && isDelIdArrRef.length) {
|
|
|
- const userIds = new Set(isDelIdArrRef.map(u => u))
|
|
|
- const copyUserIds = arr.filter((id: any) => !userIds.has(id))
|
|
|
- setIdsArr1(copyUserIds)
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (isDelIdArrRef && isDelIdArrRef.length) {
|
|
|
+ // const userIds = new Set(isDelIdArrRef.map(u => u))
|
|
|
+ // const copyUserIds = arr.filter((id: any) => !userIds.has(id))
|
|
|
+ // setIdsArr1(copyUserIds)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
- setForm(data)
|
|
|
- }
|
|
|
- },
|
|
|
- [userList]
|
|
|
- )
|
|
|
+ setForm(data)
|
|
|
+ }
|
|
|
+ }, [])
|
|
|
|
|
|
useEffect(() => {
|
|
|
dispatch(Z5_APIgetList({ pageNum: 1, pageSize: 99999 }))
|