create-young-proj 0.10.0 → 0.10.2

package/README.md

@@ -1,5 +1,11 @@
 # 从现有模板快速创建工程
 
+```bash
+npm create young-proj@latest
+yarn create young-proj@latest
+pnpm create young-proj@latest
+```
+
 🚧 WIP
 
 - [x] template-vue-thin

package/init.mjs

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
-import { execa } from 'execa'
-
 try {
-  await execa('npx', ['simple-git-hooks'])
+  await import('simple-git-hooks/postinstall.js')
   console.log('simple-git-hooks installed successfully')
 }
 catch (error) {
-  console.log('just intsall to use, not dev')
+  console.log('just use, not dev')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-young-proj",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "create project from template",
   "author": "BluesYoung-web",
   "license": "MIT",
@@ -44,7 +44,6 @@
     "@types/node": "16",
     "cross-spawn": "^7.0.3",
     "eslint": "^8.48.0",
-    "execa": "^8.0.1",
     "jiti": "^1.19.3",
     "kolorist": "^1.6.0",
     "lint-staged": "^14.0.1",

package/template-nuxt-admin/components/TopUser.vue

@@ -1,11 +1,12 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-21 16:31:41
- * @LastEditTime: 2023-07-24 15:04:21
+ * @LastEditTime: 2023-09-08 10:35:46
  * @Description:
 -->
 <script lang="ts" setup>
-const { avatar, nick, cookie } = storeToRefs(useUserStore())
+const user = useUserStore()
+const { avatar, nick } = storeToRefs(user)
 
 function loginOut() {
   showDialog({
@@ -13,8 +14,7 @@ function loginOut() {
     message: '确认退出登录？',
     showCancelButton: true,
   }).then(() => {
-    // @ts-expect-error
-    cookie.value = undefined
+    user.removeToken()
     navigateTo(`/login?redirect=${encodeURIComponent(location.href.replace(location.origin, ''))}`)
   }).catch(() => null)
 }

package/template-nuxt-admin/components/YoungChangePassword.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-24 14:21:55
- * @LastEditTime: 2023-08-02 10:38:16
+ * @LastEditTime: 2023-09-08 10:34:56
  * @Description:
 -->
 <script lang="ts" setup>
@@ -33,7 +33,7 @@ const form = reactive<LoginForm>({
   password: '',
 })
 
-const { cookie } = storeToRefs(useUserStore())
+const user = useUserStore()
 
 const formRef = ref<FormInstance>()
 function sure() {
@@ -41,11 +41,11 @@ function sure() {
     if (valid) {
       await apis.post.changePassword(form)
       hide()
-      await showDialog({
+      showNotify({
         message: '密码修改成功，请重新登录',
+        type: 'success',
       })
-      // @ts-expect-error
-      cookie.value = undefined
+      user.removeToken()
       const redirect = location.pathname === '/login' ? '/' : encodeURIComponent(location.href.replace(location.origin, ''))
       navigateTo(`/login?redirect=${redirect}`)
     }

package/template-nuxt-admin/components/layout/SideBar.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-21 12:25:23
- * @LastEditTime: 2023-09-04 09:24:44
+ * @LastEditTime: 2023-09-08 09:11:37
  * @Description:
 -->
 <script lang="ts" setup>
@@ -68,6 +68,7 @@ const { isCollapse, nav_arr } = storeToRefs(useNavStore())
 
   :deep(.el-scrollbar__wrap) {
     overflow-x: hidden;
+    height: calc(100vh - $base-nav-bar-height);
 
     .el-menu {
       border: 0;

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

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-06-20 17:14:58
- * @LastEditTime: 2023-07-26 11:56:53
+ * @LastEditTime: 2023-09-08 10:09:03
  * @Description:
  */
 import { useHttp } from '@bluesyoung/http'
@@ -29,25 +29,10 @@ const http = useHttp<{
   },
   fail: (err: any) => {
     console.log('🚀 ~ file: api.ts:28 ~ err:', err)
-    const { cookie } = storeToRefs(useUserStore())
+    const user = useUserStore()
     if (err?.response?.status === 401) {
-      showDialog({
-        title: '温馨提示',
-        message: '未登录或登录过期，请登录后再继续！',
-        showCancelButton: true,
-      })
-        .then(() => {
-          cookie.value && (cookie.value.uuid = '')
-          navigateTo(
-            `/login?redirect=${encodeURIComponent(location.href.replace(location.origin, ''))}`,
-          )
-        })
-        .catch(() => {
-          navigateTo({
-            path: '/',
-            replace: true,
-          })
-        })
+      user.removeToken()
+      checkLogin(true)
 
       throw err
     }

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

@@ -1,18 +1,34 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-06-21 12:03:42
- * @LastEditTime: 2023-07-24 14:05:13
+ * @LastEditTime: 2023-09-08 10:33:28
  * @Description:
  */
 export const useUserStore = defineStore('useUserStore', () => {
   const cookie = useLocalStorage<UserLoginRes>('token', {} as UserLoginRes)
 
-  const hasLogin = computed(() => !!cookie.value?.uuid)
   const avatar = computed(() => cookie.value?.headimgurl)
   const nick = computed(() => cookie.value?.nickname)
-  const token = computed(() => cookie.value?.token)
+  const token = computed(() => {
+    if (!validateToken())
+      removeToken()
+
+    return cookie.value?.token
+  })
+  const hasLogin = computed(() => !!token.value)
 
   const SaveFlag = useLocalStorage('n天免登', true)
+  const Exptime = useLocalStorage('token过期时间', 0)
+
+  function validateToken() {
+    const now = Date.now()
+    const exp = Exptime.value
+    return now < exp
+  }
+
+  function removeToken() {
+    cookie.value = undefined
+  }
 
   return {
     cookie,
@@ -21,6 +37,8 @@ export const useUserStore = defineStore('useUserStore', () => {
     nick,
     token,
     SaveFlag,
+    Exptime,
+    removeToken,
   }
 })
 

package/template-nuxt-admin/middleware/auth.global.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-21 10:02:19
- * @LastEditTime: 2023-08-02 14:57:03
+ * @LastEditTime: 2023-09-08 10:10:28
  * @Description:
  */
 export default defineNuxtRouteMiddleware(async (to, from) => {
@@ -30,12 +30,19 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
 
   if (!hasLogin.value && to.path !== '/login') {
     // 页面需要登录，但是未登录
-    showFailToast('未登录或登录过期，请重新登录')
-    return navigateTo(`/login?redirect=${encodeURIComponent(to.fullPath)}`)
+    showNotify({
+      type: 'danger',
+      message: '未登录或登录过期，请重新登录',
+    })
+    return navigateTo(`/login?redirect=${encodeURIComponent(to.fullPath)}`, {
+      replace: true,
+    })
   }
   else if (hasLogin.value && to.path === '/login') {
     // 已登录进入登录页
-    return navigateTo('/')
+    return navigateTo('/', {
+      replace: true,
+    })
   }
   else {
     nav_arr.value.length === 0 && (await generateNavData())

package/template-nuxt-admin/package.json

@@ -7,7 +7,7 @@
     "dev": "nuxt dev --host",
     "generate": "nuxt generate",
     "preview": "nuxt preview --host",
-    "postinstall": "nuxt prepare",
+    "postinstall": "nuxt prepare && simple-git-hooks",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },

package/template-nuxt-admin/pages/login.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-21 10:03:11
- * @LastEditTime: 2023-08-02 10:39:05
+ * @LastEditTime: 2023-09-08 10:03:40
  * @Description:
 -->
 <script lang="ts" setup>
@@ -24,7 +24,7 @@ const {
   NUXT_PUBLIC_CURRENT_VERSION: Version,
 } = window.__YOUNG_ENV__
 
-const { SaveFlag, hasLogin, cookie } = storeToRefs(useUserStore())
+const { SaveFlag, hasLogin, cookie, Exptime } = storeToRefs(useUserStore())
 
 const loginType = ref<'account' | 'code'>('account')
 
@@ -46,6 +46,8 @@ function loginHandler() {
         const data = await apis.post.login(form)
         if (data) {
           cookie.value = data
+          // 三天后过期
+          Exptime.value = Date.now() + 1000 * 60 * 60 * 24 * 3
           height.value > width.value && enter()
           showSuccessToast('登录成功！')
           navigateTo('/')

package/template-nuxt-admin/utils/tool.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-05-28 16:01:24
- * @LastEditTime: 2023-07-31 14:45:23
+ * @LastEditTime: 2023-09-08 10:12:37
  * @Description:
  */
 import { randomId } from '@bluesyoung/utils'
@@ -55,16 +55,6 @@ export const WindowSize = reactive({
   '2xl': useMediaQuery('(min-width: 1536px)'),
 })
 
-/**
- * 分页是否超过一页
- */
-export function moreThanOnePage(query: {
-  total: number
-  limit: number
-}) {
-  return query.total > query.limit
-}
-
 /**
  * 当前浏览器是否支持下载
  */
@@ -81,23 +71,16 @@ export function checkLogin(force = true) {
   const { hasLogin } = storeToRefs(useUserStore())
 
   if (!hasLogin.value) {
-    force
-      && showDialog({
-        title: '温馨提示',
-        message: '未登录，请登录后再继续！',
-        showCancelButton: true,
+    if (force) {
+      showNotify({
+        type: 'danger',
+        message: '未登录或登录过期，请登录后再试',
       })
-        .then(() => {
-          navigateTo(
-            `/login?redirect=${encodeURIComponent(location.href.replace(location.origin, ''))}`,
-          )
-        })
-        .catch(() => {
-          navigateTo({
-            path: '/',
-            replace: true,
-          })
-        })
+
+      navigateTo(`/login?redirect=${encodeURIComponent(location.href.replace(location.origin, ''))}`, {
+        replace: true,
+      })
+    }
     return false
   }
   else {
@@ -122,61 +105,54 @@ export function useScrollOver(distance = 40) {
  */
 export async function generateNavData() {
   const { hasLogin } = storeToRefs(useUserStore())
-  if (!hasLogin.value) {
-    showNotify({
-      type: 'danger',
-      message: '登录过期，请重新登录！',
-    })
-
-    return navigateTo('/login')
-  }
-
-  // 清除没有子元素的children
-  const clearChildren = (arr: NavArrItem[]) => {
-    for (const item of arr) {
-      if (
-        item?.children?.length === 0
+  if (checkLogin(true)) {
+    // 清除没有子元素的children
+    const clearChildren = (arr: NavArrItem[]) => {
+      for (const item of arr) {
+        if (
+          item?.children?.length === 0
         || item.children?.filter(n => +n.visible === 1).length === 0
-      )
-        delete item.children
-      else if (item.children)
-        clearChildren(item.children)
+        )
+          delete item.children
+        else if (item.children)
+          clearChildren(item.children)
+      }
+      return arr
     }
-    return arr
-  }
 
-  const { nav_arr, flat_nav_arr, auth_routes } = storeToRefs(useNavStore())
+    const { nav_arr, flat_nav_arr, auth_routes } = storeToRefs(useNavStore())
 
-  const tree = await apis.get.getUserMenuTree()
-  const menu = Object.values(tree)
+    const tree = await apis.get.getUserMenuTree()
+    const menu = Object.values(tree)
 
-  let role_route: string[] = []
-  const generateRoleRoute = (arr: NavArrItem[], num?: number): string[] => {
-    if (num === 1) {
-      role_route = []
-      flat_nav_arr.value = []
-    }
-    for (const item of arr) {
-      if (item.component) {
-        role_route.push(item.component);
-        +item.visible === 1 && flat_nav_arr.value.push(item)
+    let role_route: string[] = []
+    const generateRoleRoute = (arr: NavArrItem[], num?: number): string[] => {
+      if (num === 1) {
+        role_route = []
+        flat_nav_arr.value = []
       }
-      // 子节点递归遍历
-      if (Array.isArray(item.children) && item.children.length > 0) {
-        const part = JSON.parse(JSON.stringify(item.children))
-        // 尾递归优化
-        generateRoleRoute(part)
+      for (const item of arr) {
+        if (item.component) {
+          role_route.push(item.component);
+          +item.visible === 1 && flat_nav_arr.value.push(item)
+        }
+        // 子节点递归遍历
+        if (Array.isArray(item.children) && item.children.length > 0) {
+          const part = JSON.parse(JSON.stringify(item.children))
+          // 尾递归优化
+          generateRoleRoute(part)
+        }
       }
+      return role_route
     }
-    return role_route
-  }
 
-  auth_routes.value = generateRoleRoute(menu, 1)
+    auth_routes.value = generateRoleRoute(menu, 1)
 
-  /**
+    /**
    * 最终导航数组
    */
-  nav_arr.value = clearChildren(menu.filter(item => +item.visible === 1))
+    nav_arr.value = clearChildren(menu.filter(item => +item.visible === 1))
+  }
 }
 
 /**