Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
minsik 2024-10-28 18:15:44 +09:00
commit 1dc906ed09
5 changed files with 9 additions and 1 deletions

View File

@ -46,6 +46,7 @@ export default async function RootLayout({ children }) {
storeLvl: session.storeLvl, storeLvl: session.storeLvl,
groupId: session.groupId, groupId: session.groupId,
pwdInitYn: session.pwdInitYn, pwdInitYn: session.pwdInitYn,
custCd: session.custCd,
isLoggedIn: session.isLoggedIn, isLoggedIn: session.isLoggedIn,
} }
} }

View File

@ -98,6 +98,7 @@ export default function Login() {
pwdInitYn: 'Y', pwdInitYn: 'Y',
storeLvl: '1', storeLvl: '1',
groupId: '60000', groupId: '60000',
custCd: '100000',
}) })
setSessionState({ setSessionState({
userId: 'NEW016610', userId: 'NEW016610',
@ -115,6 +116,7 @@ export default function Login() {
pwdInitYn: 'Y', pwdInitYn: 'Y',
storeLvl: '1', storeLvl: '1',
groupId: '60000', groupId: '60000',
custCd: '100000',
}) })
if (chkLoginId) { if (chkLoginId) {
Cookies.set('chkLoginId', formData.get('id'), { expires: 7 }) Cookies.set('chkLoginId', formData.get('id'), { expires: 7 })

View File

@ -1,3 +1,5 @@
'use client'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
import WithDraggable from '@/components/common/draggable/WithDraggable' import WithDraggable from '@/components/common/draggable/WithDraggable'
import { useRecoilValue } from 'recoil' import { useRecoilValue } from 'recoil'

View File

@ -1,6 +1,8 @@
import WithDraggable from '@/components/common/draggable/withDraggable' 'use client'
import { useState } from 'react' import { useState } from 'react'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
import WithDraggable from '@/components/common/draggable/withDraggable'
export default function PanelBatchStatistics() { export default function PanelBatchStatistics() {
const { getMessage } = useMessage() const { getMessage } = useMessage()

View File

@ -52,6 +52,7 @@ export async function setSession(data) {
session.storeLvl = data.storeLvl session.storeLvl = data.storeLvl
session.groupId = data.groupId session.groupId = data.groupId
session.pwdInitYn = data.pwdInitYn session.pwdInitYn = data.pwdInitYn
session.custCd = data.custCd
session.isLoggedIn = true session.isLoggedIn = true
// console.log('session:', session) // console.log('session:', session)