create-jnrs-vue 1.2.21 → 1.2.22

package/jnrs-vue/src/layout/SideMenuItem.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { useSystemStore } from '@jnrs/vue-core/pinia'
-import type { MenuItem } from '@jnrs/vue-core'
+import type { IMenuItem } from '@jnrs/vue-core'
 
 defineProps<{
-  listItem: MenuItem
+  listItem: IMenuItem
 }>()
 
 const { menuCollapse } = useSystemStore()

package/jnrs-vue/src/layout/TopHeader.vue

@@ -4,7 +4,8 @@ import { storeToRefs } from 'pinia'
 import { ElLoading, ElMessageBox } from 'element-plus'
 import { handleRouter } from '@jnrs/vue-core/router'
 import { GlobalSetting } from '@jnrs/vue-core/components'
-import { useSystemStore, useAuthStore, useMenuStore } from '@jnrs/vue-core/pinia'
+import { useSystemStore, useMenuStore } from '@jnrs/vue-core/pinia'
+import { useAuthStore } from '@/stores'
 import { useI18n } from '@/locales'
 import { LogoutApi } from '@/api/system'
 import ImageView from '@/components/common/ImageView.vue'

package/jnrs-vue/src/layout/index.vue

@@ -3,7 +3,8 @@ import { ref, watch, toRefs } from 'vue'
 import SideMenu from './SideMenu.vue'
 import TopHeader from './TopHeader.vue'
 import RouterTabs from './RouterTabs.vue'
-import { useAuthStore, useSystemStore } from '@jnrs/vue-core/pinia'
+import { useSystemStore } from '@jnrs/vue-core/pinia'
+import { useAuthStore } from '@/stores'
 
 const watermarkFont = ref({
   color: 'rgba(0, 0, 0, 0)',

package/jnrs-vue/src/locales/en.ts

@@ -36,7 +36,7 @@ export default {
   },
   home: {
     welcome: {
-      defaultName: 'User',
+      defaultName: 'IUser',
       accountLabel: 'Account: ',
       lastLoginLabel: 'Last Login: '
     },

package/jnrs-vue/src/main.ts

@@ -4,13 +4,12 @@ import '@jnrs/shared/styles/theme.scss'
 import '@/assets/styles/index.scss'
 
 import { createApp } from 'vue'
-import { createPinia } from 'pinia'
-import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
-import * as ElementPlusIconsVue from '@element-plus/icons-vue'
 import App from './App.vue'
+import pinia from '@/stores'
 import { router } from './router'
 import { i18n } from './locales'
 import { permissions } from './directives/permissions'
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
 
 const app = createApp(App)
 
@@ -21,10 +20,6 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
   app.component(key, component)
 }
 
-// pinia 相关
-const pinia = createPinia()
-pinia.use(piniaPluginPersistedstate)
-
 app.use(pinia)
 app.use(router)
 app.use(i18n)

package/jnrs-vue/src/router/index.ts

@@ -1,8 +1,9 @@
 import type { FileModules, RouteLocationNormalizedGeneric } from '@jnrs/vue-core/router'
-import type { MenuItem } from '@jnrs/vue-core'
+import type { IMenuItem } from '@jnrs/vue-core'
 import { LAYOUT_NAME, GLOBAL_COMPONENT, routes } from './routes'
 import { createVueRouter } from '@jnrs/vue-core/router'
-import { useAuthStore, useMenuStore } from '@jnrs/vue-core/pinia'
+import { useMenuStore } from '@jnrs/vue-core/pinia'
+import { useAuthStore } from '@/stores'
 import { MenuApi } from '@/api/system'
 import { hasMenuViewPermission } from '@/utils/permissions'
 
@@ -12,7 +13,7 @@ const fileModules = import.meta.glob('/src/views/**/*.vue') as FileModules
  * 递归过滤菜单树，仅保留当前用户有权限访问的节点
  * TODO 如果是后端返回的数据就没必要判断了，后端会判断
  */
-function filterMenuByPermission(menus: MenuItem[]): MenuItem[] {
+function filterMenuByPermission(menus: IMenuItem[]): IMenuItem[] {
   return menus
     .map((item) => {
       const children = item.children ? filterMenuByPermission(item.children) : []
@@ -27,7 +28,7 @@ function filterMenuByPermission(menus: MenuItem[]): MenuItem[] {
       }
       return null
     })
-    .filter(Boolean) as MenuItem[]
+    .filter(Boolean) as IMenuItem[]
 }
 
 const router = createVueRouter({

package/jnrs-vue/src/stores/index.ts

@@ -0,0 +1,8 @@
+import { createPinia } from 'pinia'
+import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
+
+const pinia = createPinia()
+pinia.use(piniaPluginPersistedstate)
+
+export default pinia
+export { useAuthStore } from './system/auth'

package/jnrs-vue/src/stores/system/auth.ts

@@ -0,0 +1,67 @@
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+import type { IDict, IUser, IRole } from '@/types'
+
+/**
+ * useAuthStore 权限仓库
+ * @returns hasAuthenticated 是否已身份验证
+ * @returns token 身份验证凭证
+ * @returns userInfo 用户信息
+ * @returns dict 字典
+ * @returns role 角色权限
+ * @methods asyncSetAuth 设置权限信息
+ * @methods clearAuth 清除权限信息
+ */
+export const useAuthStore = defineStore(
+  'jnrs-vue:auth',
+  () => {
+    const hasAuthenticated = ref(false)
+    const token = ref<string | null>(null)
+    const userInfo = ref<IUser | null>(null)
+    const dict = ref<IDict>({})
+    const role = ref<IRole[]>([])
+
+    const setToken = (d: string) => {
+      token.value = d
+      hasAuthenticated.value = true
+    }
+
+    const setUserInfo = (d: IUser) => {
+      userInfo.value = d
+    }
+
+    const setDict = (d: IDict) => {
+      dict.value = d
+    }
+
+    const setRole = (d: IRole[]) => {
+      role.value = d
+    }
+
+    const clearAuth = () => {
+      token.value = null
+      userInfo.value = null
+      dict.value = {}
+      role.value = []
+      hasAuthenticated.value = false
+    }
+
+    return {
+      hasAuthenticated,
+      token,
+      userInfo,
+      dict,
+      role,
+      setUserInfo,
+      setToken,
+      setDict,
+      setRole,
+      clearAuth
+    }
+  },
+  {
+    persist: {
+      pick: ['hasAuthenticated', 'token', 'userInfo', 'dict']
+    }
+  }
+)

package/jnrs-vue/src/types/index.ts

@@ -1,81 +1,2 @@
-/**
- * 文件信息
- */
-export interface Attachment {
-  /**
-   * 数据 id
-   */
-  id: number
-  /**
-   * 文件 id
-   */
-  documentId: number
-  /**
-   * 文件名
-   */
-  fileName: string
-  /**
-   * 文件名唯一标识（用于文件获取 API）
-   */
-  uniqueFileName: string
-  /**
-   * MIME 类型
-   */
-  fileType: string
-  /**
-   * 文件大小 单位：字节（Bytes）
-   */
-  fileSize: number
-}
-
-/**
- * 文件容器（用于图片或附件）
- */
-export interface Document {
-  id: number
-  description: string | null
-  attachments: Attachment[]
-}
-
-/**
- * 图片 & 附件数据
- */
-export interface FileContainer {
-  /**
-   * 图片
-   */
-  imageDocument?: Document
-  /**
-   * 附件
-   */
-  attachmentDocument?: Document
-}
-
-/**
- * 分页
- */
-export interface Pagination {
-  /**
-   * 当前页码
-   */
-  pageNo: number
-  /**
-   * 每页大小
-   */
-  pageSize: number
-}
-
-/**
- * 分页列表数据
- */
-// eslint-disable-next-line
-export interface PageTableData<T = Record<string, any>> extends Pagination {
-  /**
-   * 数据列表
-   */
-  list: T[]
-  /**
-   * 数据总数
-   */
-  count: number
-}
+export * from './system'
+export * from './webSocket'

package/jnrs-vue/src/types/system.d.ts

@@ -0,0 +1,115 @@
+/**
+ * 文件信息
+ */
+export interface IAttachment {
+    /**
+     * 数据 id
+     */
+    id: number;
+    /**
+     * 文件 id
+     */
+    documentId: number;
+    /**
+     * 文件名
+     */
+    fileName: string;
+    /**
+     * 文件名唯一标识（用于文件获取 API）
+     */
+    uniqueFileName: string;
+    /**
+     * MIME 类型
+     */
+    fileType: string;
+    /**
+     * 文件大小 单位：字节（Bytes）
+     */
+    fileSize: number;
+}
+/**
+ * 文件容器（用于图片或附件）
+ */
+export interface IDocument {
+    id: number;
+    description: string | null;
+    attachments: IAttachment[];
+}
+/**
+ * 图片 & 附件数据
+ */
+export interface IFile {
+    /**
+     * 图片
+     */
+    imageDocument?: IDocument;
+    /**
+     * 附件
+     */
+    attachmentDocument?: IDocument;
+}
+/**
+ * 分页
+ */
+export interface IPagination {
+    /**
+     * 当前页码
+     */
+    pageNo: number;
+    /**
+     * 每页大小
+     */
+    pageSize: number;
+}
+/**
+ * 分页列表数据
+ */
+export interface IPageTableData<T = Record<string, any>> extends IPagination {
+    /**
+     * 数据列表
+     */
+    list: T[];
+    /**
+     * 数据总数
+     */
+    count: number;
+}
+/**
+ * 用户信息
+ */
+export interface IUser {
+    id: number;
+    name: string;
+    role: number;
+    permissions?: string[];
+    jobTitle?: number;
+    workNo?: string;
+    workgroup?: string;
+    avatarFileName?: string;
+    [key: string]: unknown;
+}
+/**
+ * 字典
+ */
+export interface IDictItem {
+    label: string;
+    value: string | number;
+    sequence: number;
+    displayColor?: string;
+    [key: string]: unknown;
+}
+/**
+ * 字典键值对
+ */
+export interface IDict {
+    [key: string]: IDictItem[];
+}
+/**
+ * 角色
+ */
+export interface IRole {
+    label: string;
+    value: string | number;
+    permissions?: string[];
+    [key: string]: unknown;
+}

package/jnrs-vue/src/types/system.js

@@ -0,0 +1 @@
+export {};

package/jnrs-vue/src/types/system.ts

@@ -0,0 +1,124 @@
+/**
+ * 文件信息
+ */
+export interface IAttachment {
+  /**
+   * 数据 id
+   */
+  id: number
+  /**
+   * 文件 id
+   */
+  documentId: number
+  /**
+   * 文件名
+   */
+  fileName: string
+  /**
+   * 文件名唯一标识（用于文件获取 API）
+   */
+  uniqueFileName: string
+  /**
+   * MIME 类型
+   */
+  fileType: string
+  /**
+   * 文件大小 单位：字节（Bytes）
+   */
+  fileSize: number
+}
+
+/**
+ * 文件容器（用于图片或附件）
+ */
+export interface IDocument {
+  id: number
+  description: string | null
+  attachments: IAttachment[]
+}
+
+/**
+ * 图片 & 附件数据
+ */
+export interface IFile {
+  /**
+   * 图片
+   */
+  imageDocument?: IDocument
+  /**
+   * 附件
+   */
+  attachmentDocument?: IDocument
+}
+
+/**
+ * 分页
+ */
+export interface IPagination {
+  /**
+   * 当前页码
+   */
+  pageNo: number
+  /**
+   * 每页大小
+   */
+  pageSize: number
+}
+
+/**
+ * 分页列表数据
+ */
+// eslint-disable-next-line
+export interface IPageTableData<T = Record<string, any>> extends IPagination {
+  /**
+   * 数据列表
+   */
+  list: T[]
+  /**
+   * 数据总数
+   */
+  count: number
+}
+
+/**
+ * 用户信息
+ */
+export interface IUser {
+  id: number
+  name: string
+  role: number
+  permissions?: string[]
+  jobTitle?: number
+  workNo?: string
+  workgroup?: string
+  avatarFileName?: string
+  [key: string]: unknown
+}
+
+/**
+ * 字典
+ */
+export interface IDictItem {
+  label: string
+  value: string | number
+  sequence: number
+  displayColor?: string
+  [key: string]: unknown
+}
+
+/**
+ * 字典键值对
+ */
+export interface IDict {
+  [key: string]: IDictItem[]
+}
+
+/**
+ * 角色
+ */
+export interface IRole {
+  label: string
+  value: string | number
+  permissions?: string[]
+  [key: string]: unknown
+}

package/jnrs-vue/src/types/webSocket.ts

@@ -1,19 +1,19 @@
-export interface MsgIdMessage {
+export interface IMsgIdMessage {
   msgId: string
   d: unknown
 }
 
-export interface TypeDataMessage {
+export interface ITypeDataMessage {
   type: string | number
   data: unknown
 }
 
 // 类型守卫函数 MsgId 结构
-export function isMsgIdMessage(msg: unknown): msg is MsgIdMessage {
+export function isMsgIdMessage(msg: unknown): msg is IMsgIdMessage {
   return typeof msg === 'object' && msg !== null && 'msgId' in msg && 'd' in msg
 }
 
 // 类型守卫函数 Type 结构
-export function isTypeDataMessage(msg: unknown): msg is TypeDataMessage {
+export function isTypeDataMessage(msg: unknown): msg is ITypeDataMessage {
   return typeof msg === 'object' && msg !== null && 'type' in msg && 'data' in msg
 }

package/jnrs-vue/src/utils/dict.ts

@@ -0,0 +1,59 @@
+/**
+ * @Author : TanRui
+ * @WeChat : Tan578853789
+ * @File   : dict.ts
+ * @Date   : 2025/12/04
+ * @Desc.  : 字典类函数
+ */
+
+import type { IDictItem } from '@/types'
+import { useAuthStore } from '@/stores'
+
+/**
+ * 根据字典名称获取字典数据
+ * @param name 字典名称
+ * @returns 某字典名称所对应的字典列表数据
+ */
+export const getDictList = (name: string): IDictItem[] => {
+  const { dict } = useAuthStore()
+  if (!name || !Object.hasOwn(dict, name)) return []
+  return dict[name]
+}
+
+/**
+ * 根据字典名称和字典值获取字典标签
+ * @param name 字典名称
+ * @param value 字典值
+ * @returns 某字典名称所对应的字典标签
+ */
+export const getDictLabel = (name: string, value: string | number): string => {
+  if (!name) return ''
+  const { dict } = useAuthStore()
+  if (!Object.hasOwn(dict, name)) return String(value)
+  return dict[name].find((d) => String(d.value) === String(value))?.label || String(value)
+}
+
+/**
+ * 根据字典名称和字典标签获取字典值
+ * @param name 字典名称
+ * @param label 字典标签
+ * @returns 某字典名称所对应的字典值
+ */
+export const getDictValue = (name: string, label: string): string | number | undefined => {
+  if (!name) return ''
+  const { dict } = useAuthStore()
+  if (!Object.hasOwn(dict, name)) return undefined
+  return dict[name].find((d) => String(d.label) === String(label))?.value || undefined
+}
+
+/**
+ * 根据字典名称和字典值获取字典颜色
+ * @param name 字典名称
+ * @param value 字典值
+ * @returns 某字典名称所对应的字典颜色
+ */
+export const getDictColor = (name: string, value: string | number): string => {
+  const { dict } = useAuthStore()
+  if (!name || !Object.hasOwn(dict, name)) return ''
+  return dict[name].find((d) => String(d.value) === String(value))?.displayColor || ''
+}

package/jnrs-vue/src/utils/file.ts

@@ -25,7 +25,7 @@ export const getFileUrl = async (uniqueFileName: string) => {
  * @param fieldName - 要提取的对象字段名（默认 'id'）
  * @returns 提取出的 string | number 值，或 undefined
  */
-export function extractFieldId(value: unknown, fieldName: string = 'id'): string | number | undefined {
+export function extractFieldId(value: unknown, fieldName: string = 'id') {
   // 1. 排除 null 和 undefined
   if (value == null) return undefined
 

package/jnrs-vue/src/utils/index.ts

@@ -0,0 +1,4 @@
+export * from './packages'
+export * from './dict'
+export * from './file'
+export * from './permissions'

package/jnrs-vue/src/utils/packages.ts

@@ -7,86 +7,27 @@
  */
 
 import { ElMessage, ElLoading } from 'element-plus'
-import {
-  getDictList as _getDictList,
-  getDictLabel as _getDictLabel,
-  getDictValue as _getDictValue,
-  getDictColor as _getDictColor,
-  downloadByBlob as _downloadByBlob
-} from '@jnrs/shared'
-import { useAuthStore } from '@jnrs/vue-core/pinia'
-import { objectToFormData as _objectToFormData } from '@jnrs/shared'
+import { objectToFormData as _objectToFormData, downloadByBlob as _downloadByBlob } from '@jnrs/shared'
 import { FileApi } from '@/api/common'
 
-/**
- * 根据字典名称获取字典数据
- * @param name 字典名称
- * @returns 某字典名称所对应的字典列表数据
- */
-export const getDictList = (name: string) => {
-  const { dict } = useAuthStore()
-  if (dict) {
-    return _getDictList(name, dict)
-  }
-}
-
-/**
- * 根据字典名称和字典值获取字典标签
- * @param name 字典名称
- * @param value 字典值
- * @returns 某字典名称所对应的字典标签
- */
-export const getDictLabel = (name: string, value: string | number) => {
-  const { dict } = useAuthStore()
-  if (dict) {
-    return _getDictLabel(name, value, dict)
-  }
-}
-
-/**
- * 根据字典名称和字典标签获取字典值
- * @param name 字典名称
- * @param label 字典标签
- * @returns 某字典名称所对应的字典值
- */
-export const getDictValue = (name: string, label: string) => {
-  const { dict } = useAuthStore()
-  if (dict) {
-    return _getDictValue(name, label, dict)
-  }
-}
-
-/**
- * 根据字典名称和字典值获取字典颜色
- * @param name 字典名称
- * @param value 字典值
- * @returns 某字典名称所对应的字典颜色
- */
-export const getDictColor = (name: string, value: string | number) => {
-  const { dict } = useAuthStore()
-  if (dict) {
-    return _getDictColor(name, value, dict)
-  }
-}
-
 /**
  * 将对象转为 FormData
  * @param obj 对象
  * @returns FormData
  */
-export const objectToFormData = (obj: Record<string, unknown>) => {
+export const objectToFormData = (obj: object): FormData => {
   // 根据后端返回结果处理的映射关系
   const mapConfig = {
     // 图片
-    newImageFiles: { finallyKey: 'orginImageNames', valueKey: 'uniqueFileName' },
+    newImageFiles: { finallyKey: 'originImageNames', valueKey: 'uniqueFileName' },
     // 通用附件
-    newAttachmentFile: { finallyKey: 'orginAttachmentName', valueKey: 'uniqueFileName' },
+    newAttachmentFile: { finallyKey: 'originAttachmentName', valueKey: 'uniqueFileName' },
     // 程序文件
-    newProgramFile: { finallyKey: 'orginProgramName', valueKey: 'uniqueFileName' },
+    newProgramFile: { finallyKey: 'originProgramName', valueKey: 'uniqueFileName' },
     // 数据库
     databaseFile: { finallyKey: 'databaseFile', valueKey: 'uniqueFileName' }
   }
-  return _objectToFormData(obj, mapConfig)
+  return _objectToFormData(obj as Record<string, unknown>, mapConfig)
 }
 
 /**