create-jnrs-template-vue 1.2.5 → 1.2.7

package/jnrs-template-vue/README.md

@@ -16,30 +16,30 @@ pnpm build
 #### 项目结构
 ```Text
 jnrs-template-vue/
-├── dist/                 # 打包构建产物
-├── node_modules/         # 项目依赖
-├── viteMockServe/        # Mock 服务配置（用于开发环境模拟 API）
+├── viteMockServe/        # Mock 服务配置
 ├── public/               # 静态资源
-├── layout/               # 布局
 ├── src/                  # 源码目录
 │   ├── components/       # Vue 组件
 │   ├── composables/      # 组合式函数
+│   ├── layout/           # 布局
 │   ├── views/            # 页面视图
 │   ├── router/           # 路由配置
+│   ├── api/              # 接口定义
+│   ├── types/            # 类型定义
 │   ├── store/            # 状态管理
 │   ├── utils/            # 工具函数
+│   ├── locales/          # 国际化
 │   └── main.ts           # 应用入口
 ├── index.html            # HTML 入口文件
 ├── eslint.config.js      # ESLint 配置文件
-├── package.json          # 项目配置（依赖、脚本等）
+├── package.json          # 包管理配置
 └── vite.config.ts        # Vite 构建配置
 ├── tsconfig.json         # TypeScript 配置
 ├── auto-imports.d.ts     # 自动导入类型声明
 ├── components.d.ts       # 全局组件类型声明
 ├── README.md             # 项目文档
-├── .env.example          # 环境变量模板（供参考）
-├── .env.development      # 开发环境变量（全局）
-├── .env.production       # 生产环境变量（全局）
+├── .env.development      # 开发环境变量
+├── .env.production       # 生产环境变量
 ├── .gitignore            # Git 忽略规则
 ├── .prettierrc.json      # Prettier 格式化配置
 ```

package/jnrs-template-vue/package.json

@@ -1,8 +1,8 @@
 {
   "name": "jnrs-template-vue",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "JNRS 信息化管理系统",
-  "author": "Talia-Tan",
+  "author": "talia_tan",
   "private": true,
   "type": "module",
   "engines": {
@@ -19,14 +19,14 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.2",
-    "@jnrs/shared": "1.1.10",
-    "@jnrs/vue-core": "1.2.5",
+    "@jnrs/shared": "1.1.11",
+    "@jnrs/vue-core": "1.2.9",
     "@vueuse/core": "^14.1.0",
     "element-plus": "^2.11.9",
     "pinia": "^3.0.4",
     "pinia-plugin-persistedstate": "^4.7.1",
     "vue": "^3.5.25",
-    "vue-i18n": "^9.14.5"
+    "vue-i18n": "^11.2.8"
   },
   "devDependencies": {
     "@tsconfig/node22": "^22.0.5",

package/jnrs-template-vue/public/system/menu.json

@@ -3,8 +3,6 @@
   "msg": "操作成功",
   "data": [
     {
-      "path": "/demos",
-      "name": "Demos",
       "meta": {
         "title": "功能演示",
         "icon": "StarFilled",
@@ -37,6 +35,23 @@
             "todoCount": 0
           },
           "component": "/demos/crud/index"
+        },
+        {
+          "path": "/testRedirect",
+          "name": "TestRedirect",
+          "meta": {
+            "title": "重定向测试"
+          },
+          "redirect": "/crud"
+        },
+        {
+          "path": "/testAlias",
+          "name": "TestAlias",
+          "meta": {
+            "title": "相同component不同path",
+            "testId": 1
+          },
+          "component": "/demos/crud/index"
         }
       ]
     },
@@ -76,8 +91,7 @@
             "todoCount": 0,
             "permissions": ["user:view", "user:edit"]
           },
-          "component": "/system/user/index",
-          "redirect": "/crud"
+          "component": "/system/user/index"
         },
         {
           "path": "/system/role",

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

@@ -124,7 +124,7 @@ export const ImportTemplateApi = (): Promise<Blob> => {
 /**
  * 项目数据导入
  */
-export const ImportDataApi = (data: { file: File }) => {
+export const ImportDataApi = (data: FormData) => {
   return axiosRequest({
     url: '/mock/project/import',
     method: 'post',

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

@@ -7,7 +7,7 @@
  -->
 
 <script setup lang="ts">
-import type { PageTableData, Pagination } from '@/types'
+import type { Pagination, PageTableData } from '@/types'
 import { ref, onActivated } from 'vue'
 import { JnPagination, JnTable } from '@jnrs/vue-core/components'
 import { debounce } from '@jnrs/shared/lodash'
@@ -16,7 +16,8 @@ interface Props {
   /**
    * 获取数据表格 api 函数
    */
-  getTableDataApi?: (...args: any[]) => Promise<PageTableData<any>>
+  // eslint-disable-next-line
+  getTableDataApi?: (data?: Pagination) => Promise<PageTableData<any>>
 }
 
 const { getTableDataApi } = defineProps<Props>()
@@ -24,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: 10 })
+const pagination = ref<Pagination>({ pageNo: 1, pageSize: 20 })
 
 const getTable = debounce(async () => {
   if (!getTableDataApi) {
@@ -32,14 +33,13 @@ const getTable = debounce(async () => {
   }
   loading.value = true
   try {
-    const res = await getTableDataApi({
-      ...pagination.value
-    })
-    tableData.value = res.list.map((item) => ({
-      ...item,
-      newImageFiles: item.imageDocument?.attachments,
-      newAttachmentFile: item.attachmentDocument?.attachments
-    }))
+    const res = await getTableDataApi(pagination.value)
+    tableData.value =
+      res.list?.map((item) => ({
+        ...item,
+        newImageFiles: item.imageDocument?.attachments,
+        newAttachmentFile: item.attachmentDocument?.attachments
+      })) || []
     total.value = res.count
   } catch (error) {
     console.error(error)
@@ -51,6 +51,10 @@ const getTable = debounce(async () => {
 onActivated(() => {
   getTable()
 })
+
+defineExpose({
+  getTable
+})
 </script>
 
 <template>

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

@@ -12,9 +12,15 @@ import { JnSelectTemplate } from '@jnrs/vue-core/components'
 </script>
 
 <template>
-  <JnSelectTemplate tableName="项目经理" :keyValue="{ label: 'manager', value: 'managerId' }" :listApi="TableApi">
+  <JnSelectTemplate
+    tableName="项目经理"
+    :keyValue="{ name: 'manager', id: 'managerId', code: 'code' }"
+    optionSecondaryField="code"
+    :listApi="TableApi"
+  >
     <template #table>
       <el-table-column prop="manager" label="项目经理" align="center" sortable />
+      <el-table-column prop="code" label="编码" align="center" sortable />
     </template>
   </JnSelectTemplate>
 </template>

package/jnrs-template-vue/src/layout/SideMenu.vue

@@ -30,7 +30,7 @@ const route = useRoute()
       class="leftSide_menu"
       popper-class="layoutPage_leftSide_menu_popper"
       :router="true"
-      :default-active="route.path"
+      :default-active="route.name"
       :collapse="menuCollapse"
       :unique-opened="true"
     >

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

@@ -11,7 +11,7 @@ const { menuCollapse } = useSystemStore()
 
 <template>
   <!-- 一级路由 -->
-  <el-menu-item :index="listItem.path" v-if="!listItem.children">
+  <el-menu-item :index="listItem.name" :route="listItem.path" v-if="!listItem.children">
     <el-icon v-if="listItem.meta.icon">
       <component :is="listItem.meta.icon" />
     </el-icon>

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

@@ -62,7 +62,8 @@ const showGlobalSetting = () => {
       <el-popover placement="bottom" trigger="click" :teleported="false" :width="260" :hide-after="0">
         <template #reference>
           <span class="userMenu_reference">
-            <ImageView class="userMenu_avatar" :loadKeys="userInfo?.avatarFileName" />
+            <ImageView class="userMenu_avatar" :loadKeys="userInfo.avatarFileName" v-if="userInfo?.avatarFileName" />
+            <img class="userMenu_avatar" src="@/assets/images/common/avatar.png" v-else />
             <span>{{ userInfo?.name }}</span>
             <DictTag dictName="role" :value="userInfo.role" v-if="userInfo?.role" />
             <el-icon class="userMenu_icon"><arrow-down /></el-icon>
@@ -136,15 +137,14 @@ $topHoverSize: 35px;
       }
     }
     .userMenu_avatar {
-      width: $topHoverSize;
-      height: $topHoverSize;
+      width: $topHoverSize !important;
+      height: $topHoverSize !important;
       border-radius: 50%;
       margin-right: 4px;
       overflow: hidden;
       background: var(--jnrs-background-head);
     }
     .userMenu_icon {
-      margin-left: 4px;
       color: var(--jnrs-font-primary-06);
     }
   }
@@ -178,7 +178,6 @@ $topHoverSize: 35px;
     }
   }
   .userMenu_roleName {
-    margin-left: 4px;
     color: var(--jnrs-color-primary);
   }
 }

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

@@ -1,7 +1,7 @@
-import { LAYOUT_NAME, GLOBAL_COMPONENT, routes } from './routes'
-import { createVueRouter } from '@jnrs/vue-core/router'
 import type { FileModules, RouteLocationNormalizedGeneric } from '@jnrs/vue-core/router'
 import type { MenuItem } 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 { MenuApi } from '@/api/system'
 import { hasMenuViewPermission } from '@/utils/permissions'

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

@@ -68,7 +68,8 @@ export interface Pagination {
 /**
  * 分页列表数据
  */
-export interface PageTableData<T> extends Pagination {
+// eslint-disable-next-line
+export interface PageTableData<T = Record<string, any>> extends Pagination {
   /**
    * 数据列表
    */

package/jnrs-template-vue/src/views/demos/crud/index.vue

@@ -5,6 +5,7 @@ import type { ProjectItem, AddProjectItem } from '@/api/demos/index'
 import { ref, onActivated } from 'vue'
 import { ElMessage } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
+import { useRoute } from '@jnrs/vue-core/router'
 import { objectMatchAssign, dateFormatsToObject } from '@jnrs/shared'
 import { debounce } from '@jnrs/shared/lodash'
 import { isNumberGtZero } from '@jnrs/shared/validator'
@@ -25,7 +26,8 @@ interface ProcessedProjectItem extends ProjectItem {
 const loading = ref(false)
 const tableData = ref<ProcessedProjectItem[]>([])
 const total = ref(0)
-const pagination = ref<Pagination>({ pageNo: 1, pageSize: 10 })
+const pagination = ref<Pagination>({ pageNo: 1, pageSize: 20 })
+const route = useRoute()
 
 // 编辑
 const editDialogRef = ref()
@@ -128,6 +130,7 @@ const submitForm = () => {
 }
 
 onActivated(() => {
+  console.log(route.meta)
   getTable()
 })
 </script>

package/jnrs-template-vue/src/views/demos/unitTest/index.vue

@@ -31,6 +31,21 @@ const handleRouteChange = () => {
   })
 }
 
+const handleRouterSystemMine = () => {
+  handleRouter({
+    name: 'SystemMine',
+    query: {
+      id: 1
+    }
+  })
+  // handleRouter({
+  //   path: '/system/mine/index',
+  //   query: {
+  //     id: 1
+  //   }
+  // })
+}
+
 const changeI18n = () => {
   datetime.value = formatDateTime() + ' ' + formatWeekday()
   isFloatGtZero({}, '0', (msg) => {
@@ -80,7 +95,8 @@ onMounted(() => {
     </ul>
     <RequestPage />
     <p>完整路由测试（先点击按钮，获取完整菜单数据）</p>
-    <el-button type="success" plain @click="handleMenuApi">获取完整菜单数据</el-button>
+    <el-button type="success" plain size="small" @click="handleRouterSystemMine">跳转到个人中心</el-button>
+    <el-button type="success" plain size="small" @click="handleMenuApi">获取完整菜单数据</el-button>
     <el-cascader
       v-model="currentRoute"
       :options="routeOptions"
@@ -89,6 +105,7 @@ onMounted(() => {
         value: 'name',
         label: 'name'
       }"
+      size="small"
       :show-all-levels="false"
       @change="handleRouteChange"
     >

package/jnrs-template-vue/src/views/system/menu/index.vue

@@ -21,13 +21,13 @@ const { menus } = useMenuStore()
           <el-icon v-if="row.meta.icon"><component :is="row.meta.icon" /></el-icon>
         </template>
       </el-table-column>
-      <el-table-column prop="path" label="路由地址" min-width="120" header-align="center" />
-      <el-table-column prop="component" label="component path" min-width="120" header-align="center" />
+      <el-table-column prop="path" label="path" min-width="120" header-align="center" />
+      <el-table-column prop="name" label="name" min-width="120" header-align="center" />
+      <el-table-column prop="component" label="component" min-width="120" header-align="center" />
       <el-table-column prop="redirect" label="redirect" min-width="120" header-align="center" />
-      <el-table-column prop="editRole" label="权限标识" min-width="120" header-align="center">
+      <el-table-column prop="meta.permissions" label="permissions" min-width="120" header-align="center">
         <template #default="{ row }">
-          <span v-if="!row.meta.permissions" style="color: #999">auto</span>
-          <span v-else>{{ row.meta.permissions }}</span>
+          <span>{{ row.meta.permissions }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="type" label="类型" width="80" align="center">
@@ -36,18 +36,8 @@ const { menus } = useMenuStore()
           <el-tag type="success" v-else>目录</el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="type" label="NoAuthApi" width="80" align="center">
-        <template #default="{ row }">
-          <el-tag type="danger" v-if="row.meta.noAuth">否</el-tag>
-          <el-tag type="success" v-else>是</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="type" label="Global" width="80" align="center">
-        <template #default="{ row }">
-          <el-tag type="success" v-if="row.meta.global">是</el-tag>
-          <el-tag type="primary" v-else>否</el-tag>
-        </template>
-      </el-table-column>
+      <el-table-column prop="meta.noAuth" label="meta.noAuth" width="80" align="center" />
+      <el-table-column prop="meta.global" label="meta.global" width="80" align="center" />
     </JnTable>
   </el-card>
 </template>

package/jnrs-template-vue/src/views/system/mine/baseInfo.vue

@@ -74,6 +74,7 @@ onMounted(() => {
         :showFileList="false"
         :autoUploadApi="AvatarChangeApi"
         style="width: 500px"
+        :disabled="true"
       />
     </el-form-item>
     <!-- <el-form-item>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-jnrs-template-vue",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "巨能前端工程化开发，Vue 项目模板脚手架",
   "keywords": [
     "vue",
@@ -9,7 +9,7 @@
     "TypeScript",
     "monorepo"
   ],
-  "author": "Talia-Tan",
+  "author": "talia_tan",
   "license": "MIT",
   "repository": {
     "type": "git",

package/jnrs-template-vue/src/composables/common/useForm.ts

@@ -1,9 +0,0 @@
-/**
- * @Author : TanRui
- * @WeChat : Tan578853789
- * @File   : useForm.ts
- * @Date   : 2025/11/30
- * @Desc.  : 表单通用逻辑
- */
-
-export function useForm() {}

package/jnrs-template-vue/src/composables/common/useModal.ts

@@ -1,9 +0,0 @@
-/**
- * @Author : TanRui
- * @WeChat : Tan578853789
- * @File   : useModal.ts
- * @Date   : 2025/11/30
- * @Desc.  : 弹窗控制逻辑
- */
-
-export function useModal() {}

package/jnrs-template-vue/src/composables/common/usePagination.ts

@@ -1,35 +0,0 @@
-/**
- * @Author : TanRui
- * @WeChat : Tan578853789
- * @File   : useTable.ts
- * @Date   : 2025/11/30
- * @Desc.  : 表格、分页、筛选等通用逻辑
- */
-
-import { ref, computed } from 'vue'
-
-export function useTable<T>(initialData: T[] = []) {
-  const data = ref<T[]>(initialData)
-  const pageSize = ref(10)
-  const pageNo = ref(1)
-
-  // 分页数据
-  const paginatedData = computed(() => {
-    const start = (pageNo.value - 1) * pageSize.value
-    return data.value?.slice(start, start + pageSize.value)
-  })
-
-  // 设置新的数据
-  const setNewData = (newData: T[]) => {
-    data.value = newData
-    pageNo.value = 1
-  }
-
-  return {
-    data,
-    pageSize,
-    pageNo,
-    paginatedData,
-    setNewData
-  }
-}

package/jnrs-template-vue/src/composables/common/useTable.ts

@@ -1,35 +0,0 @@
-/**
- * @Author : TanRui
- * @WeChat : Tan578853789
- * @File   : useTable.ts
- * @Date   : 2025/11/30
- * @Desc.  : 表格
- */
-
-import { ref, computed } from 'vue'
-
-export function useTable<T>(initialData: T[] = []) {
-  const data = ref<T[]>(initialData)
-  const pageSize = ref(10)
-  const pageNo = ref(1)
-
-  // 分页数据
-  const paginatedData = computed(() => {
-    const start = (pageNo.value - 1) * pageSize.value
-    return data.value?.slice(start, start + pageSize.value)
-  })
-
-  // 设置新的数据
-  const setNewData = (newData: T[]) => {
-    data.value = newData
-    pageNo.value = 1
-  }
-
-  return {
-    data,
-    pageSize,
-    pageNo,
-    paginatedData,
-    setNewData
-  }
-}

package/jnrs-template-vue/src/composables/common/useUser.ts

@@ -1,9 +0,0 @@
-/**
- * @Author : TanRui
- * @WeChat : Tan578853789
- * @File   : useUser.ts
- * @Date   : 2025/11/30
- * @Desc.  : 用户相关逻辑
- */
-
-export function useUser() {}