create-jnrs-vue 1.2.22 → 1.2.24

package/README.md

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

package/bin/upgrade.mjs

@@ -2,39 +2,89 @@
  * @Author : TanRui
  * @WeChat : Tan578853789
  * @File   : upgrade.mjs
- * @Date   : 2026/03/11
- * @Desc.  : 脚手架升级脚本
+ * @Date   : 2026/04/13
+ * @Desc.  : 安全升级脚手架模板（保留用户自定义配置）
  */
 
 import { execSync } from 'child_process'
-import { cpSync, readFileSync, writeFileSync } from 'fs'
+import { cpSync, readFileSync, writeFileSync, rmSync, existsSync } from 'fs'
 import { join } from 'path'
 
+const TEMP_DIR = 'temp_new'
+const TEMPLATE_FILES = [
+  'package.json',
+  'vite.config.ts',
+  'eslint.config.ts',
+  '.prettierrc.json',
+  'tsconfig.json',
+  'index.html'
+]
+
 console.log('🔄 正在拉取最新模板...')
 
-// 1. 临时创建一个最新版模板
-execSync('pnpm create jnrs-vue@latest ./_temp_new --force', {
-  stdio: 'inherit'
-})
+// 1. 清理旧临时目录（避免冲突）
+if (existsSync(TEMP_DIR)) {
+  rmSync(TEMP_DIR, { recursive: true, force: true })
+}
+
+// 2. 静默创建最新模板（跳过所有交互）
+try {
+  execSync(`pnpm create jnrs-vue@latest ${TEMP_DIR} -- --silent --no-git --no-install`, {
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+      // 强制非交互模式（部分脚手架识别此变量）
+      CI: 'true'
+    }
+  })
+} catch {
+  console.error('❌ 模板拉取失败，请检查网络或 jnrs-vue 是否发布')
+  process.exit(1)
+}
+
+// 3. 合并 package.json（保留用户 scripts/dependencies 等）
+try {
+  const currentPkg = JSON.parse(readFileSync('package.json', 'utf8'))
+  const newPkg = JSON.parse(readFileSync(join(TEMP_DIR, 'package.json'), ' utf8'))
+
+  // 保留用户字段：name, version, description, author, private, scripts, dependencies, devDependencies
+  const mergedPkg = {
+    ...newPkg,
+    name: currentPkg.name,
+    version: currentPkg.version,
+    description: currentPkg.description,
+    author: currentPkg.author,
+    private: currentPkg.private,
+    scripts: { ...newPkg.scripts, ...currentPkg.scripts }, // 新脚本优先，但保留用户自定义
+    dependencies: { ...newPkg.dependencies, ...currentPgk.dependencies },
+    devDependencies: { ...newPkg.devDependencies, ...currentPkg.devDependencies }
+  }
 
-// 2. 安静地复制关键配置文件（不覆盖 src/）
-const filesToSync = ['package.json', 'vite.config.ts', '.eslintrc.cjs', '.prettierrc', 'tsconfig.json', 'index.html']
+  writeFileSync('package.json', JSON.stringify(mergedPkg, null, 2) + '\n')
+  console.log('✅ 合并: package.json')
+} catch (error) {
+  console.warn('⚠️ package.json 合并失败，跳过', error)
+}
 
-for (const file of filesToSync) {
-  try {
-    cpSync(join('_temp_new', file), file, { force: true })
+// 4. 同步其他配置文件
+for (const file of TEMPLATE_FILES) {
+  const src = join(TEMP_DIR, file)
+  const dest = file
+  if (existsSync(src)) {
+    cpSync(src, dest, { force: true })
     console.log(`✅ 同步: ${file}`)
-  } catch (e) {
-    console.warn(`⚠️ 跳过: ${file} (可能不存在)`)
+  } else {
+    console.warn(`⚠️ 跳过: ${file} (模板中不存在)`)
   }
 }
 
-// 3. 提示用户手动处理依赖和业务代码
+// 5. 提示用户
 console.log('\n🔧 请运行:')
 console.log('   pnpm install')
 console.log('\n📝 注意:')
-console.log('   - 检查 package.json 差异')
-console.log('   - src/ 目录未自动更新，请手动合并新功能')
+console.log('   - 检查 package.json 中的依赖版本是否冲突')
+console.log('   - src/ 目录未更新，请手动参考 temp_new/src 合并新功能（如有）')
+console.log('   - 如使用 auto-imports.d.ts，可能需重新生成')
 
-// 4. 清理临时目录
-execSync('rm -rf _temp_new')
+// 6. 清理
+rmSync(TEMP_DIR, { recursive: true, force: true })

package/jnrs-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jnrs-vue",
-  "version": "1.2.22",
+  "version": "1.2.24",
   "description": "JNRS 信息化管理系统",
   "author": "talia_tan",
   "private": true,
@@ -19,9 +19,9 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.2",
-    "@jnrs/shared": "1.1.16",
-    "@jnrs/vue-core": "1.2.11",
-    "@jnrs/lingshu-smart": "2.2.4",
+    "@jnrs/shared": "1.1.17",
+    "@jnrs/vue-core": "1.2.12",
+    "@jnrs/lingshu-smart": "2.2.5",
     "@vueuse/core": "^14.1.0",
     "element-plus": "^2.13.3",
     "pinia": "^3.0.4",

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

@@ -83,7 +83,7 @@ export const FullDataApiTest = (id: string): Promise<IBusinessResponse<IUser>> =
     params: {
       id
     },
-    returnFullResponse: true // 返回完整响应数据
+    returnFullResponse: true // 需要返回完整响应数据时使用该选项
   })
 }
 

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

@@ -6,9 +6,8 @@ import { ref, onActivated, nextTick } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import { useRoute } from '@jnrs/vue-core/router'
-import { objectMatchAssign, dateFormatsToObject } from '@jnrs/shared'
+import { objectMatchAssign, dateFormatsToObject, isNumberGtZero } from '@jnrs/shared'
 import { debounce } from '@jnrs/shared/lodash'
-import { isNumberGtZero } from '@jnrs/shared/validator'
 import { getDictList, downloadFile, extractFieldId } from '@/utils'
 import { useI18n } from '@/locales'
 import {

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

@@ -6,7 +6,7 @@ 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 { verifyFloatGtZero } from '@jnrs/shared'
 import { testI18n } from '@jnrs/shared/request'
 
 const routeOptions = ref<IMenuItem[]>([])
@@ -48,14 +48,14 @@ const handleRouterSystemMine = () => {
 
 const changeI18n = () => {
   datetime.value = formatDateTime() + ' ' + formatWeekday()
-  isFloatGtZero({}, '0', (msg) => {
+  verifyFloatGtZero({}, '0', (msg) => {
     validator.value = msg
   })
   testI18nInCore.value = testI18n()
 }
 
 onMounted(() => {
-  isFloatGtZero({}, '0', (msg) => {
+  verifyFloatGtZero({}, '0', (msg) => {
     validator.value = msg
   })
   testI18nInCore.value = testI18n()

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

@@ -4,7 +4,7 @@ import { ref } from 'vue'
 import { RoleApi, LoginApi } from '@/api/system'
 import { useAuthStore } from '@/stores'
 import { handleRouter, useRoute } from '@jnrs/vue-core/router'
-import { isWeakPwd } from '@jnrs/shared/validator'
+import { verifyWeakPwd } from '@jnrs/shared'
 import { formatDateTime, formatWeekday } from '@jnrs/shared'
 import { GlobalSetting } from '@jnrs/vue-core/components'
 
@@ -30,7 +30,7 @@ const rules = ref<FormRules>({
   account: [{ required: true, message: '请输入用户名', trigger: 'change' }],
   password: [
     { required: true, message: '请输入密码', trigger: 'change' },
-    { validator: isWeakPwd, trigger: 'change' }
+    { validator: verifyWeakPwd, trigger: 'change' }
   ]
 })
 

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

@@ -3,7 +3,7 @@ import { reactive, ref } from 'vue'
 import { PasswordChangeApi } from '@/api/system'
 import { useAuthStore } from '@/stores'
 import { handleRouter } from '@jnrs/vue-core/router'
-import { isWeakPwd } from '@jnrs/shared/validator'
+import { verifyWeakPwd } from '@jnrs/shared'
 import type { FormInstance, FormItemRule } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import { LogoutApi } from '@/api/system'
@@ -21,7 +21,7 @@ const rules = reactive({
   password: [
     { required: true, message: '请输入', trigger: 'change' },
     {
-      validator: isWeakPwd,
+      validator: verifyWeakPwd,
       trigger: 'change'
     }
   ],

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

@@ -11,6 +11,26 @@
     "permissions": ["menu:view"],
     "abilityCoefficient": 0.0,
     "dict": {
+      "projectType": [
+        {
+          "label": "瀑布型",
+          "value": 0,
+          "displayColor": "#65DC79",
+          "sequence": 1
+        },
+        {
+          "label": "敏捷型",
+          "value": 1,
+          "displayColor": "#409EFF",
+          "sequence": 2
+        },
+        {
+          "label": "混合型",
+          "value": 2,
+          "displayColor": "#F9DD4A",
+          "sequence": 3
+        }
+      ],
       "defectiveWorkHourStatus": [
         {
           "label": "等待",

package/package.json

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

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

@@ -1,115 +0,0 @@
-/**
- * 文件信息
- */
-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

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