create-young-proj 0.8.0 → 0.10.0

package/template-nuxt-admin/composables/apis/delete.ts

@@ -4,17 +4,17 @@
  * @LastEditTime: 2023-07-26 11:56:39
  * @Description:
  */
-import type { YoungHttp, YoungHttpAuthReq } from '@bluesyoung/http';
+import type { YoungHttp, YoungHttpAuthReq } from '@bluesyoung/http'
 
-export const useDelete = (http: YoungHttp) => {
-  const AuthReq: YoungHttpAuthReq = (args) => http.authReq({ method: 'DELETE', ...args });
+export function useDelete(http: YoungHttp) {
+  const AuthReq: YoungHttpAuthReq = args => http.authReq({ method: 'DELETE', ...args })
 
   const del = async (url: string, ids: string) => {
     await AuthReq({
       url,
       data: { ids },
-    });
-  };
+    })
+  }
 
   return {
     /**
@@ -33,5 +33,5 @@ export const useDelete = (http: YoungHttp) => {
      * 删除角色
      */
     deleteRole: async (ids: string) => del('/role/delete/batch', ids),
-  };
-};
+  }
+}

package/template-nuxt-admin/composables/apis/get.ts

@@ -4,18 +4,18 @@
  * @LastEditTime: 2023-07-26 11:58:32
  * @Description:
  */
-import type { YoungHttp, YoungHttpFreeReq, YoungHttpAuthReq } from '@bluesyoung/http';
+import type { YoungHttp, YoungHttpAuthReq, YoungHttpFreeReq } from '@bluesyoung/http'
 
-export const useGet = (http: YoungHttp) => {
-  const FreeReq: YoungHttpFreeReq = (args) => http.freeReq({ method: 'GET', ...args });
-  const AuthReq: YoungHttpAuthReq = (args) => http.authReq({ method: 'GET', ...args });
+export function useGet(http: YoungHttp) {
+  const FreeReq: YoungHttpFreeReq = args => http.freeReq({ method: 'GET', ...args })
+  const AuthReq: YoungHttpAuthReq = args => http.authReq({ method: 'GET', ...args })
 
   return {
     /**
      * 发送短信验证码
      */
     sendCode: async (phone: string) => {
-      showToast(`todo: ${phone}发送短信验证码`);
+      showToast(`todo: ${phone}发送短信验证码`)
       // await FreeReq({ url: '/v1/user/sendCode', params: { phone } });
     },
     /**
@@ -24,14 +24,14 @@ export const useGet = (http: YoungHttp) => {
     getUserMenuTree: async () => {
       return AuthReq<Record<number, NavArrItem>>({
         url: '/menu/tree',
-      });
+      })
     },
     /**
      * 获取角色列表
      */
     getRoleList: async (params: Partial<BaseQuery> = {}) =>
       AuthReq<PagesData>({
-        url: `/role/list`,
+        url: '/role/list',
         params,
       }),
     /**
@@ -64,8 +64,8 @@ export const useGet = (http: YoungHttp) => {
      */
     getRoleMenuTree: async (id: number) =>
       AuthReq<{
-        list: NavArrItem[];
-        accessIds: number[];
+        list: NavArrItem[]
+        accessIds: number[]
       }>({
         url: `/menu/all/${id}`,
       }),
@@ -74,10 +74,10 @@ export const useGet = (http: YoungHttp) => {
      */
     getRoleApis: async (id: number) =>
       AuthReq<{
-        list: ApiItem[];
-        accessIds: number[];
+        list: ApiItem[]
+        accessIds: number[]
       }>({
         url: `/api/all/category/${id}`,
       }),
-  };
-};
+  }
+}

package/template-nuxt-admin/composables/apis/index.ts

@@ -4,7 +4,7 @@
  * @LastEditTime: 2023-07-26 11:56:20
  * @Description:
  */
-export * from './get';
-export * from './post';
-export * from './patch';
-export * from './delete';
+export * from './get'
+export * from './post'
+export * from './patch'
+export * from './delete'

package/template-nuxt-admin/composables/apis/patch.ts

@@ -4,10 +4,10 @@
  * @LastEditTime: 2023-07-26 16:37:45
  * @Description:
  */
-import type { YoungHttp, YoungHttpAuthReq } from '@bluesyoung/http';
+import type { YoungHttp, YoungHttpAuthReq } from '@bluesyoung/http'
 
-export const usePatch = (http: YoungHttp) => {
-  const AuthReq: YoungHttpAuthReq = (args) => http.authReq({ method: 'PATCH', ...args });
+export function usePatch(http: YoungHttp) {
+  const AuthReq: YoungHttpAuthReq = args => http.authReq({ method: 'PATCH', ...args })
 
   return {
     /**
@@ -17,7 +17,7 @@ export const usePatch = (http: YoungHttp) => {
       await AuthReq({
         url: `/api/update/${id}`,
         data,
-      });
+      })
     },
     /**
      * 更新菜单信息
@@ -26,7 +26,7 @@ export const usePatch = (http: YoungHttp) => {
       await AuthReq({
         url: `/menu/update/${id}`,
         data,
-      });
+      })
     },
     /**
      * 更新角色
@@ -35,7 +35,7 @@ export const usePatch = (http: YoungHttp) => {
       await AuthReq({
         url: `/role/update/${id}`,
         data,
-      });
+      })
     },
     /**
      * 更新角色菜单权限
@@ -47,7 +47,7 @@ export const usePatch = (http: YoungHttp) => {
           create: add,
           delete: del,
         },
-      });
+      })
     },
     /**
      * 更新角色接口权限
@@ -59,7 +59,7 @@ export const usePatch = (http: YoungHttp) => {
           create: add,
           delete: del,
         },
-      });
+      })
     },
     /**
      * 更新用户信息
@@ -68,7 +68,7 @@ export const usePatch = (http: YoungHttp) => {
       await AuthReq({
         url: `/user/update/${id}`,
         data,
-      });
+      })
     },
-  };
-};
+  }
+}

package/template-nuxt-admin/composables/apis/post.ts

@@ -4,16 +4,16 @@
  * @LastEditTime: 2023-07-26 16:39:22
  * @Description:
  */
-import type { YoungHttp, YoungHttpFreeReq, YoungHttpAuthReq } from '@bluesyoung/http';
-import { telMasaike } from '@bluesyoung/utils';
+import type { YoungHttp, YoungHttpAuthReq, YoungHttpFreeReq } from '@bluesyoung/http'
+import { telMasaike } from '@bluesyoung/utils'
 
-export const usePost = (http: YoungHttp) => {
-  const FreeReq: YoungHttpFreeReq = (args) => http.freeReq({ method: 'POST', ...args });
-  const AuthReq: YoungHttpAuthReq = (args) => http.authReq({ method: 'POST', ...args });
+export function usePost(http: YoungHttp) {
+  const FreeReq: YoungHttpFreeReq = args => http.freeReq({ method: 'POST', ...args })
+  const AuthReq: YoungHttpAuthReq = args => http.authReq({ method: 'POST', ...args })
 
   return {
     login: async (args: LoginForm) => {
-      console.log('🚀 ~ file: post.ts:15 ~ login: ~ args:', args);
+      console.log('🚀 ~ file: post.ts:15 ~ login: ~ args:', args)
 
       const { token } = await FreeReq({
         url: '/base/login',
@@ -21,7 +21,7 @@ export const usePost = (http: YoungHttp) => {
           username: 'super',
           password: '123456',
         },
-      });
+      })
 
       return {
         uuid: '9527',
@@ -29,11 +29,11 @@ export const usePost = (http: YoungHttp) => {
         headimgurl: 'https://avatars.githubusercontent.com/u/55608642?v=4',
         token,
         phone: telMasaike(args.mobile),
-      } as UserLoginRes;
+      } as UserLoginRes
     },
     changePassword: async (args: LoginForm) => {
-      console.log('🚀 ~ file: post.ts:15 ~ login: ~ args:', args);
-      showToast('todo: user change password');
+      console.log('🚀 ~ file: post.ts:15 ~ login: ~ args:', args)
+      showToast('todo: user change password')
 
       return {
         uuid: '9527',
@@ -41,7 +41,7 @@ export const usePost = (http: YoungHttp) => {
         headimgurl: 'https://avatars.githubusercontent.com/u/55608642?v=4',
         token: 'xxx',
         phone: telMasaike(args.mobile),
-      } as UserLoginRes;
+      } as UserLoginRes
     },
 
     /**
@@ -51,7 +51,7 @@ export const usePost = (http: YoungHttp) => {
       await AuthReq({
         url: '/api/create',
         data,
-      });
+      })
     },
     /**
      * 创建菜单
@@ -60,7 +60,7 @@ export const usePost = (http: YoungHttp) => {
       await AuthReq({
         url: '/menu/create',
         data,
-      });
+      })
     },
     /**
      * 创建角色
@@ -69,7 +69,7 @@ export const usePost = (http: YoungHttp) => {
       await AuthReq({
         url: '/role/create',
         data,
-      });
+      })
     },
 
     /**
@@ -79,7 +79,7 @@ export const usePost = (http: YoungHttp) => {
       await AuthReq({
         url: '/user/create',
         data,
-      });
+      })
     },
-  };
-};
+  }
+}

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

@@ -10,4 +10,4 @@ export const MethodObj = {
   PATCH: 'warning',
   PUT: '',
   DELETE: 'danger',
-} as const;
+} as const

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

@@ -5,7 +5,7 @@
  * @Description:
  * @unocss-include
  */
-import type { SelectOptionItem } from '@bluesyoung/ui-vue3-element-plus';
+import type { SelectOptionItem } from '@bluesyoung/ui-vue3-element-plus'
 
 export const MenuIcons = [
   'i-icon-park-solid-analysis',
@@ -19,9 +19,9 @@ export const MenuIcons = [
   'i-icon-park-solid-add-user',
   'i-typcn-device-desktop',
   'i-icon-park-solid-application-two',
-] as const;
+] as const
 
-export const MenuIconList: SelectOptionItem[] = MenuIcons.map((label) => ({
+export const MenuIconList: SelectOptionItem[] = MenuIcons.map(label => ({
   label,
   value: label,
-}));
+}))

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

@@ -5,43 +5,42 @@
  * @Description:
  */
 export const useNavStore = defineStore('useNavStore', () => {
-  const title = ref('');
-  const sub_title = ref('');
+  const title = ref('')
+  const sub_title = ref('')
   /**
    * 树形导航数组(仅可见)
    */
-  const nav_arr = ref<NavArrItem[]>([]);
+  const nav_arr = ref<NavArrItem[]>([])
   /**
    * 拍平之后的导航数组(仅可见，用于快速搜索)
    */
-  const flat_nav_arr = ref<NavArrItem[]>([]);
+  const flat_nav_arr = ref<NavArrItem[]>([])
   /**
    * 拥有权限的路由
    */
-  const auth_routes = ref<string[]>([]);
+  const auth_routes = ref<string[]>([])
 
-  const active_nav = ref('');
+  const active_nav = ref('')
 
-  const isLoading = ref(false);
-  const isCollapse = ref(false);
+  const isLoading = ref(false)
+  const isCollapse = ref(false)
 
   watch(
     () => WindowSize['lt-lg'],
     (v) => {
-      isCollapse.value = v;
+      isCollapse.value = v
     },
     {
       immediate: true,
     },
-  );
+  )
 
   watchEffect(() => {
-    if (isLoading.value) {
-      document.body.style.overflow = 'hidden';
-    } else {
-      document.body.style.overflow = 'auto';
-    }
-  });
+    if (isLoading.value)
+      document.body.style.overflow = 'hidden'
+    else
+      document.body.style.overflow = 'auto'
+  })
 
   return {
     title,
@@ -52,9 +51,8 @@ export const useNavStore = defineStore('useNavStore', () => {
     auth_routes,
     isLoading,
     isCollapse,
-  };
-});
+  }
+})
 
-if (import.meta.hot) {
-  import.meta.hot.accept(acceptHMRUpdate(useNavStore, import.meta.hot));
-}
+if (import.meta.hot)
+  import.meta.hot.accept(acceptHMRUpdate(useNavStore, import.meta.hot))

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

@@ -1,58 +1,55 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-21 17:13:59
- * @LastEditTime: 2023-08-25 16:49:28
+ * @LastEditTime: 2023-09-06 16:09:39
  * @Description:
  */
-import type { RouteLocationNormalized } from 'vue-router';
+import type { RouteLocationNormalized } from 'vue-router'
 
 // hack nuxt3 的 keep-alive 没办法像 vue3 那样自由控制
-export const useTabReOpen = (cbk: Function = () => console.log('this tab page is reopen')) => {
-  const tagState = useTagsStore();
-  const route = useRoute();
+export function useTabReOpen(cbk: Function = () => console.log('this tab page is reopen')) {
+  const tagState = useTagsStore()
+  const route = useRoute()
 
   tagState.$onAction(({ name, args, after }) => {
     if (name === 'addToCache') {
-      if (args[0].name === route.name) {
-        after(() => cbk());
-      }
+      if (args[0].name === route.name)
+        after(() => cbk())
     }
-  });
+  })
 
-  cbk();
-};
+  cbk()
+}
 
-// @ts-ignore
 export const useTagsStore = defineStore('useTagsStore', {
   state: () => {
-    const visitedViews = ref<RouteLocationNormalized[]>([]);
-    const cachedViews = ref<string[]>([]);
+    const visitedViews = ref<RouteLocationNormalized[]>([])
+    const cachedViews = ref<string[]>([])
 
     return {
       visitedViews,
       cachedViews,
-    };
+    }
   },
   actions: {
     /**
      * 打开某个页面
      */
     addView(view: RouteLocationNormalized) {
-      if (view.path === '/') {
-        return;
-      }
+      if (view.path === '/')
+        return
 
       // 非我族类其心必异，布局不是默认布局的页面，不缓存
-      if ((view.meta?.layout ?? 'default') !== 'default') {
-        return;
-      }
+      if ((view.meta?.layout ?? 'default') !== 'default')
+        return
+
       // 查询是否已经访问过
-      if (!this.visitedViews.some((v) => v.path === view.path)) {
+      if (!this.visitedViews.some(v => v.path === view.path)) {
         // 添加到已访问
-        const { name, path, fullPath, meta } = view;
-        this.visitedViews.push({ name, path, fullPath, meta } as RouteLocationNormalized);
+        const { name, path, fullPath, meta } = view
+        this.visitedViews.push({ name, path, fullPath, meta } as RouteLocationNormalized)
         // 添加到缓存
-        this.addToCache(view);
+        this.addToCache(view)
       }
     },
     /**
@@ -60,11 +57,8 @@ export const useTagsStore = defineStore('useTagsStore', {
      */
     addToCache(view: RouteLocationNormalized) {
       // 查询该标签是否已缓存
-      if (this.cachedViews.includes(view.name as string)) {
-        null;
-      } else if (!view.meta?.noCache) {
-        this.cachedViews.push(view.name as string);
-      }
+      if (!this.cachedViews.includes(view.name as string) && !view.meta?.noCache)
+        this.cachedViews.push(view.name as string)
     },
     /**
      * 关闭某个页面
@@ -72,43 +66,43 @@ export const useTagsStore = defineStore('useTagsStore', {
     delView(view: RouteLocationNormalized) {
       // 固定页不能关闭
       if (view.meta.affix) {
-        ElMessage.warning('固定页无法关闭！');
-        return false;
+        ElMessage.warning('固定页无法关闭！')
+        return false
       }
       // 删除访问记录
-      const index = this.visitedViews.findIndex((r) => r.path === view.path);
-      index > -1 && this.visitedViews.splice(index, 1);
+      const index = this.visitedViews.findIndex(r => r.path === view.path)
+      index > -1 && this.visitedViews.splice(index, 1)
       // 删除缓存
-      this.delCachedView(view);
-      return true;
+      this.delCachedView(view)
+      return true
     },
     /**
      * 删除页面缓存
      */
     delCachedView(view: RouteLocationNormalized) {
-      const index = this.cachedViews.indexOf(view.name as string);
-      index > -1 && this.cachedViews.splice(index, 1);
+      const index = this.cachedViews.indexOf(view.name as string)
+      index > -1 && this.cachedViews.splice(index, 1)
     },
     /**
      * 关闭其他页面
      */
     delOtherViews(view: RouteLocationNormalized) {
       this.visitedViews = this.visitedViews.filter((v) => {
-        return v?.meta?.affix || v.path === view.path;
-      });
+        return v?.meta?.affix || v.path === view.path
+      })
       this.cachedViews = this.cachedViews.filter((v) => {
-        return v === view.name;
-      });
+        return v === view.name
+      })
     },
     /**
      * 关闭所有页面
      */
     delAllViews() {
-      const affixTags = this.visitedViews.filter((tag) => tag?.meta?.affix);
-      this.visitedViews = affixTags;
-      this.cachedViews.length = 0;
+      const affixTags = this.visitedViews.filter(tag => tag?.meta?.affix)
+      this.visitedViews = affixTags
+      this.cachedViews.length = 0
     },
   },
-});
+})
 
-import.meta.hot && import.meta.hot.accept(acceptHMRUpdate(useTagsStore, import.meta.hot));
+import.meta.hot && import.meta.hot.accept(acceptHMRUpdate(useTagsStore, import.meta.hot))

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

@@ -5,14 +5,14 @@
  * @Description:
  */
 export const useUserStore = defineStore('useUserStore', () => {
-  const cookie = useLocalStorage<UserLoginRes>('token', {} as UserLoginRes);
+  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 hasLogin = computed(() => !!cookie.value?.uuid)
+  const avatar = computed(() => cookie.value?.headimgurl)
+  const nick = computed(() => cookie.value?.nickname)
+  const token = computed(() => cookie.value?.token)
 
-  const SaveFlag = useLocalStorage('n天免登', true);
+  const SaveFlag = useLocalStorage('n天免登', true)
 
   return {
     cookie,
@@ -21,9 +21,8 @@ export const useUserStore = defineStore('useUserStore', () => {
     nick,
     token,
     SaveFlag,
-  };
-});
+  }
+})
 
-if (import.meta.hot) {
-  import.meta.hot.accept(acceptHMRUpdate(useUserStore, import.meta.hot));
-}
+if (import.meta.hot)
+  import.meta.hot.accept(acceptHMRUpdate(useUserStore, import.meta.hot))

package/template-nuxt-admin/error.vue

@@ -1,53 +1,61 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-06-12 15:00:07
- * @LastEditTime: 2023-07-31 12:10:16
+ * @LastEditTime: 2023-09-06 16:05:20
  * @Description:
 -->
 <script lang="ts" setup>
-import type { NuxtError } from '#app';
+import type { NuxtError } from '#app'
 
 const props = defineProps<{
-  error: NuxtError;
-}>();
+  error: NuxtError
+}>()
 
-let timer: NodeJS.Timer;
+let timer: NodeJS.Timeout
 
-const i = ref(5);
+const i = ref(5)
 
-const clear = () => {
-  clearError();
-  clearInterval(timer);
-  location.replace('/');
-};
+function clear() {
+  clearError()
+  clearInterval(timer)
+  location.replace('/')
+}
 
 const NotShowError = computed(() => {
-  return props.error.message === 'Request failed with status code 401';
-});
+  return props.error.message === 'Request failed with status code 401'
+})
 
 onMounted(() => {
-  if (process.server) {
-    return;
-  }
-  console.log(props.error, props.error.statusCode);
+  if (process.server)
+    return
+
+  console.log(props.error, props.error.statusCode)
   if (process.dev) {
-    console.log('开发模式，不自动清理');
-    return;
+    console.log('开发模式，不自动清理')
+    return
   }
   timer = setInterval(() => {
-    i.value--;
-    if (i.value === 0) {
-      clear();
-    }
-  }, 1e3);
-});
+    i.value--
+    if (i.value === 0)
+      clear()
+  }, 1e3)
+})
 </script>
+
 <template>
   <div v-if="!NotShowError" class="flex w-full h-full flex-col justify-center items-center">
-    <div class="text-5xl my-6">{{ error.statusCode }}</div>
-    <div class="text-lg my-2">{{ error.message || error.statusMessage || '出错啦~' }}</div>
+    <div class="text-5xl my-6">
+      {{ error.statusCode }}
+    </div>
+    <div class="text-lg my-2">
+      {{ error.message || error.statusMessage || '出错啦~' }}
+    </div>
 
-    <div class="mb-2">{{ i }}s 后自动跳转首页</div>
-    <ElButton @click="clear">立即返回首页</ElButton>
+    <div class="mb-2">
+      {{ i }}s 后自动跳转首页
+    </div>
+    <ElButton @click="clear">
+      立即返回首页
+    </ElButton>
   </div>
 </template>