create-jnrs-template-vue 1.2.2 → 1.2.3

package/jnrs-template-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jnrs-template-vue",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "JNRS 信息化管理系统模板",
   "author": "Talia-Tan",
   "private": true,
@@ -19,9 +19,8 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.2",
-    "@jnrs/core": "1.1.7",
-    "@jnrs/shared": "1.1.7",
-    "@jnrs/vue-core": "1.2.2",
+    "@jnrs/shared": "1.1.8",
+    "@jnrs/vue-core": "1.2.3",
     "@vueuse/core": "^14.1.0",
     "element-plus": "^2.11.9",
     "pinia": "^3.0.4",

package/jnrs-template-vue/src/App.vue

@@ -6,7 +6,6 @@ import zhCn from 'element-plus/es/locale/lang/zh-CN'
 import en from 'element-plus/es/locale/lang/en'
 import { useI18n } from 'vue-i18n'
 import { changeLocales as changeLocalesForShared } from '@jnrs/shared/locales'
-import { changeLocales as changeLocalesForCore } from '@jnrs/core/locales'
 
 const { locale } = useI18n()
 
@@ -16,7 +15,6 @@ watch(
   (newValue) => {
     locale.value = newValue
     changeLocalesForShared(newValue)
-    changeLocalesForCore(newValue)
   },
   {
     immediate: true
@@ -30,7 +28,7 @@ const localeMap = {
 
 onMounted(() => {
   console.log(
-    '%cPowered by 🅹🅽🆁🆂 TECH',
+    '%cPOWERED BY 🅹🅽🆁🆂 TECH',
     `background: #f2f2c1;
   color: #d15f2c;
   font-weight: bold;

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

@@ -1,4 +1,4 @@
-import { request } from '@jnrs/vue-core'
+import { axiosRequest } from '@jnrs/vue-core/request'
 
 /**
  * axios 方式下载文件
@@ -6,7 +6,7 @@ import { request } from '@jnrs/vue-core'
  * @returns Blob
  */
 export const FileApi = (uniqueFileName: string): Promise<Blob> => {
-  return request({
+  return axiosRequest({
     url: '/api/files/' + uniqueFileName,
     method: 'get',
     responseType: 'blob',

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

@@ -1,40 +1,8 @@
 import type { Pagination, PageTableData, FileContainer } from '@/types'
-import { request } from '@jnrs/vue-core'
+import { axiosRequest } from '@jnrs/vue-core/request'
 
 /**
- * 404 错误
- */
-export const NotFoundApi = () => {
-  return request({
-    url: '/notFound',
-    method: 'get'
-  })
-}
-
-/**
- * 无权限
- * @param showErrorMsg 是否显示错误信息
- */
-export const NoAuth = (showErrorMsg: boolean) => {
-  return request({
-    url: '/auth/no',
-    method: 'post',
-    showErrorMsg
-  })
-}
-
-/**
- * 数据详情
- */
-export const DetailsApi = (): Promise<FileContainer> => {
-  return request({
-    url: '/details',
-    method: 'get'
-  })
-}
-
-/**
- * 项目项
+ * 项目
  */
 export interface ProjectItem extends FileContainer {
   id: string
@@ -53,7 +21,7 @@ export interface ProjectItem extends FileContainer {
 }
 
 /**
- * 新增项目项
+ * 新增
  */
 type AddProjectOmitKeys =
   | 'id'
@@ -73,17 +41,52 @@ export type AddProjectItem = Omit<ProjectItem, AddProjectOmitKeys> & {
   newImageFiles: []
 }
 
+/**
+ * 查询
+ */
 export interface ProjectQuery extends Pagination {
   code?: string
   projectType?: '敏捷型' | '瀑布型' | '混合型'
   manager?: string
 }
 
+/**
+ * 测试 404 错误
+ */
+export const NotFoundApi = () => {
+  return axiosRequest({
+    url: '/mock/notFound',
+    method: 'get'
+  })
+}
+
+/**
+ * 测试 无权限
+ * @param showErrorMsg 是否显示错误信息
+ */
+export const NoAuth = (showErrorMsg: boolean) => {
+  return axiosRequest({
+    url: '/mock/auth/no',
+    method: 'post',
+    showErrorMsg
+  })
+}
+
+/**
+ * 数据详情
+ */
+export const DetailsApi = (): Promise<FileContainer> => {
+  return axiosRequest({
+    url: '/mock/details',
+    method: 'get'
+  })
+}
+
 /**
  * 表单新增
  */
 export const DemosFormApi = (data: FormData) => {
-  return request({
+  return axiosRequest({
     url: '/mock/demos/save',
     method: 'post',
     data
@@ -94,9 +97,41 @@ export const DemosFormApi = (data: FormData) => {
  * 数据详情
  */
 export const DemosTableApi = (query: ProjectQuery): Promise<PageTableData<ProjectItem>> => {
-  return request({
+  return axiosRequest({
     url: '/mock/demos/table',
     method: 'get',
     data: query
   })
 }
+
+/**
+ * 下载数据导入模板
+ */
+export const DemosImportTemplateApi = (): Promise<Blob> => {
+  return axiosRequest({
+    url: '/mock/project/template',
+    method: 'post'
+  })
+}
+
+/**
+ * 项目数据导入
+ */
+export const DemosImportDataApi = (data: FormData) => {
+  return axiosRequest({
+    url: '/mock/project/import',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 项目数据导出
+ */
+export const DemosExportApi = (data: Record<string, unknown>): Promise<Blob> => {
+  return axiosRequest({
+    url: '/mock/project/export',
+    method: 'post',
+    data
+  })
+}

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

@@ -1,10 +1,10 @@
-import { request } from '@jnrs/vue-core'
+import { axiosRequest } from '@jnrs/vue-core/request'
 import type { Dict, DictItem, User, Role } from '@jnrs/shared'
 import type { MenuItem } from '@jnrs/vue-core'
 
 // 菜单
 export const MenuApi = (): Promise<MenuItem[]> => {
-  return request({
+  return axiosRequest({
     url: '/system/menu.json', // /public 文件夹下
     mockUrl: '/mock/menu',
     method: 'get'
@@ -23,7 +23,7 @@ export interface LoginResult extends User {
 }
 
 export const LoginApi = (data: LoginParams): Promise<LoginResult> => {
-  return request({
+  return axiosRequest({
     url: '/api/auth/login',
     method: 'post',
     data,
@@ -33,7 +33,7 @@ export const LoginApi = (data: LoginParams): Promise<LoginResult> => {
 
 // 退出登录
 export const LogoutApi = () => {
-  return request({
+  return axiosRequest({
     url: '/api/auth/logout',
     method: 'get'
   })
@@ -41,7 +41,7 @@ export const LogoutApi = () => {
 
 // 获取用户信息
 export const UserInfoApi = (): Promise<User> => {
-  return request({
+  return axiosRequest({
     url: '/api/auth/user-info',
     method: 'get'
   })
@@ -54,7 +54,7 @@ interface PasswordChange {
 }
 
 export const PasswordChangeApi = (data: PasswordChange) => {
-  return request({
+  return axiosRequest({
     url: '/api/auth/change-password',
     method: 'post',
     data
@@ -63,7 +63,7 @@ export const PasswordChangeApi = (data: PasswordChange) => {
 
 // 获取字典列表
 export const DictApi = (): Promise<DictItem[]> => {
-  return request({
+  return axiosRequest({
     url: '/api/dict-manager',
     method: 'get'
   })
@@ -71,7 +71,7 @@ export const DictApi = (): Promise<DictItem[]> => {
 
 // 获取单个字典
 export const DictDetailApi = (id: string) => {
-  return request({
+  return axiosRequest({
     url: `/api/dict-manager/detail/${id}`,
     method: 'get'
   })
@@ -79,7 +79,7 @@ export const DictDetailApi = (id: string) => {
 
 // 修改单个字典
 export const DictChangeApi = (data: DictItem) => {
-  return request({
+  return axiosRequest({
     url: '/api/dict-manager/detail',
     method: 'post',
     data
@@ -88,7 +88,7 @@ export const DictChangeApi = (data: DictItem) => {
 
 // 获取角色列表
 export const RoleApi = (): Promise<Role[]> => {
-  return request({
+  return axiosRequest({
     url: '/api/role-manager',
     method: 'get',
     noAuth: true

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

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

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

@@ -4,7 +4,7 @@ import en from './en'
 import { zhCn as vueCore_zhCn, en as vueCore_en } from '@jnrs/vue-core/locales'
 
 const i18n = createI18n({
-  legacy: false, // 启用 Composition API 模式
+  legacy: false, // legacy 为 false 则启用 Composition API 模式
   globalInjection: true, // 允许在模板中使用 $t
   locale: 'zhCn',
   fallbackLocale: 'en',

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

@@ -5,13 +5,19 @@ 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 { objectMatchAssign } from '@jnrs/shared'
+import { objectMatchAssign, dateFormatsToObject } from '@jnrs/shared'
 import { debounce } from '@jnrs/shared/lodash'
 import { isNumberGtZero } from '@jnrs/shared/validator'
 import { getDictList, objectToFormData, downloadFile } from '@/utils/packages'
-import { DemosTableApi, DemosFormApi } from '@/api/demos/index'
+import {
+  DemosTableApi,
+  DemosFormApi,
+  DemosImportTemplateApi,
+  DemosImportDataApi,
+  DemosExportApi
+} from '@/api/demos/index'
 
-import { JnDialog, JnDatetime, JnPagination, JnFileUpload, JnTable } from '@jnrs/vue-core/components'
+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'
@@ -28,7 +34,7 @@ const total = ref(0)
 const pagination = ref<Pagination>({ pageNo: 1, pageSize: 10 })
 
 // 编辑
-const jnEditRef = ref()
+const editDialogRef = ref()
 const ruleFormRef = ref<FormInstance>()
 const ruleForm = ref<AddProjectItem>({
   id: '',
@@ -62,7 +68,8 @@ const rules = ref<FormRules>({
 const queryForm = ref({
   code: '',
   projectType: undefined,
-  manager: ''
+  manager: '',
+  plannedStartDate: ''
 })
 
 const handleSelectionChange = (row: ProjectItem[]) => {
@@ -88,7 +95,7 @@ const getDemosTable = debounce(async () => {
 
 // 新增和修改
 const handleEdit = (row?: ProjectItem) => {
-  jnEditRef.value.open()
+  editDialogRef.value.open()
   queueMicrotask(() => {
     ruleFormRef.value?.resetFields()
     const matched = objectMatchAssign(ruleForm.value, row)
@@ -135,7 +142,7 @@ onActivated(() => {
 
 <template>
   <!-- 编辑弹窗 -->
-  <JnDialog ref="jnEditRef" title="项目管理" width="600px">
+  <JnDialog ref="editDialogRef" title="项目管理" width="600px">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="auto" v-loading="loading">
       <el-form-item prop="id"></el-form-item>
       <el-form-item label="项目名称" prop="name">
@@ -211,9 +218,30 @@ onActivated(() => {
 
   <el-card>
     <template #header>
-      <div style="display: flex; justify-content: space-between">
+      <div style="display: flex; justify-content: space-between; align-items: center">
         <span>项目管理</span>
-        <el-button type="primary" size="small" :icon="Plus" @click="handleEdit()">新增</el-button>
+        <div style="display: flex; justify-content: space-between; align-items: center">
+          <JnImportAndExport
+            :importTemplateApi="DemosImportTemplateApi"
+            importBtnName="导入项目"
+            :importApi="DemosImportDataApi"
+            exportBtnName="导出项目"
+            :exportApi="DemosExportApi"
+            :exportParams="{
+              ...dateFormatsToObject(queryForm.plannedStartDate)
+            }"
+            :exportDynamicParamsConfig="{
+              label: '项目编号',
+              prop: 'code'
+            }"
+            :exportDisabled="tableData.length === 0"
+            size="small"
+            @change="getDemosTable()"
+          />
+          <el-button type="primary" size="small" :icon="Plus" @click="handleEdit()" style="margin-left: 12px">
+            新增
+          </el-button>
+        </div>
       </div>
     </template>
 
@@ -252,6 +280,15 @@ onActivated(() => {
           @change="getDemosTable()"
         ></SelectManager>
       </el-form-item>
+      <el-form-item label="计划开始时间" prop="plannedStartDate">
+        <el-date-picker
+          v-model="queryForm.plannedStartDate"
+          value-format="YYYY-MM-DD"
+          size="small"
+          style="width: 150px"
+          @change="getDemosTable()"
+        />
+      </el-form-item>
     </el-form>
 
     <!-- 数据列表 -->

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

@@ -5,12 +5,16 @@ import { handleRouter } from '@jnrs/vue-core/router'
 import type { MenuItem } 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 currentRoute = ref('')
 const datePicker = ref(new Date())
-
-onMounted(() => {})
+const datetime = ref(formatDateTime() + ' ' + formatWeekday())
+const validator = ref()
+const testI18nInCore = ref('')
 
 const handleMenuApi = async () => {
   try {
@@ -26,11 +30,31 @@ const handleRouteChange = () => {
     name: currentRoute.value
   })
 }
+
+const changeI18n = () => {
+  datetime.value = formatDateTime() + ' ' + formatWeekday()
+  isFloatGtZero({}, '0', (msg) => {
+    validator.value = msg
+  })
+  testI18nInCore.value = testI18n()
+}
+
+onMounted(() => {
+  isFloatGtZero({}, '0', (msg) => {
+    validator.value = msg
+  })
+  testI18nInCore.value = testI18n()
+})
 </script>
 
 <template>
   <div>
     <h3>Playground - 功能测试</h3>
+    <p>国际化测试</p>
+    <div>@jnrs/shared: {{ datetime }}</div>
+    <div>@jnrs/shared/validator: {{ validator }}</div>
+    <div>@jnrs/shared/request: {{ testI18nInCore }}</div>
+    <el-button type="primary" size="small" @click="changeI18n">切换语言后点击按钮更新国际化显示</el-button>
     <p>权限测试（admin 账号拥有全部权限，请用非 admin 账号测试该功能）</p>
     <ul>
       <li>

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

@@ -11,7 +11,7 @@ import type { User } from '@jnrs/shared'
 const { userInfo, token } = storeToRefs(useAuthStore())
 const { avatar } = useAvatar()
 const loading = ref(false)
-const ruleFormRef = ref()
+// const ruleFormRef = ref()
 const ruleForm = ref<User>({
   id: 0,
   account: '',

package/jnrs-template-vue/vite.config.ts

@@ -63,7 +63,6 @@ export default defineConfig({
     rollupOptions: {
       output: {
         manualChunks: {
-          '@jnrs/core': ['@jnrs/core'],
           '@jnrs/shared': ['@jnrs/shared']
         }
       }

package/jnrs-template-vue/viteMockServe/fail.ts

@@ -1,9 +1,21 @@
+import type { IncomingMessage, ServerResponse } from 'http'
+
 const res_fail = {
   code: 1,
   msg: '操作失败'
 }
 
 export default [
+  // 404
+  {
+    url: '/mock/notFound',
+    method: 'get',
+    rawResponse: async (req: IncomingMessage, res: ServerResponse) => {
+      res.statusCode = 404
+      res.end('File not found')
+      return
+    }
+  },
   // 权限不足
   {
     url: '/mock/auth/no',

package/package.json

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