Browse Source

越改越难受

shaogen1995 2 months ago
parent
commit
4c7d37ba37

+ 17 - 1
src/components/MyTable/index.tsx

@@ -4,6 +4,7 @@ import React, {
   useEffect,
   useImperativeHandle,
   useMemo,
+  useRef,
   useState
 } from 'react'
 import styles from './index.module.scss'
@@ -261,6 +262,18 @@ const MyTable = forwardRef<MyTableMethods, MyTableProps>(
       form
     }))
 
+    // 空数据列表会闪一下的问题
+    const timerrRef = useRef(-1)
+    const [isLoding, setIsLoding] = useState(false)
+    useEffect(() => {
+      timerrRef.current = window.setTimeout(() => {
+        setIsLoding(true)
+      }, 500)
+      return () => {
+        clearTimeout(timerrRef.current)
+      }
+    }, [])
+
     return (
       <Form form={form} component={false}>
         <Table
@@ -283,7 +296,10 @@ const MyTable = forwardRef<MyTableMethods, MyTableProps>(
           {...rest}
           locale={{
             emptyText: (
-              <div className='NODATA' style={{ height: yHeight ? yHeight : '' }}>
+              <div
+                className='NODATA'
+                style={{ height: yHeight ? yHeight : '', opacity: isLoding ? '1' : '0' }}
+              >
                 <img src={baseURL + `/baseData/staImg/build.png`} alt='' />
                 <p>暂无相关搜索结果,请更换关键字搜索</p>
                 <div>

+ 13 - 13
src/pages/D_storeManage/D2storSet/D2edit.tsx

@@ -8,7 +8,7 @@ import { getUserListAPI } from '@/store/action/Z6user'
 import { RootState } from '@/store'
 import { D2_APIedit, D2_APIgetInfo } from '@/store/action/D2storSet'
 import { MessageFu } from '@/utils/message'
-import { findMissingIds } from '@/pages/Z_system/Z3flowSet/Z3edit/data'
+// import { findMissingIds } from '@/pages/Z_system/Z3flowSet/Z3edit/data'
 
 type Props = {
   sId: number
@@ -57,24 +57,24 @@ function D2edit({ sId, succToLookFu, closeFu, isLook }: Props) {
 
           // console.log('---------', obj)
 
-          if (!userList.some(v => v.id === obj.managerUserId)) {
-            obj.managerUserId = null
-          }
+          // if (!userList.some(v => v.id === obj.managerUserId)) {
+          //   obj.managerUserId = null
+          // }
 
-          if (obj.memberUserIds && obj.memberUserIds.length) {
-            const isDelIdArrRef = findMissingIds(userList, obj.memberUserIds)
-            if (isDelIdArrRef && isDelIdArrRef.length) {
-              const userIds = new Set(isDelIdArrRef.map(u => u))
-              const copyUserIds = obj.memberUserIds.filter((id: any) => !userIds.has(id))
-              obj.memberUserIds = copyUserIds
-            }
-          }
+          // if (obj.memberUserIds && obj.memberUserIds.length) {
+          //   const isDelIdArrRef = findMissingIds(userList, obj.memberUserIds)
+          //   if (isDelIdArrRef && isDelIdArrRef.length) {
+          //     const userIds = new Set(isDelIdArrRef.map(u => u))
+          //     const copyUserIds = obj.memberUserIds.filter((id: any) => !userIds.has(id))
+          //     obj.memberUserIds = copyUserIds
+          //   }
+          // }
 
           FormBoxRef.current?.setFieldsValue(res.data)
         }
       }
     },
-    [loding, userList]
+    [loding]
   )
 
   useEffect(() => {

+ 38 - 36
src/pages/Z_system/Z3flowSet/Z3edit/index.tsx

@@ -7,7 +7,7 @@ import MyPopconfirm from '@/components/MyPopconfirm'
 import { MessageFu } from '@/utils/message'
 import { UserTableListType } from '@/types'
 import { Z3tableType } from '../type'
-import { findMissingIds } from './data'
+// import { findMissingIds } from './data'
 
 type Props = {
   sId: number
@@ -19,41 +19,43 @@ type Props = {
 function Z3edit({ sId, closeFu, succFu, userList }: Props) {
   const [info, setInfo] = useState({} as Z3tableType)
 
-  const getInfoFu = useCallback(
-    async (id: number) => {
-      const res = await Z3_APIgetInfo(id)
-      if (res.code === 0) {
-        const data: Z3tableType = res.data
-
-        let copyUserIds = (
-          data.copyUserIds ? data.copyUserIds.split(',').map(v => Number(v)) : ''
-        ) as any
-
-        const isDelIdArrRef = findMissingIds(userList, copyUserIds)
-
-        if (isDelIdArrRef && isDelIdArrRef.length) {
-          const userIds = new Set(isDelIdArrRef.map(u => u))
-          copyUserIds = copyUserIds.filter((id: any) => !userIds.has(id))
-          const res2 = await Z3_APIsave({
-            ...data,
-            copyUserIds: copyUserIds ? copyUserIds.join(',') : ''
-          })
-          if (res2.code === 0) {
-            setInfo({
-              ...data,
-              copyUserIds
-            })
-          }
-        } else {
-          setInfo({
-            ...data,
-            copyUserIds
-          })
-        }
-      }
-    },
-    [userList]
-  )
+  const getInfoFu = useCallback(async (id: number) => {
+    const res = await Z3_APIgetInfo(id)
+    if (res.code === 0) {
+      const data: Z3tableType = res.data
+
+      let copyUserIds = (
+        data.copyUserIds ? data.copyUserIds.split(',').map(v => Number(v)) : ''
+      ) as any
+
+      // const isDelIdArrRef = findMissingIds(userList, copyUserIds)
+
+      // if (isDelIdArrRef && isDelIdArrRef.length) {
+      //   const userIds = new Set(isDelIdArrRef.map(u => u))
+      //   copyUserIds = copyUserIds.filter((id: any) => !userIds.has(id))
+      //   const res2 = await Z3_APIsave({
+      //     ...data,
+      //     copyUserIds: copyUserIds ? copyUserIds.join(',') : ''
+      //   })
+      //   if (res2.code === 0) {
+      //     setInfo({
+      //       ...data,
+      //       copyUserIds
+      //     })
+      //   }
+      // } else {
+      //   setInfo({
+      //     ...data,
+      //     copyUserIds
+      //   })
+      // }
+
+      setInfo({
+        ...data,
+        copyUserIds
+      })
+    }
+  }, [])
 
   useEffect(() => {
     getInfoFu(sId)

+ 23 - 26
src/pages/Z_system/Z3flowSet/Z3linkSet/Z3addPro.tsx

@@ -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 }))