rht

apps/web/src/components/models/daily/DailyContext.tsx

@@ -1,7 +1,7 @@
 import { api } from "@nice/client";
 import { useAuth } from "@web/src/providers/auth-provider";
 import { UserProfile } from "@nice/common";
-import { createContext, ReactNode, useContext, useEffect } from "react";
+import { createContext, ReactNode, useContext, useEffect, useState } from "react";
 
 interface DailyContextProviderProps{
     staffsMsg:{
@@ -9,7 +9,9 @@ interface DailyContextProviderProps{
         showname:string,
         username:string
     }[],
-    staffsLoading:boolean
+    staffsLoading:boolean,
+    selectedUserMsg:UserProfile,
+    setSelectedUserMsg:(userMsg:UserProfile)=>void
 }
 
 interface DailyContextProps{
@@ -20,6 +22,7 @@ const DailyContextProvider = createContext<DailyContextProviderProps>(null)
 
 export default function DailyContext({children}:DailyContextProps){
     const {user} = useAuth()
+    const [selectedUserMsg,setSelectedUserMsg] = useState(null)
     // 获取当前员工的单位下的所有staff的记录
     const {data:staffs,isLoading:staffsLoading} = api.staff.findByDept.useQuery({
         deptId:user.deptId
@@ -31,9 +34,13 @@ export default function DailyContext({children}:DailyContextProps){
             username:staff.username
         }
     })
+
+
     return <DailyContextProvider.Provider value={{
         staffsMsg,
         staffsLoading,
+        selectedUserMsg,
+        setSelectedUserMsg
     }}>
         {children}
     </DailyContextProvider.Provider>

apps/web/src/components/models/daily/dailyMsgDisplay/DailyMsgDisplayLayout.tsx

@@ -1,5 +1,12 @@
+import DailyPersonMsg from "../dailyMsgForm/DailyPersonMsg";
+import DailyTrainMsg from "../dailyMsgForm/DailyTrainMsg";
+import { useDaily } from "../DailyContext";
 export default function DailyMsgDisplayLayout(){
+    const {selectedUserMsg} = useDaily()
     return (
-        <div></div>
+        <div>
+            <DailyPersonMsg selectedUserMsg={selectedUserMsg} />
+            <DailyTrainMsg selectedUserMsg={selectedUserMsg} />
+        </div>
     )
 }

apps/web/src/components/models/daily/dailyMsgForm/DailyMsgFormLayout.tsx

@@ -4,14 +4,11 @@ import { useDaily } from "../DailyContext";
 import { useEffect, useState } from "react";
 import { staffDetailSelect, UserProfile } from "@nice/common";
 import { api } from "@nice/client";
-import DailyPersonMsg from "./DailyPersonMsg";
 import { MonitorOutlined } from "@ant-design/icons";
-import DailyTrainMsg from "./DailyTrainMsg";
 
 export function DailyMsgFormLayout() {
     const [form] = Form.useForm()
-    const { staffsMsg } = useDaily()
+    const { staffsMsg ,selectedUserMsg,setSelectedUserMsg} = useDaily()
-    const [selectedUserMsg, setSelectedUserMsg] = useState(null)
     const [selectedUserId, setSelectedUserId] = useState<string | null>(null);
     const { data: selectedUserData } = api.staff.findUnique.useQuery(
         {
@@ -35,7 +32,7 @@ export function DailyMsgFormLayout() {
     useEffect(() => {
         if (selectedUserData) {
             console.log(selectedUserData)
-            setSelectedUserMsg(selectedUserData);
+            setSelectedUserMsg(selectedUserData as any as UserProfile);
         }
     }, [selectedUserData]);
 
@@ -53,8 +50,6 @@ export function DailyMsgFormLayout() {
                     ></StaffSelect>
                 </div>
             </Form>
-            <DailyPersonMsg selectedUserMsg={selectedUserMsg} />
-            <DailyTrainMsg />
         </div>
     )
 }

apps/web/src/components/models/daily/dailyMsgForm/DailyTrainMsg.tsx

@@ -1,4 +1,4 @@
-export default function DailyTrainMsg() {
+export default function DailyTrainMsg({selectedUserMsg}) {
     return (
         <div>
             <span>每日培训消息</span>