1、完善部门页面

2、优化页面级store的目录位置，使组件中使用更加简洁

src/App.tsx

@@ -2,7 +2,7 @@ import { AppContextProvider } from '@/context.ts'
 import { initI18n } from '@/i18n.ts'
 import { appAtom, appStore, changeLanguage } from '@/store/system.ts'
 import { userMenuDataAtom } from '@/store/user.ts'
-import { IAppData } from '@/types'
+import { IAppData } from '@/global'
 import { ConfigProvider } from '@/components/config-provider'
 import { Provider, useAtom, useAtomValue } from 'jotai'
 import './App.css'

src/Auth.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Props } from './types'
+import { Props } from './global'
 import { useAtomValue } from 'jotai'
 import { authAtom } from './store/user.ts'
 

src/context.ts

@@ -1,4 +1,4 @@
-import { IAppData } from '@/types'
+import { IAppData } from '@/global'
 import React, { createContext, ProviderProps, useContext } from 'react'
 import { t } from 'i18next'
 

src/hooks/useFetch.ts

@@ -1,5 +1,5 @@
 import { atomFamily } from 'jotai/utils'
-import { IDataProps } from '@/types'
+import { IDataProps } from '@/global'
 import { useMemo, useRef } from 'react'
 import { generateUUID } from '@/utils/uuid'
 

src/i18n.ts

@@ -35,7 +35,7 @@ export const initI18n = (options?: InitOptions) => {
         },
       },
       fallbackLng: 'zh',
-      debug: true,
+      debug: false,
       detection: detectionOptions,
       interpolation: {
         escapeValue: false,

src/layout/RootLayout.tsx

@@ -4,7 +4,7 @@ import ErrorPage from '@/components/error/error.tsx'
 import SelectLang from '@/components/select-lang'
 import { appAtom } from '@/store/system.ts'
 import { userMenuDataAtom } from '@/store/user.ts'
-import { MenuItem } from '@/types'
+import { MenuItem } from '@/global'
 import { ProConfigProvider, ProLayout, } from '@ant-design/pro-components'
 import { zhCNIntl, enUSIntl } from '@ant-design/pro-provider/es/intl'
 import { CatchBoundary, Link, Outlet } from '@tanstack/react-router'

src/pages/system/departments/components/DepartmentTree.tsx

@@ -1,4 +1,4 @@
-import { usePageStoreOptions } from '@/store'
+
 import { Empty, Spin, Tree } from 'antd'
 import { useStyle } from '../style.ts'
 import { useTranslation } from '@/i18n.ts'
@@ -16,9 +16,9 @@ export const DepartmentTree = ({ form }: { form: FormInstance }) => {
 
   const { styles } = useStyle()
   const { t } = useTranslation()
-  const setIds = useSetAtom(batchIdsAtom, usePageStoreOptions())
-  const setCurrent = useSetAtom(selectedDepartAtom, usePageStoreOptions())
-  const { data = [], isLoading } = useAtomValue(departTreeAtom, usePageStoreOptions())
+  const setIds = useSetAtom(batchIdsAtom)
+  const setCurrent = useSetAtom(selectedDepartAtom)
+  const { data = [], isLoading } = useAtomValue(departTreeAtom)
   const flattenMenusRef = useRef<IDepartment[]>([])
 
   useDeepCompareEffect(() => {

src/pages/system/departments/components/TreeNodeRender.tsx

@@ -1,6 +1,6 @@
-import { usePageStoreOptions } from '@/store'
+
 import { memo } from 'react'
-import { MenuItem } from '@/types'
+import { MenuItem } from '@/global'
 import { Popconfirm, Space, TreeDataNode } from 'antd'
 import { FormInstance } from 'antd/lib'
 import { useTranslation } from '@/i18n.ts'
@@ -14,9 +14,9 @@ export const TreeNodeRender = memo(({ node, form }: { node: MenuItem & TreeDataN
   const { name } = node
   const { t } = useTranslation()
   const { styles } = useStyle()
-  const { mutate } = useAtomValue(deleteDepartAtom, usePageStoreOptions())
+  const { mutate } = useAtomValue(deleteDepartAtom)
 
-  const setCurrent = useSetAtom(selectedDepartAtom, usePageStoreOptions())
+  const setCurrent = useSetAtom(selectedDepartAtom)
 
   return (
     <div className={styles.treeNode}>

src/pages/system/departments/index.tsx

@@ -1,4 +1,3 @@
-import { usePageStoreOptions } from '@/store'
 import { PageContainer, ProCard } from '@ant-design/pro-components'
 import { Flexbox } from 'react-layout-kit'
 import { DraggablePanel } from '@/components/draggable-panel'
@@ -11,6 +10,7 @@ import { defaultDepart, selectedDepartAtom, departTreeAtom, saveOrUpdateDepartAt
 import { useAtom, useAtomValue, } from 'jotai'
 import Glass from '@/components/glass'
 import { useEffect, useRef } from 'react'
+import UserPicker from '@/components/user-picker/UserPicker.tsx'
 
 const Departments = () => {
 
@@ -18,9 +18,9 @@ const Departments = () => {
     const { styles, cx } = useStyle()
     const [ form ] = Form.useForm()
     const inputRef = useRef<InputRef>()
-  const { data } = useAtomValue(departTreeAtom, usePageStoreOptions())
-  const { mutate, isPending, isError, error } = useAtomValue(saveOrUpdateDepartAtom, usePageStoreOptions())
-  const [ current, setCurrent ] = useAtom(selectedDepartAtom, usePageStoreOptions())
+    const { data } = useAtomValue(departTreeAtom)
+    const { mutate, isPending, isError, error } = useAtomValue(saveOrUpdateDepartAtom)
+    const [ current, setCurrent ] = useAtom(selectedDepartAtom)
 
     useEffect(() => {
 
@@ -40,6 +40,7 @@ const Departments = () => {
 
     return (
             <PageContainer breadcrumbRender={false} title={false} className={styles.container}>
+
                 <Flexbox horizontal>
                     <DraggablePanel expandable={false}
                                     placement="left"
@@ -119,8 +120,8 @@ const Departments = () => {
                                         <InputNumber/>
                                     </Form.Item>
                                     <Form.Item label={t('system.departments.form.manager_user_id', '负责人')}
-                           name={'path'}>
-                  <Input/>
+                                               name={'manager_user_id'}>
+                                        <UserPicker/>
                                     </Form.Item>
 
                                     <Form.Item label={t('system.departments.form.phone', '联系电话')}

src/pages/system/menus/components/BatchButton.tsx

@@ -1,4 +1,4 @@
-import { usePageStoreOptions } from '@/store'
+
 import { Button, Popconfirm } from 'antd'
 import { useAtomValue } from 'jotai'
 import { batchIdsAtom, deleteMenuAtom } from '@/store/menu.ts'
@@ -7,8 +7,8 @@ import { useTranslation } from '@/i18n.ts'
 const BatchButton = () => {
 
   const { t } = useTranslation()
-  const { isPending, mutate, } = useAtomValue(deleteMenuAtom, usePageStoreOptions())
-  const ids = useAtomValue(batchIdsAtom, usePageStoreOptions())
+  const { isPending, mutate, } = useAtomValue(deleteMenuAtom)
+  const ids = useAtomValue(batchIdsAtom)
 
 
   if (ids.length === 0) {

src/pages/system/menus/components/ButtonTable.tsx

@@ -1,7 +1,7 @@
 import { useTranslation } from '@/i18n.ts'
 import { EditableFormInstance, EditableProTable } from '@ant-design/pro-components'
 import { useMemo, useRef, useState } from 'react'
-import { IDataProps } from '@/types'
+import { IDataProps } from '@/global'
 import { FormInstance } from 'antd/lib'
 
 type DataSourceType = {

src/pages/system/menus/components/MenuTree.tsx

@@ -1,6 +1,6 @@
-import { usePageStoreOptions } from '@/store'
+
 import { Empty, Spin, Tree } from 'antd'
-import { MenuItem } from '@/types'
+import { MenuItem } from '@/global'
 import { useStyle } from '../style.ts'
 import { useTranslation } from '@/i18n.ts'
 import { useSetAtom } from 'jotai'
@@ -17,9 +17,9 @@ const MenuTree = ({ form }: { form: FormInstance }) => {
 
   const { styles } = useStyle()
   const { t } = useTranslation()
-  const setCurrentMenu = useSetAtom(selectedMenuAtom, usePageStoreOptions())
-  const setIds = useSetAtom(batchIdsAtom, usePageStoreOptions())
-  const { data = [], isLoading } = useAtomValue(menuDataAtom, usePageStoreOptions())
+  const setCurrentMenu = useSetAtom(selectedMenuAtom)
+  const setIds = useSetAtom(batchIdsAtom)
+  const { data = [], isLoading } = useAtomValue(menuDataAtom)
   const flattenMenusRef = useRef<MenuItem[]>([])
 
   useDeepCompareEffect(() => {

src/pages/system/menus/components/TreeNodeRender.tsx

@@ -1,6 +1,6 @@
-import { usePageStoreOptions } from '@/store'
+
 import { memo } from 'react'
-import { MenuItem } from '@/types'
+import { MenuItem } from '@/global'
 import { Popconfirm, Space, TreeDataNode } from 'antd'
 import { FormInstance } from 'antd/lib'
 import { useTranslation } from '@/i18n.ts'
@@ -14,9 +14,9 @@ export const TreeNodeRender = memo(({ node, form }: { node: MenuItem & TreeDataN
   const { title } = node
   const { t } = useTranslation()
   const { styles } = useStyle()
-  const { mutate } = useAtomValue(deleteMenuAtom, usePageStoreOptions())
+  const { mutate } = useAtomValue(deleteMenuAtom)
 
-  const setMenuData = useSetAtom(selectedMenuAtom, usePageStoreOptions())
+  const setMenuData = useSetAtom(selectedMenuAtom)
 
   return (
     <div className={styles.treeNode}>

src/pages/system/menus/index.tsx

@@ -1,6 +1,6 @@
 import Glass from '@/components/glass'
 import { useTranslation } from '@/i18n.ts'
-import { usePageStoreOptions } from '@/store'
+
 import { PlusOutlined } from '@ant-design/icons'
 import { PageContainer, ProCard } from '@ant-design/pro-components'
 import { Button, Form, Input, Radio, TreeSelect, InputNumber, notification, Alert, InputRef, Divider } from 'antd'
@@ -11,7 +11,7 @@ import ButtonTable from './components/ButtonTable.tsx'
 import { Flexbox } from 'react-layout-kit'
 import { DraggablePanel } from '@/components/draggable-panel'
 import { useStyle } from './style.ts'
-import { MenuItem } from '@/types'
+import { MenuItem } from '@/global'
 import MenuTree from './components/MenuTree.tsx'
 import BatchButton from '@/pages/system/menus/components/BatchButton.tsx'
 import { useEffect, useRef } from 'react'
@@ -21,9 +21,9 @@ const Menus = () => {
   const { styles, cx } = useStyle()
   const { t } = useTranslation()
   const [ form ] = Form.useForm()
-  const { mutate, isPending, error, isError } = useAtomValue(saveOrUpdateMenuAtom, usePageStoreOptions())
-  const { data = [] } = useAtomValue(menuDataAtom, usePageStoreOptions())
-  const [ currentMenu, setMenuData ] = useAtom<MenuItem>(selectedMenuAtom, usePageStoreOptions()) ?? {}
+  const { mutate, isPending, error, isError } = useAtomValue(saveOrUpdateMenuAtom)
+  const { data = [] } = useAtomValue(menuDataAtom)
+  const [ currentMenu, setMenuData ] = useAtom<MenuItem>(selectedMenuAtom) ?? {}
   const menuInputRef = useRef<InputRef | undefined>(undefined)
 
   useEffect(() => {

src/pages/system/roles/index.tsx

@@ -1,5 +1,5 @@
 import Switch from '@/components/switch'
-import { usePageStoreOptions } from '@/store'
+
 import { IMenu } from '@/types/menus'
 import {
   ActionType,
@@ -54,13 +54,13 @@ const Roles = memo(() => {
   const { styles } = useStyle()
   const [ form ] = Form.useForm()
   const actionRef = useRef<ActionType>()
-  const [ page, setPage ] = useAtom(pageAtom, usePageStoreOptions())
-  const [ search, setSearch ] = useAtom(searchAtom, usePageStoreOptions())
-  const [ roleIds, setRoleIds ] = useAtom(roleIdsAtom, usePageStoreOptions())
-  const { data, isLoading, isFetching, refetch } = useAtomValue(rolesAtom, usePageStoreOptions())
-  const { isPending, mutate, isSuccess } = useAtomValue(saveOrUpdateRoleAtom, usePageStoreOptions())
-  const { mutate: deleteRole, isPending: isDeleting } = useAtomValue(deleteRoleAtom, usePageStoreOptions())
-  const [ , setRole ] = useAtom(roleAtom, usePageStoreOptions())
+  const [ page, setPage ] = useAtom(pageAtom)
+  const [ search, setSearch ] = useAtom(searchAtom)
+  const [ roleIds, setRoleIds ] = useAtom(roleIdsAtom)
+  const { data, isLoading, isFetching, refetch } = useAtomValue(rolesAtom)
+  const { isPending, mutate, isSuccess } = useAtomValue(saveOrUpdateRoleAtom)
+  const { mutate: deleteRole, isPending: isDeleting } = useAtomValue(deleteRoleAtom)
+  const [ , setRole ] = useAtom(roleAtom)
   const [ open, setOpen ] = useState(false)
 
   const columns = useMemo(() => {

src/request.ts

@@ -1,5 +1,5 @@
 import { getToken, setToken } from '@/store/system.ts'
-import { IApiResult } from '@/types'
+import { IApiResult } from '@/global'
 import { Record } from '@icon-park/react'
 import { message } from 'antd'
 import axios, {

src/routes.tsx

@@ -24,7 +24,7 @@ import {
 import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import { memo } from 'react'
 import RootLayout from './layout/RootLayout'
-import { IRootContext, MenuItem } from './types'
+import { IRootContext, MenuItem } from './global'
 import { DevTools } from 'jotai-devtools'
 
 const PageRootLayout = () => {

src/service/base.ts

@@ -1,5 +1,5 @@
 import { request, AxiosRequestConfig } from '@/request.ts'
-import { IPage, IPageResult } from '@/types'
+import { IPage, IPageResult } from '@/global'
 
 
 export const createCURD = <TParams, TResult>(api: string, options?: AxiosRequestConfig) => {

src/service/system.ts

@@ -1,5 +1,5 @@
-import { IPageResult } from '@/types'
-import { IUserInfo } from '@/types/user'
+import { IPageResult } from '@/global'
+import { IUser, IUserInfo } from '@/types/user'
 import request from '../request.ts'
 import { LoginRequest, LoginResponse } from '@/types/login'
 import { createCURD } from '@/service/base.ts'
@@ -21,12 +21,14 @@ const systemServ = {
     return request.post<LoginResponse>('/sys/login', data)
   },
   user: {
+    ...createCURD<any, IUser>('/sys/user'),
     current: () => {
       return request.get<IUserInfo>('/sys/user/info')
     },
     menus: () => {
       return request.get<IPageResult<IMenu[]>>('/sys/user/menus')
-    }
+    },
+
 
   },
   role: {

src/store/department.ts

@@ -1,6 +1,6 @@
 import { atomWithMutation, atomWithQuery, queryClientAtom } from 'jotai-tanstack-query'
 import systemServ from '@/service/system.ts'
-import { IApiResult, IPage } from '@/types'
+import { IApiResult, IPage } from '@/global'
 import { IDepartment } from '@/types/department'
 import { atom, createStore } from 'jotai'
 import { t } from 'i18next'

src/store/menu.ts

@@ -1,5 +1,5 @@
 import systemServ from '@/service/system.ts'
-import { IApiResult, IPage, MenuItem } from '@/types'
+import { IApiResult, IPage, MenuItem } from '@/global'
 import { IMenu } from '@/types/menus'
 import { atomWithMutation, atomWithQuery, queryClientAtom } from 'jotai-tanstack-query'
 import { atom, createStore } from 'jotai'

src/store/role.ts

@@ -2,7 +2,7 @@ import { convertToBool } from '@/utils'
 import { atom } from 'jotai/index'
 import { IRole } from '@/types/roles'
 import { atomWithMutation, atomWithQuery, queryClientAtom } from 'jotai-tanstack-query'
-import { IApiResult, IPage } from '@/types'
+import { IApiResult, IPage } from '@/global'
 import systemServ from '@/service/system.ts'
 import { message } from 'antd'
 import { t } from '@/i18n.ts'

src/store/route.ts

@@ -1,4 +1,4 @@
-import { IRootContext } from '@/types'
+import { IRootContext } from '@/global'
 import { atom } from 'jotai'
 
 export const routeContextAtom = atom<IRootContext>({})

src/store/system.ts

@@ -1,4 +1,4 @@
-import { IAppData } from '@/types'
+import { IAppData } from '@/global'
 import {   createStore } from 'jotai'
 import { atomWithStorage } from 'jotai/utils'
 import { changeLanguage as setLang } from 'i18next'

src/store/user.ts

@@ -2,7 +2,7 @@ import { appAtom } from '@/store/system.ts'
 import { IMenu } from '@/types/menus'
 import {   IUserInfo } from '@/types/user'
 import { atom } from 'jotai/index'
-import { IApiResult, IAuth, IPageResult, MenuItem } from '@/types'
+import { IApiResult, IAuth, IPageResult, MenuItem } from '@/global'
 import { LoginRequest } from '@/types/login'
 import { atomWithMutation, atomWithQuery } from 'jotai-tanstack-query'
 import systemServ from '@/service/system.ts'
@@ -57,3 +57,21 @@ export const userMenuDataAtom = atomWithQuery<IApiResult<IPageResult<IMenu[]>>,
     cacheTime: 1000 * 60,
     retry: false,
 }))
+
+export const userSearchAtom = atom<{
+    dept_id: number,
+    key: string
+} | unknown>({})
+
+//user list
+export const userListAtom = atomWithQuery((get) => {
+    return {
+        queryKey: [ 'user_list', get(userSearchAtom) ],
+        queryFn: async ({ queryKey: [ , params ] }) => {
+            return await systemServ.user.list(params)
+        },
+        select: (data) => {
+            return data.data
+        },
+    }
+})

src/types/index.ts

@@ -0,0 +1,5 @@
+export * from './department'
+export * from './user'
+export * from './login'
+export * from './roles'
+export * from './menus'

src/types/menus.d.ts

@@ -6,6 +6,9 @@ export interface MenuButton {
 }
 
 
+interface Meta {
+}
+
 export interface IMenu {
     id: number,
     key: string,

src/utils/index.ts

@@ -1,5 +1,5 @@
 import { IMenu } from '@/types/menus'
-import { FiledNames, FlattenData, MenuItem, TreeItem } from '@/types'
+import { FiledNames, FlattenData, MenuItem, TreeItem } from '@/global'
 import { getIcon } from '@/components/icon'
 import { TreeDataNode } from 'antd'
 

src/utils/uuid.ts

@@ -1,4 +1,4 @@
-import { MenuItem } from '@/types'
+import { MenuItem } from '@/global'
 import { TreeDataNode } from 'antd'
 
 export function generateUUID() {