create-jnrs-vue 1.2.21 → 1.2.23

package/README.md

@@ -40,7 +40,7 @@ jnrs-vue/
 │   ├── router/           # 路由配置
 │   ├── api/              # 接口定义（已含 request 实例）
 │   ├── types/            # 类型定义
-│   ├── store/            # 状态管理
+│   ├── stores/           # 状态管理
 │   ├── utils/            # 工具函数
 │   ├── locales/          # 国际化
 │   └── main.ts           # 应用入口

package/jnrs-vue/.env.development

@@ -5,7 +5,7 @@ VITE_USE_MOCK = true
 
 # 后端接口基地址 - 开发环境
 # VITE_BASE_URL = '192.168.1.120:6001'
-VITE_BASE_URL = '192.168.1.112:5010'
+VITE_BASE_URL = '192.168.1.50:5001'
 
 # 应用运行主机（置空默认为 localhost）
 VITE_APP_HOST = ''

package/jnrs-vue/README.md

@@ -26,7 +26,7 @@ jnrs-vue/
 │   ├── router/           # 路由配置
 │   ├── api/              # 接口定义（已含 request 实例）
 │   ├── types/            # 类型定义
-│   ├── store/            # 状态管理
+│   ├── stores/           # 状态管理
 │   ├── utils/            # 工具函数
 │   ├── locales/          # 国际化
 │   └── main.ts           # 应用入口

package/{bin → jnrs-vue/bin}/upgrade.mjs

@@ -7,7 +7,7 @@
  */
 
 import { execSync } from 'child_process'
-import { cpSync, readFileSync, writeFileSync } from 'fs'
+import { cpSync, readFileSync, writeFileSync, rmSync } from 'fs'
 import { join } from 'path'
 
 console.log('🔄 正在拉取最新模板...')
@@ -37,4 +37,4 @@ console.log('   - 检查 package.json 差异')
 console.log('   - src/ 目录未自动更新，请手动合并新功能')
 
 // 4. 清理临时目录
-execSync('rm -rf _temp_new')
+rmSync('_temp_new', { recursive: true, force: true })

package/jnrs-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jnrs-vue",
-  "version": "1.2.21",
+  "version": "1.2.23",
   "description": "JNRS 信息化管理系统",
   "author": "talia_tan",
   "private": true,
@@ -8,6 +8,9 @@
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
+  "bin": {
+    "upgrade-jnrs-vue": "./bin/upgrade.mjs"
+  },
   "scripts": {
     "dev": "vite",
     "build": "run-p type-check \"build-only {@}\" --",
@@ -19,8 +22,8 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.2",
-    "@jnrs/shared": "1.1.15",
-    "@jnrs/vue-core": "1.2.10",
+    "@jnrs/shared": "1.1.16",
+    "@jnrs/vue-core": "1.2.11",
     "@jnrs/lingshu-smart": "2.2.4",
     "@vueuse/core": "^14.1.0",
     "element-plus": "^2.13.3",

package/jnrs-vue/src/api/common/index.ts

@@ -7,7 +7,7 @@ import { axiosRequest } from '../request'
  */
 export const FileApi = (uniqueFileName: string): Promise<Blob> => {
   return axiosRequest({
-    url: '/api/files/' + uniqueFileName,
+    url: '/files/' + uniqueFileName,
     method: 'get',
     responseType: 'blob',
     showErrorMsg: false
@@ -19,7 +19,7 @@ export const FileApi = (uniqueFileName: string): Promise<Blob> => {
  */
 // import { useFetch } from '@vueuse/core'
 // export const FileApi = (uniqueFileName: string) => {
-//   return useFetch(`/api/files/${uniqueFileName}`, {
+//   return useFetch(`/files/${uniqueFileName}`, {
 //     method: 'get',
 //     headers: {
 //       responseType: 'blob'

package/jnrs-vue/src/api/demos/index.ts

@@ -1,12 +1,20 @@
-import type { Pagination, PageTableData, FileContainer } from '@/types'
+/**
+ * @Author : TanRui
+ * @WeChat : Tan578853789
+ * @File   : demos/index.ts
+ * @Date   : 2026/03/01
+ * @Desc.  : 示例模块接口文档（可作为 AI Agent 上下文来源）
+ */
+
+import type { IBusinessResponse } from '@jnrs/shared'
+import type { IPagination, IPageTableData, IFile, IUser } from '@/types'
 import { axiosRequest } from '../request'
-import { extractFieldId } from '@/utils/file'
-import { objectToFormData } from '@/utils/packages'
+import { objectToFormData } from '@/utils'
 
 /**
- * 项目
+ * 项目 - 详情
  */
-export interface ProjectItem extends FileContainer {
+export interface Project extends IFile {
   id: string
   programCode: string
   program: string
@@ -23,9 +31,9 @@ export interface ProjectItem extends FileContainer {
 }
 
 /**
- * 新增
+ * 新增项目 - 忽略字段
  */
-type AddProjectOmitKeys =
+type CreateProjectOmit =
   | 'id'
   | 'programCode'
   | 'program'
@@ -37,28 +45,54 @@ type AddProjectOmitKeys =
   | 'imageDocument'
   | 'attachmentDocument'
 
-export type AddProjectItem = Omit<ProjectItem, AddProjectOmitKeys> & {
+/**
+ * 项目 - 创建
+ */
+export type EditProject = Omit<Project, CreateProjectOmit> & {
   id?: string
-  managerId?: Record<string, unknown> | unknown
+  managerId?: Record<string, unknown> | number
   newAttachmentFile: []
   newImageFiles: []
 }
 
 /**
- * 查询
+ * 项目 - 查询
  */
-export interface ProjectQuery extends Pagination {
+export interface ProjectQuery extends IPagination {
   code?: string
   projectType?: '敏捷型' | '瀑布型' | '混合型'
   manager?: string
 }
 
+// 测试 获取数据
+export const DataApiTest = (id: string): Promise<IUser> => {
+  return axiosRequest({
+    url: '/auth/user-info',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+// 测试 获取全量数据
+export const FullDataApiTest = (id: string): Promise<IBusinessResponse<IUser>> => {
+  return axiosRequest({
+    url: '/auth/user-info',
+    method: 'get',
+    params: {
+      id
+    },
+    returnFullResponse: true // 需要返回完整响应数据时使用该选项
+  })
+}
+
 /**
  * 测试 404 错误
  */
 export const NotFoundApi = () => {
   return axiosRequest({
-    url: '/mock/notFound',
+    url: '/notFound',
     method: 'get'
   })
 }
@@ -68,7 +102,7 @@ export const NotFoundApi = () => {
  */
 export const NoNeedAuthApi = () => {
   return axiosRequest({
-    url: '/mock/auth/no',
+    url: '/auth/no',
     method: 'post',
     noAuth: true
   })
@@ -80,7 +114,7 @@ export const NoNeedAuthApi = () => {
  */
 export const NoAuthApi = (showErrorMsg: boolean) => {
   return axiosRequest({
-    url: '/mock/auth/no',
+    url: '/auth/no',
     method: 'post',
     showErrorMsg
   })
@@ -89,43 +123,50 @@ export const NoAuthApi = (showErrorMsg: boolean) => {
 /**
  * 数据详情
  */
-export const DetailsApi = (): Promise<FileContainer> => {
+export const DetailsApi = (): Promise<IFile> => {
   return axiosRequest({
-    url: '/mock/details',
+    url: '/details',
     method: 'get'
   })
 }
 
 /**
- * 表单编辑（包含文件上传类需使用 formData 类型）
+ * 项目 - 编辑
  */
-export const EditApi = (data: AddProjectItem) => {
-  const formData = objectToFormData({
-    ...data,
-    managerId: extractFieldId(data.managerId, 'managerId')
-  })
+export const EditProjectApi = (data: EditProject) => {
   return axiosRequest({
-    url: '/mock/demos/save',
+    url: '/demos/save',
     method: 'post',
-    data: formData
+    data: objectToFormData(data) // 包含文件上传类需使用 formData 类型
+  })
+}
+
+/**
+ * 项目 - 更新
+ */
+export const UpdateProjectApi = (data: Project) => {
+  return axiosRequest({
+    url: '/demos/update',
+    method: 'put',
+    data
   })
 }
 
 /**
  * 删除数据
  */
-export const DelApi = (id: string) => {
+export const DeleteProjectApi = (id: string) => {
   return axiosRequest({
-    url: `/mock/demos/delete/${id}`,
+    url: `/demos/delete/${id}`,
     method: 'delete'
   })
 }
 /**
  * 列表数据
  */
-export const ListApi = (data?: ProjectQuery): Promise<PageTableData<ProjectItem>> => {
+export const ProjectListApi = (data?: ProjectQuery): Promise<IPageTableData<Project>> => {
   return axiosRequest({
-    url: '/mock/demos/table',
+    url: '/demos/table',
     method: 'get',
     data
   })
@@ -134,9 +175,9 @@ export const ListApi = (data?: ProjectQuery): Promise<PageTableData<ProjectItem>
 /**
  * 下载数据导入模板
  */
-export const ImportTemplateApi = (): Promise<Blob> => {
+export const DownloadTemplateApi = (): Promise<Blob> => {
   return axiosRequest({
-    url: '/mock/project/template',
+    url: '/project/template',
     method: 'post'
   })
 }
@@ -146,7 +187,7 @@ export const ImportTemplateApi = (): Promise<Blob> => {
  */
 export const ImportDataApi = (data: FormData) => {
   return axiosRequest({
-    url: '/mock/project/import',
+    url: '/project/import',
     method: 'post',
     data
   })
@@ -157,7 +198,7 @@ export const ImportDataApi = (data: FormData) => {
  */
 export const ExportApi = (data: Record<string, unknown>): Promise<Blob> => {
   return axiosRequest({
-    url: '/mock/project/export',
+    url: '/project/export',
     method: 'post',
     data
   })

package/jnrs-vue/src/api/request.ts

@@ -6,9 +6,10 @@
  * @Desc.  : axios 网络请求实例
  */
 
-import type { BusinessRequest, BusinessResponse } from '@jnrs/shared/request'
+import type { IBusinessRequest, IBusinessResponse } from '@jnrs/shared'
 import { createAxiosInstance } from '@jnrs/shared/request'
-import { useMockStore, useAuthStore } from '@jnrs/vue-core/pinia'
+import { useMockStore } from '@jnrs/vue-core/pinia'
+import { useAuthStore } from '@/stores'
 import { handleRouter } from '@jnrs/vue-core/router'
 import { ElMessage } from 'element-plus'
 
@@ -31,20 +32,18 @@ const axiosInstance = createAxiosInstance({
  * @param options 请求配置项
  * @returns Promise<T> 响应数据
  */
-const axiosRequest = <T = BusinessResponse>(options: BusinessRequest): Promise<T> => {
+const axiosRequest = <T = IBusinessResponse>(options: IBusinessRequest): Promise<T> => {
   if (!axiosInstance) {
     throw new Error('请先调用 createRequest 初始化 axios 实例')
   }
 
-  // 如果是模拟请求，则将请求地址改为模拟地址
-  const { isMock } = useMockStore()
+  const { useMockServe } = useMockStore()
 
-  if (isMock) {
-    options.url = options.mockUrl
-      ? options.mockUrl
-      : options.url.startsWith('/mock')
-        ? options.url
-        : '/mock' + options.url
+  // 如果开启 mock 模式，则将请求地址改为 mock 地址，否则使用 api 地址
+  if (useMockServe) {
+    options.url = '/api/mock' + options.url
+  } else {
+    options.url = '/api' + options.url
   }
 
   return axiosInstance(options)

package/jnrs-vue/src/api/system/index.ts

@@ -1,16 +1,17 @@
-import type { Dict, DictItem, User, Role } from '@jnrs/shared'
-import type { MenuItem } from '@jnrs/vue-core'
+import type { IDict, IDictItem, IRole } from '@/types'
+import type { IMenuItem } from '@jnrs/vue-core'
+import type { IUser } from '@/types'
 import { axiosRequest } from '../request'
-import { objectToFormData } from '@/utils/packages'
+import { objectToFormData } from '@/utils'
 
 // 菜单
-export const MenuApi = (): Promise<MenuItem[]> => {
-  return axiosRequest({
-    url: '/system/menu.json', // /public 文件夹下
-    mockUrl: '/mock/menu',
-    method: 'get',
-    noAuth: true // 本地数据忽略 token 验证
-  })
+export const MenuApi = async (): Promise<IMenuItem[]> => {
+  const response = await fetch('/system/menu.json')
+  if (!response.ok) {
+    throw new Error(`Failed to load menu.json: ${response.status} ${response.statusText}`)
+  }
+  const data = await response.json()
+  return data.data
 }
 
 // 登录
@@ -22,16 +23,16 @@ interface LoginParams {
 /**
  * 登录结果
  */
-export interface LoginResult extends User {
+export interface LoginResult extends IUser {
   token: string
-  dict: Dict
+  dict: IDict
 }
 
 export const LoginApi = (data: LoginParams): Promise<LoginResult> => {
   return axiosRequest({
-    url: '/api/auth/login',
+    url: '/auth/login',
     method: 'post',
-    data,
+    data: objectToFormData(data),
     noAuth: true
   })
 }
@@ -39,15 +40,15 @@ export const LoginApi = (data: LoginParams): Promise<LoginResult> => {
 // 退出登录
 export const LogoutApi = () => {
   return axiosRequest({
-    url: '/api/auth/logout',
+    url: '/auth/logout',
     method: 'get'
   })
 }
 
 // 获取用户信息
-export const UserInfoApi = (): Promise<User> => {
+export const UserInfoApi = (): Promise<IUser> => {
   return axiosRequest({
-    url: '/api/auth/user-info',
+    url: '/auth/user-info',
     method: 'get'
   })
 }
@@ -55,7 +56,7 @@ export const UserInfoApi = (): Promise<User> => {
 // 修改头像
 export const AvatarChangeApi = (data: File) => {
   return axiosRequest({
-    url: '/api/user/avatar',
+    url: '/user/avatar',
     method: 'post',
     data: objectToFormData({ file: data })
   })
@@ -69,16 +70,16 @@ interface PasswordChange {
 
 export const PasswordChangeApi = (data: PasswordChange) => {
   return axiosRequest({
-    url: '/api/auth/change-password',
+    url: '/auth/change-password',
     method: 'post',
     data
   })
 }
 
 // 获取字典列表
-export const DictApi = (): Promise<DictItem[]> => {
+export const DictApi = (): Promise<IDictItem[]> => {
   return axiosRequest({
-    url: '/api/dict-manager',
+    url: '/dict-manager',
     method: 'get'
   })
 }
@@ -86,24 +87,24 @@ export const DictApi = (): Promise<DictItem[]> => {
 // 获取单个字典
 export const DictDetailApi = (id: string) => {
   return axiosRequest({
-    url: `/api/dict-manager/detail/${id}`,
+    url: `/dict-manager/detail/${id}`,
     method: 'get'
   })
 }
 
 // 修改单个字典
-export const DictChangeApi = (data: DictItem) => {
+export const DictChangeApi = (data: IDictItem) => {
   return axiosRequest({
-    url: '/api/dict-manager/detail',
+    url: '/dict-manager/detail',
     method: 'post',
     data
   })
 }
 
 // 获取角色列表
-export const RoleApi = (): Promise<Role[]> => {
+export const RoleApi = (): Promise<IRole[]> => {
   return axiosRequest({
-    url: '/api/role-manager',
+    url: '/role-manager',
     method: 'get',
     noAuth: true
   })

package/jnrs-vue/src/components/common/CardTable.vue

@@ -7,7 +7,7 @@
  -->
 
 <script setup lang="ts">
-import type { Pagination, PageTableData } from '@/types'
+import type { IPagination, IPageTableData } from '@/types'
 import { ref, onActivated } from 'vue'
 import { JnPagination, JnTable } from '@jnrs/vue-core/components'
 import { debounce } from '@jnrs/shared/lodash'
@@ -17,7 +17,7 @@ export interface Props {
    * 获取数据表格 api 函数
    */
   // eslint-disable-next-line
-  getTableDataApi?: (data?: Pagination) => Promise<PageTableData<any>>
+  getTableDataApi?: (data?: IPagination) => Promise<IPageTableData<any>>
 }
 
 const { getTableDataApi } = defineProps<Props>()
@@ -25,7 +25,7 @@ const { getTableDataApi } = defineProps<Props>()
 const loading = ref(false)
 const tableData = ref()
 const total = ref(0)
-const pagination = ref<Pagination>({ pageNo: 1, pageSize: 20 })
+const pagination = ref<IPagination>({ pageNo: 1, pageSize: 20 })
 
 const getTable = debounce(async () => {
   if (!getTableDataApi) {

package/jnrs-vue/src/components/common/DictTag.vue

@@ -8,7 +8,7 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import { getDictLabel, getDictColor } from '@/utils/packages'
+import { getDictLabel, getDictColor } from '@/utils'
 
 export interface Props {
   dictName: string

package/jnrs-vue/src/components/common/ImageView.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { FileItem } from '@jnrs/shared'
-import type { Attachment } from '@/types'
+import type { IFileItem } from '@jnrs/shared'
+import type { IAttachment } from '@/types'
 import { ref, watch, onActivated, onDeactivated, onBeforeUnmount } from 'vue'
 import { blobToUrl } from '@jnrs/shared'
 import { debounce } from '@jnrs/shared/lodash'
@@ -12,7 +12,7 @@ export interface Props {
   /**
    * 要加载的文件列表 ｜ 文件名唯一标识 uniqueFileName
    */
-  loadKeys: Attachment[] | string | undefined
+  loadKeys: IAttachment[] | string | undefined
 
   /**
    * 是否清理文件副作用
@@ -26,7 +26,7 @@ const { loadKeys, clearSideEffects = false } = defineProps<Props>()
 const posterUrl = ref('')
 
 // 存储每个 URL 对应的 URL 对象
-const fileList = ref<FileItem[]>([])
+const fileList = ref<IFileItem[]>([])
 
 // 存储每个 URL 对应的 revoke 函数用于副作用清理
 const revokeFns = ref<(() => void)[]>([])

package/jnrs-vue/src/components/common/PdfView.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { FileItem } from '@jnrs/shared'
-import type { Attachment } from '@/types'
+import type { IFileItem } from '@jnrs/shared'
+import type { IAttachment } from '@/types'
 import { ref, watch, onActivated, onDeactivated, onBeforeUnmount } from 'vue'
 import { blobToUrl } from '@jnrs/shared'
 import { FileApi } from '@/api/common'
@@ -11,7 +11,7 @@ export interface Props {
   /**
    * 要加载的文件列表 ｜ 文件名唯一标识 uniqueFileName
    */
-  loadKeys: Attachment[] | string | undefined
+  loadKeys: IAttachment[] | string | undefined
 
   /**
    * 是否清理文件副作用
@@ -22,7 +22,7 @@ export interface Props {
 const { loadKeys, clearSideEffects = false } = defineProps<Props>()
 
 // 存储每个 URL 对应的 URL 对象
-const fileList = ref<FileItem[]>([])
+const fileList = ref<IFileItem[]>([])
 
 // 存储每个 URL 对应的 revoke 函数用于副作用清理
 const revokeFns = ref<(() => void)[]>([])

package/jnrs-vue/src/components/select/SelectManager.vue

@@ -7,7 +7,7 @@
  -->
 
 <script setup lang="ts">
-import { ListApi } from '@/api/demos/index'
+import { ProjectListApi } from '@/api/demos/index'
 import { JnSelectTemplate } from '@jnrs/vue-core/components'
 </script>
 
@@ -15,8 +15,8 @@ import { JnSelectTemplate } from '@jnrs/vue-core/components'
   <JnSelectTemplate
     tableName="项目经理"
     :keyValue="{ name: 'manager', id: 'managerId', code: 'code' }"
+    :listApi="ProjectListApi"
     optionSecondaryField="code"
-    :listApi="ListApi"
   >
     <template #table>
       <el-table-column prop="manager" label="项目经理" align="center" sortable />

package/jnrs-vue/src/composables/useCrud.ts

@@ -3,14 +3,14 @@ import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { debounce } from '@jnrs/shared/lodash'
 import { objectMatchAssign } from '@jnrs/shared'
-import type { Pagination, PageTableData } from '@/types'
+import type { IPagination, IPageTableData } from '@/types'
 
 interface CrudOptions<TItem, TForm, TQuery> {
   // 初始值
   defaultForm: () => TForm
   defaultQuery?: () => TQuery
   // API
-  listApi: (params: Partial<Pagination> & TQuery) => Promise<PageTableData<TItem> | TItem[]>
+  listApi: (params: Partial<IPagination> & TQuery) => Promise<IPageTableData<TItem> | TItem[]>
   saveApi: (data: TForm) => Promise<unknown>
   deleteApi?: (id: number) => Promise<unknown>
   // 可选：是否启用分页，默认 true
@@ -21,13 +21,22 @@ interface CrudOptions<TItem, TForm, TQuery> {
 }
 
 export function useCrud<TItem, TForm, TQuery = object>(options: CrudOptions<TItem, TForm, TQuery>) {
-  const { defaultForm, defaultQuery, listApi, saveApi, deleteApi, pagination: enablePagination = true, transformItem, beforeEdit } = options
+  const {
+    defaultForm,
+    defaultQuery,
+    listApi,
+    saveApi,
+    deleteApi,
+    pagination: enablePagination = true,
+    transformItem,
+    beforeEdit
+  } = options
 
   // 列表状态
   const loading = ref(false)
   const tableData = ref<TItem[]>([]) as Ref<TItem[]>
   const total = ref(0)
-  const pagination = ref<Pagination>({ pageNo: 1, pageSize: 20 })
+  const pagination = ref<IPagination>({ pageNo: 1, pageSize: 20 })
   const queryForm = ref(defaultQuery?.() ?? {}) as Ref<TQuery>
 
   // 表单状态
@@ -42,7 +51,7 @@ export function useCrud<TItem, TForm, TQuery = object>(options: CrudOptions<TIte
       const params = {
         ...(enablePagination ? pagination.value : {}),
         ...queryForm.value
-      } as Partial<Pagination> & TQuery
+      } as Partial<IPagination> & TQuery
       const res = await listApi(params)
       // 支持返回数组或 { list, count } 格式
       if (Array.isArray(res)) {
@@ -74,7 +83,7 @@ export function useCrud<TItem, TForm, TQuery = object>(options: CrudOptions<TIte
     queueMicrotask(() => {
       formRef.value?.resetFields()
       const matched = objectMatchAssign(
-        defaultForm() as Record<string, unknown>, 
+        defaultForm() as Record<string, unknown>,
         row as Record<string, unknown>
       ) as TForm
       form.value = (beforeEdit ? beforeEdit(row, matched) : matched) as TForm
@@ -124,8 +133,18 @@ export function useCrud<TItem, TForm, TQuery = object>(options: CrudOptions<TIte
   }
 
   return {
-    loading, tableData, total, pagination, queryForm,
-    dialogRef, formRef, form,
-    getList, openCreate, openEdit, submitForm, handleDelete
+    loading,
+    tableData,
+    total,
+    pagination,
+    queryForm,
+    dialogRef,
+    formRef,
+    form,
+    getList,
+    openCreate,
+    openEdit,
+    submitForm,
+    handleDelete
   }
-}
+}