create-young-proj 1.6.2 → 2.0.0

package/template-nuxt-admin/README.md

@@ -2,7 +2,6 @@
 
 [![](https://img.shields.io/badge/Author-BluesYoung--web-blue)](https://gitee.com/BluesYoung-web)
 
-
 [![code style](https://antfu.me/badge-code-style.svg)](https://github.com/antfu/eslint-config)
 
 ## 与旧版的区别
@@ -76,6 +75,8 @@ npm i -g young-commit
 
 接口需要传递数组数据的，需要序列化为逗号拼接的字符串之后再传递！！！
 
+**默认为 hash 路由，支持非根路径部署。**
+
 ## 使用响应式布局
 
 兼容 `PC` 端与移动端
@@ -92,7 +93,6 @@ throw createError({ statusCode: 404, message: '数据迷路了' })
 
 ### 响应式屏幕尺寸
 
-
 ```ts
 /*
 export const WindowSize = reactive({
@@ -108,4 +108,4 @@ export const WindowSize = reactive({
   '2xl': useMediaQuery('(min-width: 1536px)'),
 });
 */
-```
+```

package/template-nuxt-admin/boot.mjs

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-09-07 09:31:12
- * @LastEditTime: 2023-05-26 11:21:19
+ * @LastEditTime: 2024-05-08 14:24:58
  * @Description:
  */
 (async () => {
@@ -12,5 +12,8 @@
 
   process.env.NITRO_PORT = listenPort
 
+  // hack 非根路径部署
+  process.env.NUXT_APP_CDN_URL = './'
+
   await import('./dist/server/index.mjs')
 })()

package/template-nuxt-admin/composables/config.ts

@@ -1,13 +1,13 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-26 11:48:46
- * @LastEditTime: 2023-07-26 11:48:46
+ * @LastEditTime: 2024-05-22 17:23:14
  * @Description:
  */
 export const MethodObj = {
   GET: 'info',
   POST: 'success',
   PATCH: 'warning',
-  PUT: '',
+  PUT: 'primary',
   DELETE: 'danger',
 } as const

package/template-nuxt-admin/config/.devrc

@@ -1 +1 @@
-NUXT_PUBLIC_API_BASE = http://192.168.10.168:7001
+NUXT_PUBLIC_API_BASE = http://localhost:7001

package/template-nuxt-admin/config/.onlinerc

@@ -1 +1 @@
-NUXT_PUBLIC_API_BASE = http://192.168.10.168:9000
+NUXT_PUBLIC_API_BASE = http://localhost:9000

package/template-nuxt-admin/config/.testrc

@@ -1 +1 @@
-NUXT_PUBLIC_API_BASE = http://192.168.10.168:9000
+NUXT_PUBLIC_API_BASE = http://localhost:9000

package/template-nuxt-admin/nuxt.config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-09-21 15:57:55
- * @LastEditTime: 2023-12-22 09:31:07
+ * @LastEditTime: 2024-05-08 14:29:12
  * @Description:
  */
 import { resolve } from 'node:path'
@@ -25,20 +25,22 @@ export default defineNuxtConfig({
         { 'http-equiv': 'X-UA-Compatible', 'content': 'IE=edge,chrome=1' },
         { id: 'viewportMeta', name: 'viewport', content: 'maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0' },
       ],
+
+      // hack 支持非根路径部署
       link: [
         {
           rel: 'icon',
-          href: '/favicon.svg',
+          href: './favicon.svg',
         },
         {
           rel: 'prefetch',
           as: 'image',
-          href: '/image_placeholder.svg',
+          href: './image_placeholder.svg',
         },
         {
           rel: 'prefetch',
           as: 'image',
-          href: '/tabbar_bg.png',
+          href: './tabbar_bg.png',
         },
       ],
       script: [
@@ -56,7 +58,7 @@ export default defineNuxtConfig({
           `,
         },
         {
-          src: '/index.umd.js',
+          src: './index.umd.js',
           async: true,
         },
       ],
@@ -106,4 +108,11 @@ export default defineNuxtConfig({
       isCustomElement: tag => ['young-float-ball'].includes(tag),
     },
   },
+
+  router: {
+    options: {
+      // hash 路由，支持非根路径部署；如需 history 路由，则其他的 ./ 需要换成 /
+      hashMode: true,
+    },
+  },
 })

package/template-nuxt-admin/package.json

@@ -15,13 +15,14 @@
   "dependencies": {
     "@bluesyoung/casdoor-auth": "^0.1.0",
     "@bluesyoung/http": "^1.0.1",
-    "@bluesyoung/ui-vue3": "^0.1.1",
-    "@bluesyoung/ui-vue3-element-plus": "1.3.5",
-    "@bluesyoung/utils": "0.2.1",
+    "@bluesyoung/ui-vue3": "^1.0.0",
+    "@bluesyoung/ui-vue3-element-plus": "1.5.6",
+    "@bluesyoung/utils": "0.3.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "c12": "^1.4.2",
     "file-saver": "^2.0.5",
+    "h3-proxy": "^1.12.0",
     "http-proxy": "^1.18.1",
     "jszip": "^3.10.1",
     "md5": "^2.3.0",
@@ -30,8 +31,8 @@
     "vue-cropper": "^1.0.9"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^1.1.0",
-    "@bluesyoung/logger": "^0.0.1",
+    "@antfu/eslint-config": "^2.18.1",
+    "@bluesyoung/logger": "^0.1.0",
     "@element-plus/nuxt": "^1.0.5",
     "@iconify/json": "^2.2.93",
     "@pinia/nuxt": "^0.5.1",
@@ -39,16 +40,16 @@
     "@types/md5": "^2.3.2",
     "@types/node": "20.8.10",
     "@types/qrcode": "^1.5.1",
-    "@unocss/nuxt": "^0.57.2",
+    "@unocss/nuxt": "^0.60.3",
     "@vant/nuxt": "^1.0.2",
     "@vueuse/nuxt": "^10.2.1",
     "dayjs": "^1.11.9",
-    "element-plus": "^2.3.8",
-    "eslint": "^8.48.0",
-    "lint-staged": "^15.0.2",
-    "nuxt": "^3.8.1",
+    "element-plus": "^2.7.3",
+    "eslint": "^9.3.0",
+    "lint-staged": "^15.2.4",
+    "nuxt": "^3.11.2",
     "pinia": "^2.1.4",
-    "sass": "^1.64.0",
+    "sass": "^1.77.2",
     "simple-git-hooks": "^2.9.0",
     "typescript": "^5.2.2",
     "vant": "^4.6.2"

package/template-nuxt-admin/pages/system/api.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-25 16:44:56
- * @LastEditTime: 2023-11-07 14:42:48
+ * @LastEditTime: 2024-05-22 17:28:59
  * @Description:
 -->
 <script lang="ts" setup>
@@ -151,14 +151,14 @@ useTabReOpen(getList)
     <template #body>
       <ElForm ref="formRef" :model="form" label-width="100px" :label-position="WindowSize['lt-lg'] ? 'top' : 'left'">
         <ElFormItem label="分组名称" prop="category" :rules="{ required: true, message: '请填写分组名称', trigger: 'blur' }">
-          <ElInput v-model.trim="form.category" class="!w-300px" />
+          <ElInput v-model.trim="form.category" />
         </ElFormItem>
         <ElFormItem label="接口描述" prop="desc" :rules="{ required: true, message: '请填写接口描述', trigger: 'blur' }">
-          <ElInput v-model.trim="form.desc" class="!w-300px" />
+          <ElInput v-model.trim="form.desc" />
         </ElFormItem>
         <ElFormItem label="请求方法">
           <YoungSelect
-            v-model="form.method" class="!w-300px"
+            v-model="form.method"
             :options="Object.keys(MethodObj).map((item) => ({ label: item, value: item }))"
           />
         </ElFormItem>
@@ -166,10 +166,10 @@ useTabReOpen(getList)
           label="接口路径" prop="path"
           :rules="{ message: '请填写合法的接口路径, eg: /user/list', trigger: 'blur', validator: (_: any, v: string) => /\/(.*)\/(.*)/.test(v) }"
         >
-          <ElInput v-model.trim="form.path" class="!w-300px" />
+          <ElInput v-model.trim="form.path" />
         </ElFormItem>
         <ElFormItem label="关联角色">
-          <YoungSelect v-model="form.roleIds" multiple placeholder="请选择角色" class="!w-300px" :options="roleList" />
+          <YoungSelect v-model="form.roleIds" multiple placeholder="请选择角色" :options="roleList" />
         </ElFormItem>
       </ElForm>
     </template>

package/template-nuxt-admin/pages/system/role.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-25 16:45:39
- * @LastEditTime: 2023-11-07 14:41:43
+ * @LastEditTime: 2024-05-22 17:29:19
  * @Description:
 -->
 <script lang="ts" setup>
@@ -79,13 +79,13 @@ useTabReOpen(getList)
         :label-position="WindowSize['lt-lg'] ? 'top' : 'left'"
       >
         <ElFormItem label="角色名称(中文)" prop="name" :rules="[{ required: true, message: '请填写角色名称', trigger: 'blur' }]">
-          <ElInput v-model.trim="base.form.name" class="!w-300px" />
+          <ElInput v-model.trim="base.form.name" />
         </ElFormItem>
         <ElFormItem label="关键字(英文)" prop="keyword" :rules="[{ required: true, message: '请填写关键字', trigger: 'blur' }]">
-          <ElInput v-model.trim="base.form.keyword" class="!w-300px" />
+          <ElInput v-model.trim="base.form.keyword" />
         </ElFormItem>
         <ElFormItem label="角色描述">
-          <ElInput v-model.trim="base.form.desc" class="!w-300px" />
+          <ElInput v-model.trim="base.form.desc" />
         </ElFormItem>
       </ElForm>
     </template>

package/template-nuxt-admin/pages/system/user.vue

@@ -200,13 +200,13 @@ useTabReOpen(getList)
     <template #body>
       <ElForm ref="formRef" :model="form" label-width="100px" :label-position="WindowSize['lt-lg'] ? 'top' : 'left'">
         <ElFormItem label="用户名" prop="username" :rules="{ required: true, message: '请输用户名', trigger: 'blur' }">
-          <ElInput v-model.trim="form.username" class="!w-300px" />
+          <ElInput v-model.trim="form.username" />
         </ElFormItem>
         <ElFormItem label="昵称" prop="nickname" :rules="{ required: true, message: '请输昵称(用于右上角展示)', trigger: 'blur' }">
-          <ElInput v-model.trim="form.nickname" class="!w-300px" />
+          <ElInput v-model.trim="form.nickname" />
         </ElFormItem>
         <ElFormItem label="手机号" prop="mobile" :rules="{ required: true, message: '请输手机号', trigger: 'blur' }">
-          <ElInput v-model.trim="form.mobile" :maxlength="11" class="!w-300px" />
+          <ElInput v-model.trim="form.mobile" :maxlength="11" />
         </ElFormItem>
         <ElFormItem label="角色">
           <YoungSelect v-model="form.roleId" placeholder="请选择角色" :options="roleList" />
@@ -215,7 +215,7 @@ useTabReOpen(getList)
           v-if="isAdd" label="初始密码" prop="initPassword"
           :rules="{ required: true, message: '请输初始密码', trigger: 'blur' }"
         >
-          <ElInput v-model.trim="form.initPassword" class="!w-300px" />
+          <ElInput v-model.trim="form.initPassword" />
         </ElFormItem>
       </ElForm>
     </template>

package/template-nuxt-admin/server/api/[...all].ts

@@ -1,10 +1,17 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-21 09:50:36
- * @LastEditTime: 2023-07-21 09:50:36
+ * @LastEditTime: 2024-03-08 15:02:22
  * @Description:
  */
+import { createProxyEventHandler } from 'h3-proxy'
+
 export default eventHandler(async (event) => {
-  const proxy = createTransparentProxy(process.env.NUXT_PUBLIC_API_BASE as string)
-  await proxy.handle(event)
+  const proxy = createProxyEventHandler({
+    target: process.env.NUXT_PUBLIC_API_BASE as string,
+  })
+  return proxy(event).catch((error: Error) => {
+    console.error('🚀 ~ api proxy error:', error)
+    throw error
+  })
 })

package/template-nuxt-admin/server/plugins/env.ts

@@ -10,6 +10,11 @@ import { useYoungLogger } from '@bluesyoung/logger'
 
 export default defineNitroPlugin(async (nitroApp) => {
   const env = (process.env.DEPLOY_ENV as 'dev' | 'test' | 'online') || 'dev'
+
+  // 仅打包之后格式化日志
+  if (process.env.NODE_ENV !== 'development')
+    useYoungLogger({ tag: 'XXX-后台管理系统' })
+
   const { config } = await loadConfig<Record<string, any>>({
     name: env,
     cwd: resolve(process.cwd(), 'config'),
@@ -48,10 +53,6 @@ export default defineNitroPlugin(async (nitroApp) => {
       delete config[key]
   }
 
-  // 仅打包之后格式化日志
-  if (process.env.NODE_ENV !== 'development')
-    useYoungLogger()
-
   console.log('------------------------读取配置文件------------------------')
   console.log(config)
   console.log('-------------------------------------------------------------')

package/template-nuxt-admin/uno.config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-06-15 08:59:22
- * @LastEditTime: 2023-05-27 19:36:43
+ * @LastEditTime: 2024-05-08 14:32:03
  * @Description:
  */
 import {
@@ -10,7 +10,6 @@ import {
   presetIcons,
   presetTypography,
   presetUno,
-  presetWebFonts,
   transformerDirectives,
   transformerVariantGroup,
 } from 'unocss'
@@ -24,13 +23,6 @@ export default defineConfig({
       scale: 1.2,
     }),
     presetTypography(),
-    presetWebFonts({
-      fonts: {
-        sans: 'DM Sans',
-        serif: 'DM Serif Display',
-        mono: 'DM Mono',
-      },
-    }),
   ],
   transformers: [
     // 不加 enforce 会有 bug