create-jnrs-vue 1.2.21 → 1.2.22

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

@@ -1,5 +1,5 @@
 import { hasPermissionWithSuffix } from '@jnrs/shared'
-import { useAuthStore } from '@jnrs/vue-core/pinia'
+import { useAuthStore } from '@/stores'
 
 // 菜单查看权限
 export function hasMenuViewPermission(requiredPerms: string[] | undefined) {

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { FormInstance, FormRules } from 'element-plus'
-import type { Attachment, Pagination } from '@/types'
-import type { ProjectItem, AddProjectItem } from '@/api/demos/index'
+import type { IAttachment, IPagination } from '@/types'
+import type { Project, EditProject } from '@/api/demos/index'
 import { ref, onActivated, nextTick } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
@@ -9,31 +9,38 @@ 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'
-import { getDictList, downloadFile } from '@/utils/packages'
+import { getDictList, downloadFile, extractFieldId } from '@/utils'
 import { useI18n } from '@/locales'
-import { ListApi, EditApi, DelApi, ImportTemplateApi, ImportDataApi, ExportApi } from '@/api/demos/index'
+import {
+  ProjectListApi,
+  EditProjectApi,
+  DeleteProjectApi,
+  DownloadTemplateApi,
+  ImportDataApi,
+  ExportApi
+} from '@/api/demos/index'
 import { JnDialog, JnDatetime, JnPagination, JnFileUpload, JnTable, JnImportAndExport } from '@jnrs/vue-core/components'
 import ImageView from '@/components/common/ImageView.vue'
 import PdfView from '@/components/common/PdfView.vue'
 import DictTag from '@/components/common/DictTag.vue'
 import SelectManager from '@/components/select/SelectManager.vue'
 
-interface ProcessedProjectItem extends ProjectItem {
-  newImageFiles?: Attachment[]
-  newAttachmentFile?: Attachment[]
+interface ProcessedProjectItem extends Project {
+  newImageFiles?: IAttachment[]
+  newAttachmentFile?: IAttachment[]
 }
 
 const { t: $t } = useI18n()
 const loading = ref(false)
 const tableData = ref<ProcessedProjectItem[]>([])
 const total = ref(0)
-const pagination = ref<Pagination>({ pageNo: 1, pageSize: 20 })
+const pagination = ref<IPagination>({ pageNo: 1, pageSize: 20 })
 const route = useRoute()
 
 // 编辑
 const editDialogRef = ref()
 const ruleFormRef = ref<FormInstance>()
-const ruleForm = ref<AddProjectItem>({
+const ruleForm = ref<EditProject>({
   id: '',
   name: '',
   projectType: undefined,
@@ -67,14 +74,14 @@ const queryForm = ref({
   plannedStartDate: ''
 })
 
-const handleSelectionChange = (row: ProjectItem[]) => {
+const handleSelectionChange = (row: Project[]) => {
   console.log(row)
 }
 
 const getTable = debounce(async () => {
   loading.value = true
   try {
-    const res = await ListApi({
+    const res = await ProjectListApi({
       ...pagination.value,
       ...queryForm.value
     })
@@ -92,7 +99,7 @@ const getTable = debounce(async () => {
 }, 300)
 
 // 新增和修改
-const handleEdit = (row?: ProjectItem) => {
+const handleEdit = (row?: Project) => {
   editDialogRef.value.open()
   nextTick(() => {
     ruleFormRef.value?.resetFields()
@@ -108,7 +115,7 @@ const handleEdit = (row?: ProjectItem) => {
   })
 }
 
-const handleDelete = (row: ProjectItem) => {
+const handleDelete = (row: Project) => {
   ElMessageBox.confirm('<p style="color: #f30">请注意，您尚未保存的数据将会丢失。</p>', '确定要删除吗？', {
     dangerouslyUseHTMLString: true,
     confirmButtonType: 'danger',
@@ -118,9 +125,9 @@ const handleDelete = (row: ProjectItem) => {
     .then(async () => {
       loading.value = true
       try {
-        await DelApi(row.id)
+        await DeleteProjectApi(row.id)
         ElMessage({
-          message: '',
+          message: '删除成功',
           grouping: true,
           showClose: true,
           type: 'success'
@@ -142,7 +149,11 @@ const submitForm = () => {
     if (valid) {
       loading.value = true
       try {
-        await EditApi(ruleForm.value)
+        await EditProjectApi({
+          ...ruleForm.value,
+          // 将 managerId 的值从 Record<string, unknown> 转换为 number
+          managerId: extractFieldId(ruleForm.value.managerId, 'managerId') as number
+        })
         ElMessage({
           message: '数据已保存',
           grouping: true,
@@ -195,6 +206,7 @@ onActivated(() => {
           v-model="ruleForm.managerId"
           :formRef="ruleFormRef"
           validateFieldName="managerId"
+          :limit="1"
           :simpleValue="false"
         ></SelectManager>
       </el-form-item>
@@ -254,7 +266,7 @@ onActivated(() => {
         <span>项目管理</span>
         <div style="display: flex; justify-content: space-between; align-items: center">
           <JnImportAndExport
-            :importTemplateApi="ImportTemplateApi"
+            :importTemplateApi="DownloadTemplateApi"
             importBtnName="导入项目"
             :importApi="ImportDataApi"
             exportBtnName="导出项目"

package/jnrs-vue/src/views/demos/simpleTable/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ListApi } from '@/api/demos/index'
+import { ProjectListApi } from '@/api/demos/index'
 import { JnDatetime } from '@jnrs/vue-core/components'
 import CardTable from '@/components/common/CardTable.vue'
 import ImageView from '@/components/common/ImageView.vue'
@@ -8,7 +8,7 @@ import DictTag from '@/components/common/DictTag.vue'
 </script>
 
 <template>
-  <CardTable :getTableDataApi="ListApi">
+  <CardTable :getTableDataApi="ProjectListApi">
     <template #header>项目列表</template>
     <template #table>
       <el-table-column prop="name" label="项目名称" min-width="200" sortable show-overflow-tooltip />

package/jnrs-vue/src/views/demos/unitTest/RequestPage.vue

@@ -1,11 +1,10 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import { objectToFormData } from '@/utils/packages'
-import { LoginApi, UserInfoApi } from '@/api/system'
-import { NotFoundApi, NoAuthApi, DetailsApi } from '@/api/demos'
+import { objectToFormData, downloadFile } from '@/utils'
+import { LoginApi } from '@/api/system'
+import { DataApiTest, FullDataApiTest, NotFoundApi, NoAuthApi, DetailsApi } from '@/api/demos'
 import { getFileUrl } from '@/utils/file'
-import { downloadFile } from '@/utils/packages'
 
 import ImageView from '@/components/common/ImageView.vue'
 
@@ -16,10 +15,33 @@ const loginParams = ref({
   password: '123456'
 })
 
-const handleInfoApi = async () => {
+const handleDataApi = async () => {
   try {
-    const res = await UserInfoApi()
+    const res = await DataApiTest('123')
     console.log(res)
+    console.log(res.name)
+    ElMessage({
+      message: '获取数据成功',
+      grouping: true,
+      showClose: true,
+      type: 'success'
+    })
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+const handleFullDataApi = async () => {
+  try {
+    const res = await FullDataApiTest('123')
+    console.log(res)
+    console.log(res.data?.name)
+    ElMessage({
+      message: res.msg,
+      grouping: true,
+      showClose: true,
+      type: 'success'
+    })
   } catch (error) {
     console.log(error)
   }
@@ -93,7 +115,8 @@ const handleFileView = async () => {
 <template>
   <p>网络请求测试</p>
   <el-button-group>
-    <el-button type="success" size="small" @click="handleInfoApi">获取用户数据</el-button>
+    <el-button type="success" size="small" @click="handleDataApi">获取data数据</el-button>
+    <el-button type="success" size="small" @click="handleFullDataApi">获取全量数据</el-button>
     <el-button type="primary" size="small" @click="handleNotFoundApi">接口返回404</el-button>
     <el-button type="primary" size="small" @click="handleNoAuth()">接口返回暂无权限</el-button>
     <el-button type="primary" size="small" @click="handleNoAuth(false)">接口返回暂无权限(不显示 Message)</el-button>

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

@@ -2,14 +2,14 @@
 import RequestPage from './RequestPage.vue'
 import { ref, onMounted } from 'vue'
 import { handleRouter } from '@jnrs/vue-core/router'
-import type { MenuItem } from '@jnrs/vue-core'
+import type { IMenuItem } from '@jnrs/vue-core'
 import { hasPermission } from '@/utils/permissions'
 import { MenuApi } from '@/api/system'
 import { formatDateTime, formatWeekday } from '@jnrs/shared'
 import { isFloatGtZero } from '@jnrs/shared/validator'
 import { testI18n } from '@jnrs/shared/request'
 
-const routeOptions = ref<MenuItem[]>([])
+const routeOptions = ref<IMenuItem[]>([])
 const currentRoute = ref('')
 const datePicker = ref(new Date())
 const datetime = ref(formatDateTime() + ' ' + formatWeekday())

package/jnrs-vue/src/views/home/index.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { ref, computed, onActivated, onDeactivated } from 'vue'
 import { formatDateTime, formatWeekday, formatGreeting } from '@jnrs/shared'
-import { useAuthStore } from '@jnrs/vue-core/pinia'
 import { handleRouter } from '@jnrs/vue-core/router'
+import { useAuthStore } from '@/stores'
 import ImageView from '@/components/common/ImageView.vue'
 
 const { userInfo } = useAuthStore()

package/jnrs-vue/src/views/login/index.vue

@@ -2,7 +2,7 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import { ref } from 'vue'
 import { RoleApi, LoginApi } from '@/api/system'
-import { useAuthStore } from '@jnrs/vue-core/pinia'
+import { useAuthStore } from '@/stores'
 import { handleRouter, useRoute } from '@jnrs/vue-core/router'
 import { isWeakPwd } from '@jnrs/shared/validator'
 import { formatDateTime, formatWeekday } from '@jnrs/shared'
@@ -111,7 +111,7 @@ const submitForm = async () => {
               <el-input
                 v-model="ruleForm.account"
                 :placeholder="$t('login.formAccount')"
-                prefix-icon="User"
+                prefix-icon="IUser"
                 clearable
               />
             </el-form-item>

package/jnrs-vue/src/views/system/dict/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { DictItem } from '@jnrs/shared'
+import type { IDictItem } from '@/types'
 import { ElMessage } from 'element-plus'
 import { ref, onActivated } from 'vue'
 import { DictApi, DictDetailApi, DictChangeApi } from '@/api/system'
@@ -8,7 +8,7 @@ import { JnTable } from '@jnrs/vue-core/components'
 
 const PERMISSION_EDIT = ['dict:edit']
 const loading = ref(false)
-const tableData = ref<DictItem[]>()
+const tableData = ref<IDictItem[]>()
 const predefineColors = ref([
   '#000000',
   '#999999',
@@ -36,7 +36,7 @@ const getList = () => {
     })
 }
 
-const handleExpandChange = (row: DictItem) => {
+const handleExpandChange = (row: IDictItem) => {
   loading.value = true
   DictDetailApi(String(row.id))
     .then((res) => {
@@ -48,7 +48,7 @@ const handleExpandChange = (row: DictItem) => {
 }
 
 // 保存键值对
-const editKeyValue = (row: DictItem) => {
+const editKeyValue = (row: IDictItem) => {
   if (!row.label) {
     ElMessage({
       type: 'warning',

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

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { FormInstance } from 'element-plus'
 import { ref, onMounted } from 'vue'
-import { useAuthStore } from '@jnrs/vue-core/pinia'
-import { getDictList } from '@/utils/packages'
+import { useAuthStore } from '@/stores'
+import { getDictList } from '@/utils'
 import { JnFileUpload } from '@jnrs/vue-core/components'
 import { AvatarChangeApi } from '@/api/system'
 import { objectMatchAssign } from '@jnrs/shared'

package/jnrs-vue/src/views/system/mine/securitySettings.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { reactive, ref } from 'vue'
 import { PasswordChangeApi } from '@/api/system'
-import { useAuthStore } from '@jnrs/vue-core/pinia'
+import { useAuthStore } from '@/stores'
 import { handleRouter } from '@jnrs/vue-core/router'
 import { isWeakPwd } from '@jnrs/shared/validator'
 import type { FormInstance, FormItemRule } from 'element-plus'

package/jnrs-vue/src/views/visual/index.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import type { MsgIdMessage, TypeDataMessage } from '@/types/webSocket'
-import { isMsgIdMessage, isTypeDataMessage } from '@/types/webSocket'
+import { type IMsgIdMessage, type ITypeDataMessage, isMsgIdMessage, isTypeDataMessage } from '@/types'
 import { storeToRefs } from 'pinia'
 import { useWebSocket } from '@jnrs/vue-core/composables'
 import { useRouter } from '@jnrs/vue-core/router'
@@ -16,12 +15,12 @@ const { isLoading, wsStateInfo } = useWebSocket({
   connectionTimeoutDuration: 3_000, // 修改仅为测试
   onMessage: (rawMessage: unknown) => {
     if (isMsgIdMessage(rawMessage)) {
-      const msg = rawMessage as MsgIdMessage
+      const msg = rawMessage as IMsgIdMessage
       if (msg.msgId && msg.d && typeof msg.d === 'object') {
         // console.log('接收 msgId 数据:', msg)
       }
     } else if (isTypeDataMessage(rawMessage)) {
-      const msg = rawMessage as TypeDataMessage
+      const msg = rawMessage as ITypeDataMessage
       if (msg.type && msg.data && typeof msg.data === 'object') {
         // console.log('接收 type 数据:', msg)
       }

package/jnrs-vue/vite.config.ts

@@ -10,7 +10,7 @@ import vueDevTools from 'vite-plugin-vue-devtools'
 
 const path = (url: string) => fileURLToPath(new URL(url, import.meta.url))
 const config = loadEnv('development', './')
-const isMock = config.VITE_USE_MOCK === 'true'
+const useMockServe = config.VITE_USE_MOCK === 'true'
 
 export default defineConfig({
   plugins: [
@@ -32,9 +32,9 @@ export default defineConfig({
       deleteOriginFile: false
     }),
     viteMockServe({
+      enable: useMockServe, // 是否开启 mock 服务器
       mockPath: 'viteMockServe', // mock 文件目录
       watchFiles: true, // mock 文件热更新
-      enable: isMock, // 是否开启
       logger: false // 是否在终端显示请求日志
     })
   ],

package/jnrs-vue/viteMockServe/fail.ts

@@ -8,7 +8,7 @@ const res_fail = {
 export default [
   // 404
   {
-    url: '/mock/notFound',
+    url: '/api/mock/notFound',
     method: 'get',
     rawResponse: async (req: IncomingMessage, res: ServerResponse) => {
       res.statusCode = 404
@@ -18,7 +18,7 @@ export default [
   },
   // 权限不足
   {
-    url: '/mock/auth/no',
+    url: '/api/mock/auth/no',
     method: 'post',
     response: () => {
       return {
@@ -29,7 +29,7 @@ export default [
   },
   // 操作失败
   {
-    url: '/mock/auth/fail',
+    url: '/api/mock/auth/fail',
     method: 'post',
     response: () => {
       return res_fail

package/jnrs-vue/viteMockServe/file.ts

@@ -18,7 +18,7 @@ const MIME_TYPES: Record<string, string> = {
 
 export default [
   {
-    url: /\/mock\/api\/files\/[\w.-]+/,
+    url: /\/api\/mock\/files\/[\w.-]+/,
     method: 'get',
     rawResponse: async (req: IncomingMessage, res: ServerResponse) => {
       if (!req.url) {

package/jnrs-vue/viteMockServe/index.ts

@@ -1,7 +1,6 @@
 import successMock from './success'
 import failMock from './fail'
 import fileMock from './file'
-import menuRes from '../public/system/menu.json'
 import loginRes_admin from './json/loginRes_admin.json'
 import loginRes_user from './json/loginRes_user.json'
 import dictRes from './json/dictRes.json'
@@ -14,17 +13,9 @@ export default [
   ...successMock,
   ...failMock,
   ...fileMock,
-  // 获取菜单
-  {
-    url: '/mock/menu',
-    method: 'get',
-    response: () => {
-      return menuRes
-    }
-  },
   // 登录
   {
-    url: '/mock/api/auth/login',
+    url: '/api/mock/auth/login',
     method: 'post',
     response: ({ body }) => {
       if (body.account === 'admin') {
@@ -35,7 +26,7 @@ export default [
   },
   // 获取个人信息
   {
-    url: '/mock/api/auth/user-info',
+    url: '/api/mock/auth/user-info',
     method: 'get',
     response: ({ headers }) => {
       if (headers.authorization.includes('admin')) {
@@ -46,7 +37,7 @@ export default [
   },
   // 获取字典
   {
-    url: '/mock/api/dict-manager',
+    url: '/api/mock/dict-manager',
     method: 'get',
     response: () => {
       return dictRes
@@ -54,7 +45,7 @@ export default [
   },
   // 获取单个字典
   {
-    url: /\/mock\/api\/dict-manager\/detail\/\d+/,
+    url: /\/api\/mock\/dict-manager\/detail\/\d+/,
     method: 'get',
     response: () => {
       return dictItemRes
@@ -62,7 +53,7 @@ export default [
   },
   // 获取角色
   {
-    url: '/mock/api/role-manager',
+    url: '/api/mock/role-manager',
     method: 'get',
     response: () => {
       return roleRes
@@ -70,7 +61,7 @@ export default [
   },
   // 获取数据详情
   {
-    url: '/mock/details',
+    url: '/api/mock/details',
     method: 'get',
     response: () => {
       return detailsRes
@@ -78,7 +69,7 @@ export default [
   },
   // 获取表格数据
   {
-    url: '/mock/demos/table',
+    url: '/api/mock/demos/table',
     method: 'get',
     response: () => {
       return tableRes

package/jnrs-vue/viteMockServe/json/loginRes_user.json

@@ -1,6 +1,6 @@
 {
   "data": {
-    "token": "***user***token***",
+    "token": "test_user_token",
     "id": 1,
     "name": "小王",
     "workNo": "000000",

package/jnrs-vue/viteMockServe/success.ts

@@ -6,7 +6,7 @@ const res_success = {
 export default [
   // 退出登录
   {
-    url: '/mock/api/auth/logout',
+    url: '/api/mock/auth/logout',
     method: 'get',
     response: () => {
       return res_success
@@ -14,7 +14,7 @@ export default [
   },
   // 修改密码
   {
-    url: '/mock/api/auth/change-password',
+    url: '/api/mock/auth/change-password',
     method: 'post',
     response: () => {
       return res_success
@@ -22,7 +22,7 @@ export default [
   },
   // 修改单个字典
   {
-    url: '/mock/api/dict-manager/detail',
+    url: '/api/mock/dict-manager/detail',
     method: 'post',
     response: () => {
       return res_success
@@ -30,7 +30,7 @@ export default [
   },
   // 表单新增
   {
-    url: '/mock/demos/save',
+    url: '/api/mock/demos/save',
     method: 'post',
     response: () => {
       return res_success
@@ -38,7 +38,7 @@ export default [
   },
   // 数据删除
   {
-    url: /^\/mock\/demos\/delete\/[a-zA-Z0-9-]+$/,
+    url: /^\/api\/mock\/demos\/delete\/[a-zA-Z0-9-]+$/,
     method: 'delete',
     response: () => {
       return res_success

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-jnrs-vue",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "description": "巨能前端工程化开发，Vue 项目模板脚手架",
   "keywords": [
     "vue",

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

@@ -1,12 +0,0 @@
-import { axiosRequest } from '../request'
-
-// 获取用户信息
-export const UserApi = (id: string) => {
-  return axiosRequest({
-    url: '/api/user',
-    method: 'get',
-    params: {
-      id
-    }
-  })
-}