create-young-proj 0.10.1 → 0.12.0

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

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-21 17:13:59
- * @LastEditTime: 2023-09-06 16:09:39
+ * @LastEditTime: 2023-09-18 14:11:18
  * @Description:
  */
 import type { RouteLocationNormalized } from 'vue-router'
@@ -21,6 +21,34 @@ export function useTabReOpen(cbk: Function = () => console.log('this tab page is
   cbk()
 }
 
+// 不缓存
+export function useTabNoCache(cbk: Function = () => console.log('this tab page is no cache')) {
+  const tagState = useTagsStore()
+  const route = useRoute()
+
+  tagState.$onAction(({ name, args, after }) => {
+    if (name === 'addView') {
+      if (args[0].name === route.name)
+        after(() => cbk())
+    }
+  })
+
+  cbk()
+}
+
+// 关闭，用于替换 onUnmounted
+export function useTabClose(cbk: Function = () => console.log('this tab page is close')) {
+  const tagState = useTagsStore()
+  const route = useRoute()
+
+  tagState.$onAction(({ name, args, after }) => {
+    if (name === 'delView') {
+      if (args[0].name === route.name)
+        after(() => cbk())
+    }
+  })
+}
+
 export const useTagsStore = defineStore('useTagsStore', {
   state: () => {
     const visitedViews = ref<RouteLocationNormalized[]>([])

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-13 09:45:34
  * @Description:
  */
 export default defineNuxtRouteMiddleware(async (to, from) => {
@@ -9,13 +9,25 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
     throw createError({ message: '页面不存在', statusCode: 404 })
 
   const { hasLogin } = storeToRefs(useUserStore())
-  const { nav_arr, flat_nav_arr } = storeToRefs(useNavStore())
+  const { nav_arr, flat_nav_arr, nodeMap, breadcrumb_arr } = storeToRefs(useNavStore())
 
   const changeTitle = () => {
-    const nav = flat_nav_arr.value.find(item => item.component === to.path)
-    if (nav && nav.title)
+    let nav = flat_nav_arr.value.find(item => item.component === to.path)
+
+    breadcrumb_arr.value.length = 0
+
+    if (nav && nav.title) {
       to.meta.title = nav.title
 
+      while (nav) {
+        breadcrumb_arr.value.unshift(nav.title!)
+        if (nav.parent_id)
+          nav = nodeMap.value.get(nav.parent_id.toString())
+        else
+          break
+      }
+    }
+
     document.title = (to.meta.title as string) || window.__YOUNG_ENV__.NUXT_PUBLIC_TITLE
   }
 
@@ -30,12 +42,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/nuxt.config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-05-25 19:45:20
- * @LastEditTime: 2023-09-06 16:13:06
+ * @LastEditTime: 2023-09-16 16:34:29
  * @Description:
  */
 import { resolve } from 'node:path'
@@ -21,6 +21,10 @@ export default defineNuxtConfig({
         { name: 'creator', content: 'BluesYoung-web' },
       ],
       link: [
+        {
+          rel: 'icon',
+          href: '/favicon.svg',
+        },
         {
           rel: 'preload',
           as: 'image',

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/home/[id].vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-21 17:35:12
- * @LastEditTime: 2023-07-28 11:34:29
+ * @LastEditTime: 2023-09-15 15:20:25
  * @Description:
 -->
 <script lang="ts" setup>
@@ -14,7 +14,7 @@ definePageMeta({
 const { nick } = storeToRefs(useUserStore())
 const { nav_arr } = storeToRefs(useNavStore())
 
-onMounted(() => {
+useTabNoCache(() => {
   nav_arr.value.length === 0 && generateNavData()
 })
 </script>

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

@@ -1,17 +1,12 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-21 09:27:14
- * @LastEditTime: 2023-07-23 16:23:00
+ * @LastEditTime: 2023-09-18 14:15:35
  * @Description:
 -->
 <script setup lang="ts">
 definePageMeta({
-  noCache: true,
-})
-
-navigateTo({
-  path: '/home/index',
-  replace: true,
+  redirect: '/home/index',
 })
 </script>
 

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-15 15:19:59
  * @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('/')
@@ -61,7 +63,7 @@ function loginHandler() {
   })
 }
 
-onMounted(() => {
+useTabNoCache(() => {
   if (SaveFlag.value && hasLogin.value) {
     navigateTo({
       path: '/',

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

@@ -284,7 +284,6 @@ useTabReOpen(getList)
         新建菜单
       </ElButton>
     </div>
-    <br>
     <!-- 节点列表 -->
     <YoungTablePro
       :table-data="tableData" :table-head="tableHead" :tree-props="{ children: 'children' }" row-key="id"

package/template-nuxt-admin/public/favicon.svg

@@ -0,0 +1,2 @@
+
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 32 32"><path fill="#666" d="M26 2h4v4h-4zm0 6h4v4h-4zm-6-6h4v4h-4zm0 6h4v4h-4z"/><path fill="#666" d="M28 16v6H4V6h12V4H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h8v4H8v2h16v-2h-4v-4h8a2 2 0 0 0 2-2v-6ZM18 28h-4v-4h4Z"/></svg>

package/template-nuxt-admin/public/logo.svg

@@ -0,0 +1,2 @@
+
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 32 32"><path fill="#fff" d="M26 2h4v4h-4zm0 6h4v4h-4zm-6-6h4v4h-4zm0 6h4v4h-4z"/><path fill="#fff" d="M28 16v6H4V6h12V4H4a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h8v4H8v2h16v-2h-4v-4h8a2 2 0 0 0 2-2v-6ZM18 28h-4v-4h4Z"/></svg>

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

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-12-30 17:19:42
- * @LastEditTime: 2023-07-31 17:52:20
+ * @LastEditTime: 2023-09-16 16:27:56
  * @Description:
  */
 import { resolve } from 'node:path'
@@ -22,9 +22,8 @@ export default defineNitroPlugin(async (nitroApp) => {
       NUXT_PUBLIC_TITLE: 'XXX-后台管理系统',
       NUXT_PUBLIC_SUB_TITLE: '做XXX我们是认真的！',
       NUXT_PUBLIC_SLOGAN: 'XXXXX, XXXXX',
-      NUXT_PUBLIC_LOGIN_BG:
-        'https://dogefs.s3.ladydaily.com/~/source/unsplash/photo-1688380692117-63178554d76d?ixid=M3wyNjY4NDZ8MHwxfHRvcGljfHxhZXU2ckwtajZld3x8fHx8Mnx8MTY5MDAxMDMzNnw&ixlib=rb-4.0.3&w=1920&h=1080&fmt=webp',
-      NUXT_PUBLIC_LOGIN_LOGO: 'https://api.iconify.design/logos:nuxt-icon.svg?color=%23f74d49',
+      NUXT_PUBLIC_LOGIN_BG: '/bg.webp',
+      NUXT_PUBLIC_LOGIN_LOGO: '/logo.svg',
     },
   })
 

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-13 09:43:52
  * @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: '未登录或登录过期，请登录后再试',
+      })
+
+      navigateTo(`/login?redirect=${encodeURIComponent(location.href.replace(location.origin, ''))}`, {
+        replace: true,
       })
-        .then(() => {
-          navigateTo(
-            `/login?redirect=${encodeURIComponent(location.href.replace(location.origin, ''))}`,
-          )
-        })
-        .catch(() => {
-          navigateTo({
-            path: '/',
-            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))
+  }
 }
 
 /**
@@ -205,3 +181,19 @@ export function useChangePassword() {
 
   vnode.component!.exposed?.show()
 }
+
+/**
+ * 修改状态二次确认
+ */
+export function useConfirm(cbk: Function, tip = '确定修改状态嘛？', successTip?: string) {
+  ElMessageBox.confirm(tip, '提示', {
+    type: 'warning',
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+  })
+    .then(async () => {
+      await cbk()
+      successTip && ElMessage.success(successTip)
+    })
+    .catch(() => null)
+}

package/template-vue-admin/.vscode/extensions.json

@@ -1,10 +0,0 @@
-{
-  "recommendations": [
-    "vue.volar",
-    "rome.rome",
-    "obkoro1.korofileheader",
-    "vue.vscode-typescript-vue-plugin",
-    "antfu.unocss",
-    "voorjaar.windicss-intellisense"
-  ]
-}

package/template-vue-admin/.vscode/list-add.code-snippets

@@ -1,108 +0,0 @@
-{
-  "list-add-admin": {
-    "prefix": "list-add",
-    "body": [
-      "<route lang=\"yaml\">",
-      "meta:",
-      "  title: $1",
-      "  authPath: $2",
-      "</route>",
-      "",
-      "<script lang=\"ts\" setup>",
-      "import { useFormMode, YoungDialog, YoungPagination, YoungTable, YoungSelect } from '@bluesyoung/ui-vue3-element-plus';",
-      "import type { TableHeadItem, TableDataItem, SelectOptionItem } from '@bluesyoung/ui-vue3-element-plus';",
-      "import { deepClone } from '@bluesyoung/utils';",
-      "import { $3 } from '@/typings';",
-      "import { apis } from '@/modules/3-net';",
-      "",
-      "interface Form extends $3 {};",
-      "const FORM_TEMP: Form = {};",
-      "const {",
-      "  isAdd,",
-      "  isEdit,",
-      "  edit,",
-      "  del,",
-      "  sure,",
-      "  clear,",
-      "  form,",
-      "  formRef,",
-      "  validForm",
-      "} = useFormMode<Form>(FORM_TEMP, {",
-      "  addCbk: async () => {",
-      "    const res = await validForm() as boolean;",
-      "    if (res) {",
-      "      const v = deepClone(form.value);",
-      "      // await apis.post.addUserItem(v);",
-      "      ElMessage.success('新增成功！');",
-      "    }",
-      "    return res;",
-      "  },",
-      "  modCbk: async () => {",
-      "    const res = await validForm() as boolean;",
-      "    if (res) {",
-      "      const v = deepClone(form.value);",
-      "      // await apis.patch.changeUserItem(v);",
-      "      ElMessage.success('修改成功！');",
-      "    }",
-      "    return res;",
-      "  },",
-      "  delCbk: async (row) => {",
-      "    // await apis.delete.deleteUser(row.id.toString());",
-      "    ElMessage.success('删除成功！');",
-      "    query.pageNum = 1;",
-      "  },",
-      "  cgEffect: () => getList()",
-      "});",
-      "const tableHead: TableHeadItem<Form>[] = [",
-      "  { prop: '', label: '' },",
-      "];",
-      "interface Query extends BaseQuery {};",
-      "const query = reactive<Query>({",
-      "  pageNum: 1,",
-      "  pageSize: 50,",
-      "  total: 0,",
-      "});",
-      "",
-      "const tableData = ref<TableDataItem<Form>[]>([]);",
-      "const getList = async () => {",
-      "  // const { list, pageNum, pageSize, total } = await apis.get.getUserList(query);",
-      "  // tableData.value = deepClone(list || []);",
-      "  // query.pageNum = +pageNum || 1;",
-      "  // query.pageSize = +pageSize || 50;",
-      "  // query.total = +total || 0;",
-      "};",
-      "",
-      "getList();",
-      "</script>",
-      "",
-      "<template>",
-      "  <div class=\"flex\">",
-      "    <div class=\"m-2\">",
-      "      <ElInput v-model=\"query.\" placeholder=\"请输入\" />",
-      "    </div>",
-      "    <div class=\"m-2\">",
-      "      <ElButton type=\"primary\" @click=\"getList\">搜索</ElButton>",
-      "    </div>",
-      "    <div class=\"m-2\">",
-      "      <ElButton type=\"success\" @click=\"isAdd = true\">添加</ElButton>",
-      "    </div>",
-      "  </div>",
-      "  <div class=\"m-2\">",
-      "    <YoungTable :table-data=\"tableData\" :table-head=\"tableHead\" :table-height=\"680\" />",
-      "    <YoungPagination v-show=\"query.total > 0\" v-model:page=\"query.pageNum\" v-model:limit=\"query.pageSize\"",
-      "      :total=\"query.total\" @page-change=\"getList\" />",
-      "  </div>",
-      "  <YoungDialog :is-add=\"isAdd\" :is-edit=\"isEdit\" width=\"520px\" @sure=\"sure\" @clear=\"clear\">",
-      "    <template #body>",
-      "      <ElForm ref=\"formRef\" :model=\"form\" label-width=\"100px\">",
-      "        <ElFormItem label=\"\" prop=\"\">",
-      "          <ElInput v-model=\"form.\" class=\"!w-300px\" />",
-      "        </ElFormItem>",
-      "      </ElForm>",
-      "    </template>",
-      "  </YoungDialog>",
-      "</template>",
-    ],
-    "description": "list-add-admin"
-  }
-}

package/template-vue-admin/.vscode/list-export.code-snippets

@@ -1,72 +0,0 @@
-{
-  "list-export-admin": {
-    "prefix": "list-export",
-    "body": [
-      "<route lang=\"yaml\">",
-      "meta:",
-      "  title: $1",
-      "  authPath: $2",
-      "</route>",
-      "",
-      "<script lang=\"ts\" setup>",
-      "import { YoungTable, YoungPagination} from '@bluesyoung/ui-vue3-element-plus';",
-      "import type { TableDataItem, TableHeadItem } from '@bluesyoung/ui-vue3-element-plus';",
-      "import type { $3 } from '@/typings';",
-      "import { apis } from '@/modules/3-net';",
-      "",
-      "interface Form extends $3 {};",
-      "",
-      "const tableHead: TableHeadItem<Form>[] = [",
-      "  { prop: '', label: '' },",
-      "];",
-      "const tableData = ref<TableDataItem<Form>[]>([]);",
-      "",
-      "type Query = BaseQuery & Partial<Form>;",
-      "const query = reactive<Query>({",
-      "  pageNum: 1,",
-      "  pageSize: 10,",
-      "  total: 0,",
-      "});",
-      "",
-      "const getList = async () => {",
-      "  // const { list, pageNum, pageSize, total } = await apis.get.getApiList(query);",
-      "  // tableData.value = deepClone(list || []);",
-      "  // query.pageNum = +pageNum || 1;",
-      "  // query.pageSize = +pageSize || 50;",
-      "  // query.total = +total || 0;",
-      "};",
-      "",
-      "const exportHandler = async () => {",
-      "  const { useExport2Excel } = await import('@bluesyoung/ui-vue3-element-plus');",
-      "  await useExport2Excel({",
-      "    filename: '数据导出',",
-      "    tableHead: tableHead,",
-      "    tableData: tableData.value",
-      "  });",
-      "};",
-      "",
-      "getList();",
-      "</script>",
-      "",
-      "<template>",
-      "  <div class=\"flex\">",
-      "    <div class=\"m-2\">",
-      "      <ElInput v-model=\"query.\" placeholder=\"请输入\" />",
-      "    </div>",
-      "    <div class=\"m-2\">",
-      "      <ElButton type=\"primary\" @click=\"getList\">搜索</ElButton>",
-      "    </div>",
-      "    <div class=\"m-2\">",
-      "      <ElButton :disabled=\"tableData.length <= 0\" type=\"success\" @click=\"exportHandler\">导出</ElButton>",
-      "    </div>",
-      "  </div>",
-      "  <div class=\"m-2\">",
-      "    <YoungTable :table-data=\"tableData\" :table-head=\"tableHead\" :table-height=\"680\" />",
-      "    <YoungPagination v-model:page=\"query.pageNum\" v-model:limit=\"query.pageSize\" :total=\"query.total\"",
-      "      @page-change=\"getList\" />",
-      "  </div>",
-      "</template>"
-    ],
-    "description": "list-export-admin"
-  }
-}