create-young-proj 0.7.0 → 0.9.0

package/template-uni-app/src/App.vue

@@ -5,32 +5,32 @@
  * @Description:
 -->
 <script setup lang="ts">
-import { pages } from 'virtual:uni-pages';
+import { pages } from 'virtual:uni-pages'
 
 onLaunch(async () => {
-  console.log('App Launch');
-  console.log('环境变量：', import.meta.env);
-  const { pagesInfo } = storeToRefs(useSystemInfo());
-  pagesInfo.value = pages;
+  console.log('App Launch')
+  console.log('环境变量：', import.meta.env)
+  const { pagesInfo } = storeToRefs(useSystemInfo())
+  pagesInfo.value = pages
 
-  if (!getUuid()) {
-    setUuid();
-  }
-  await getSystemInfo();
-});
+  if (!getUuid())
+    setUuid()
+
+  await getSystemInfo()
+})
 
 onShow(async () => {
   /**
    * 自动更新
    */
-  const updateManager = uni.getUpdateManager();
+  const updateManager = uni.getUpdateManager()
 
-  updateManager.onCheckForUpdate(function (res) {
+  updateManager.onCheckForUpdate((res) => {
     // 请求完新版本信息的回调
     console.log(res.hasUpdate, 'onCheckForUpdate hasUpdate')
-  });
+  })
 
-  updateManager.onUpdateReady(function () {
+  updateManager.onUpdateReady(() => {
     showModal({
       title: '更新提示',
       content: '新版本已经准备好，是否重启应用？',
@@ -39,20 +39,19 @@ onShow(async () => {
           // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
           updateManager.applyUpdate()
         }
-      }
-    });
-  });
-  updateManager.onUpdateFailed(function () {
+      },
+    })
+  })
+  updateManager.onUpdateFailed(() => {
     // 新版本下载失败
-    showModal({ title: '更新提示', content: '新版本下载失败', showCancel: false });
-  });
-  console.log('App Show');
-});
+    showModal({ title: '更新提示', content: '新版本下载失败', showCancel: false })
+  })
+  console.log('App Show')
+})
 
 onHide(() => {
-  console.log('App Hide');
-});
-
+  console.log('App Hide')
+})
 </script>
 
 <style lang="scss">
@@ -62,7 +61,6 @@ page {
   background-color: #f6f7fb;
 }
 
-
 .font-pf {
   font-family: PingFangSC-Semibold, PingFang SC;
 }

package/template-uni-app/src/apis/index.ts

@@ -1,30 +1,34 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 15:35:24
- * @LastEditTime: 2023-07-20 15:06:25
+ * @LastEditTime: 2023-09-06 19:39:50
  * @Description:
  */
-import { useHttp } from './lib';
-import { useGet, usePost } from './requests';
+import { useHttp } from './lib'
+import { useGet, usePost } from './requests'
+
+/**
+ * 自动根据对应的环境，使用对应的接口地址，避免重复打包
+ */
+const EnvConfig = {
+  develop: 'https://dev.req.cn',
+  trial: 'https://test.req.cn',
+  release: 'https://online.req.cn',
+}
+
+export function getReqUrl(): string {
+  // @ts-expect-error
+  return import.meta.env.VITE_API_BASE_URL || EnvConfig[__wxConfig.envVersion]
+}
 
 const http = useHttp({
-  baseURL: import.meta.env.VITE_API_BASE_URL,
+  baseURL: getReqUrl(),
   loading: {
     start: () => {
-      if (import.meta.env.VITE_CUSTOM_LOADING) {
-        const { httpLoadingEl } = storeToRefs(useHttpLoading());
-        httpLoadingEl.value?.start();
-      } else {
-        showLoading();
-      }
+      showLoading()
     },
     end: () => {
-      if (import.meta.env.VITE_CUSTOM_LOADING) {
-        const { httpLoadingEl } = storeToRefs(useHttpLoading());
-        httpLoadingEl.value?.end();
-      } else {
-        hideLoading();
-      }
+      hideLoading()
     },
   },
   headers: {
@@ -32,19 +36,19 @@ const http = useHttp({
       Accept: 'application/vnd.github.v3+json',
     }),
     getAuthHeaders: () => {
-      const token = 'todo: change to the real token that you used';
+      const token = 'todo: change to the real token that you used'
       return {
         Authorization: `Bearer ${token}`,
-      };
+      }
     },
   },
   fail: (err) => {
     // todo: 错误逻辑处理
-    showErrorModal(err.toString());
+    showErrorModal(err.toString())
   },
-});
+})
 
 export const apis = {
   get: useGet(http),
   post: usePost(http),
-};
+}

package/template-uni-app/src/apis/lib/index.ts

@@ -1,102 +1,102 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 16:36:39
- * @LastEditTime: 2023-07-18 16:51:41
+ * @LastEditTime: 2023-09-06 19:40:19
  * @Description:
  */
 /// <reference types="@uni-helper/axios-adapter/client" />
-import type { AxiosInstance, AxiosRequestConfig, Method, AxiosAdapter } from 'axios';
-import axios from 'axios';
-import { defu } from 'defu';
-import { createUniAppAxiosAdapter } from '@uni-helper/axios-adapter';
+import type { AxiosAdapter, AxiosInstance, AxiosRequestConfig, Method } from 'axios'
+import axios from 'axios'
+import { defu } from 'defu'
+import { createUniAppAxiosAdapter } from '@uni-helper/axios-adapter'
 
 type Simplify<T> = {
   [P in keyof T]: T[P];
-};
+}
 
 type SetRequired<T, K extends keyof T> = Simplify<
   // 将要设置为可选类型的结构取出并设置为必选
   Required<Pick<T, K>> &
-    // 取并集
-    // 排除需要设置为可选属性的结构，其余的保持不变
-    Pick<T, Exclude<keyof T, K>>
->;
+  // 取并集
+  // 排除需要设置为可选属性的结构，其余的保持不变
+  Pick<T, Exclude<keyof T, K>>
+>
 
-export type AllMethod = Lowercase<Method>;
-export type Fn<T extends any = any, R extends any = any> = (...args: T[]) => Promise<R>;
+export type AllMethod = Lowercase<Method>
+export type Fn<T = any, R = any> = (...args: T[]) => Promise<R>
 export type Cbks = {
   [k in AllMethod]?: Record<string, Fn>;
-};
+}
 
 type Handlers<R extends Cbks> = {
   [P in keyof R]?: R[P];
-};
+}
 
-type Headers = Record<string, string>;
+type Headers = Record<string, string>
 
-type Req = <X extends any = any>(config: AxiosRequestConfig<unknown>) => Promise<X>;
+type Req = <X = any>(config: AxiosRequestConfig<unknown>) => Promise<X>
 
-type Prototype = {
-  __instance__: AxiosInstance;
+interface Prototype {
+  __instance__: AxiosInstance
   __mixin__<T extends Cbks>(
     extentions: Handlers<T>,
-  ): SetRequired<Handlers<T>, keyof T> & ThisType<Handlers<T>>;
+  ): SetRequired<Handlers<T>, keyof T> & ThisType<Handlers<T>>
 
-  freeReq: Req;
-  authReq: Req;
-};
+  freeReq: Req
+  authReq: Req
+}
 
 export enum UsefulContentTypes {
-  JSON = `application/json; charset=UTF-8`,
-  URLEncoded = `application/x-www-form-urlencoded; charset=UTF-8`,
-  FormData = `multipart/form-data; charset=UTF-8`,
+  JSON = 'application/json; charset=UTF-8',
+  URLEncoded = 'application/x-www-form-urlencoded; charset=UTF-8',
+  FormData = 'multipart/form-data; charset=UTF-8',
 }
 
-export type DefaultMsg = {
-  code: number;
-  msg: string;
-  data: any;
-};
+export interface DefaultMsg {
+  code: number
+  msg: string
+  data: any
+}
 
-export interface DefaultHttpConfig<Msg extends any = DefaultMsg> {
+export interface DefaultHttpConfig<Msg = DefaultMsg> {
   /**
    * 基础地址
    * @default /api
    */
-  baseURL: string;
+  baseURL: string
   /**
    * 动态获取基础地址
    */
-  lazyBaseURL?: () => string;
+  lazyBaseURL?: () => string
   /**
    * 默认方法
    * @default post
    */
-  method: AllMethod;
+  method: AllMethod
   /**
    * 超时时间
    * @default 5e3 5s
    */
-  timeout: number;
+  timeout: number
   /**
    * 加载函数
    */
   loading: {
-    start: () => void;
-    end: () => void;
-  };
+    start: () => void
+    end: () => void
+  }
   /**
    * 错误处理函数，进行错误处理或继续抛出错误
    * 接受各种抛出的错误
    * @default console.error
    */
-  fail: (err: string | number | Error | Msg) => void;
+  fail: (err: string | number | Error | Msg) => void
   /**
    * 结果校验 + 数据解析，判断此次请求是否正常，正常则返回解包数据，否则抛出异常
    * 不传则默认使用标准 http 状态码作为判断结果，并原样返回
    * @default () => any | never
    */
-  checkFn: (res: Msg) => any | never;
+  checkFn: (res: Msg) => any | never
   /**
    * 请求头
    */
@@ -105,18 +105,18 @@ export interface DefaultHttpConfig<Msg extends any = DefaultMsg> {
      * 生成公共请求头
      * @default () => {}
      */
-    getCommonHeaders?: () => Headers;
+    getCommonHeaders?: () => Headers
     /**
      * 生成鉴权请求头
      * @default () => {}
      */
-    getAuthHeaders?: () => Headers;
-  };
+    getAuthHeaders?: () => Headers
+  }
   /**
    * 自定义适配器
    * 微信小程序等其他非标准环境时传入
    */
-  adapter?: AxiosAdapter;
+  adapter?: AxiosAdapter
 }
 
 const defaultConfig: DefaultHttpConfig = {
@@ -128,12 +128,12 @@ const defaultConfig: DefaultHttpConfig = {
     end: console.log.bind(null, '🚀 ~ http loading end'),
   },
   fail: console.error.bind(null, '🚀 ~ http loading error'),
-  checkFn: (res) => res,
+  checkFn: res => res,
   headers: {
     getCommonHeaders: () => ({}),
     getAuthHeaders: () => ({}),
   },
-};
+}
 
 declare module 'axios' {
   export interface AxiosRequestConfig {
@@ -141,56 +141,55 @@ declare module 'axios' {
      * 禁用 loading 动画
      * @default false
      */
-    notLoading?: boolean;
+    notLoading?: boolean
   }
 }
 
-export const useHttp = <Msg extends Record<string, any> = DefaultMsg, Fns extends Cbks = Cbks>(
-  config: Partial<DefaultHttpConfig<Msg>> = {},
-) => {
-  const finalConfig = defu(config, defaultConfig);
+export function useHttp<Msg extends Record<string, any> = DefaultMsg, Fns extends Cbks = Cbks>(config: Partial<DefaultHttpConfig<Msg>> = {}) {
+  const finalConfig = defu(config, defaultConfig)
 
-  const { baseURL, lazyBaseURL, method, timeout, headers, checkFn, loading, fail } = finalConfig;
+  const { baseURL, lazyBaseURL, method, timeout, headers, checkFn, loading, fail } = finalConfig
 
   const net = axios.create({
     method,
     timeout,
     headers: headers.getCommonHeaders!(),
     adapter: createUniAppAxiosAdapter(),
-  });
+  })
 
   net.interceptors.request.use(
     (req) => {
-      !req.notLoading && loading.start();
-      if (!req.baseURL) {
-        req.baseURL = lazyBaseURL?.() ?? baseURL;
-      }
-      return req;
+      !req.notLoading && loading.start()
+      if (!req.baseURL)
+        req.baseURL = lazyBaseURL?.() ?? baseURL
+
+      return req
     },
     (error) => {
-      fail(error);
-      return Promise.reject(error);
+      fail(error)
+      return Promise.reject(error)
     },
-  );
+  )
 
   net.interceptors.response.use(
     (response) => {
-      !response.config.notLoading && loading.end();
-      const data = response.data;
+      !response.config.notLoading && loading.end()
+      const data = response.data
 
       try {
-        return checkFn(data);
-      } catch (err) {
+        return checkFn(data)
+      }
+      catch (err) {
         // 应用逻辑异常
-        fail(err as any);
+        fail(err as any)
       }
     },
     (error) => {
-      !error.config.notLoading && loading.end();
+      !error.config.notLoading && loading.end()
       // http 异常
-      fail(error);
+      fail(error)
     },
-  );
+  )
 
   return {
     get: undefined,
@@ -207,18 +206,18 @@ export const useHttp = <Msg extends Record<string, any> = DefaultMsg, Fns extend
     __mixin__(extentions: any) {
       for (const method in extentions) {
         if (Object.prototype.hasOwnProperty.call(extentions, method)) {
-          // @ts-ignore
-          const originFns = this[method] || {};
-          const fns = extentions[method];
-          // @ts-ignore
+          // @ts-expect-error
+          const originFns = this[method] || {}
+          const fns = extentions[method]
+          // @ts-expect-error
           this[method] = {
             ...originFns,
             ...fns,
-          };
+          }
         }
       }
 
-      return this;
+      return this
     },
 
     freeReq: net.request,
@@ -230,7 +229,7 @@ export const useHttp = <Msg extends Record<string, any> = DefaultMsg, Fns extend
           ...args?.headers,
         },
       }),
-  } as unknown as Handlers<Fns> & Prototype;
-};
+  } as unknown as Handlers<Fns> & Prototype
+}
 
-export type Http = ReturnType<typeof useHttp>;
+export type Http = ReturnType<typeof useHttp>

package/template-uni-app/src/apis/requests/get.ts

@@ -4,49 +4,49 @@
  * @LastEditTime: 2023-07-18 17:08:14
  * @Description:
  */
-import type { Http } from '../lib';
+import type { Http } from '../lib'
 
-export const useGet = (http: Http) => {
-  const FreeReq: Http['freeReq'] = (args) => http.freeReq({ method: 'GET', ...args });
-  const AuthReq: Http['authReq'] = (args) => http.authReq({ method: 'GET', ...args });
+export function useGet(http: Http) {
+  const FreeReq: Http['freeReq'] = args => http.freeReq({ method: 'GET', ...args })
+  const AuthReq: Http['authReq'] = args => http.authReq({ method: 'GET', ...args })
 
   return {
     getByUserName: (name: string) =>
       FreeReq<{
-        login: string;
-        id: number;
-        node_id: string;
-        avatar_url: string;
-        gravatar_id: string;
-        url: string;
-        html_url: string;
-        followers_url: string;
-        following_url: string;
-        gists_url: string;
-        starred_url: string;
-        subscriptions_url: string;
-        organizations_url: string;
-        repos_url: string;
-        events_url: string;
-        received_events_url: string;
-        type: string;
-        site_admin: boolean;
-        name: string;
-        company: null | string;
-        blog: string;
-        location: null | string;
-        email: null | string;
-        hireable: null | boolean;
-        bio: null | string;
-        twitter_username: null | string;
-        public_repos: number;
-        public_gists: number;
-        followers: number;
-        following: number;
-        created_at: string;
-        updated_at: string;
+        login: string
+        id: number
+        node_id: string
+        avatar_url: string
+        gravatar_id: string
+        url: string
+        html_url: string
+        followers_url: string
+        following_url: string
+        gists_url: string
+        starred_url: string
+        subscriptions_url: string
+        organizations_url: string
+        repos_url: string
+        events_url: string
+        received_events_url: string
+        type: string
+        site_admin: boolean
+        name: string
+        company: null | string
+        blog: string
+        location: null | string
+        email: null | string
+        hireable: null | boolean
+        bio: null | string
+        twitter_username: null | string
+        public_repos: number
+        public_gists: number
+        followers: number
+        following: number
+        created_at: string
+        updated_at: string
       }>({
         url: `/users/${name}`,
       }),
-  };
-};
+  }
+}

package/template-uni-app/src/apis/requests/index.ts

@@ -4,5 +4,5 @@
  * @LastEditTime: 2023-07-18 17:00:49
  * @Description:
  */
-export * from './get';
-export * from './post';
+export * from './get'
+export * from './post'

package/template-uni-app/src/apis/requests/post.ts

@@ -4,20 +4,20 @@
  * @LastEditTime: 2023-07-18 16:59:35
  * @Description:
  */
-import type { Http } from '../lib';
+import type { Http } from '../lib'
 
-export const usePost = (http: Http) => {
-  const FreeReq: Http['freeReq'] = (args) => http.freeReq({ method: 'POST', ...args });
-  const AuthReq: Http['authReq'] = (args) => http.authReq({ method: 'POST', ...args });
+export function usePost(http: Http) {
+  const FreeReq: Http['freeReq'] = args => http.freeReq({ method: 'POST', ...args })
+  const AuthReq: Http['authReq'] = args => http.authReq({ method: 'POST', ...args })
 
   return {
     createRepo: async (name: string) => {
       await AuthReq({
-        url: `/user/repos`,
+        url: '/user/repos',
         params: {
           name,
         },
-      });
+      })
     },
-  };
-};
+  }
+}

package/template-uni-app/src/components/young-loading/young-loading.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-19 12:12:29
- * @LastEditTime: 2023-07-19 14:27:31
+ * @LastEditTime: 2023-08-25 16:26:53
  * @Description:
 -->
 <script lang="ts" setup>
@@ -9,30 +9,28 @@ withDefaults(defineProps<{
   /**
    * 加载中的动图
    */
-  loadingGif?: string;
+  loadingGif?: string
   /**
    * 文本提示
    */
-  tip?: string;
+  tip?: string
 }>(), {
-  loadingGif: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
-  tip: '加载中...'
-});
+  // @ts-expect-error
+  loadingGif: __wxConfig.accountInfo.icon,
+  tip: '加载中...',
+})
 
-const loading = ref(true);
-
-const start = () => loading.value = true;
-const end = () => loading.value = false;
-
-defineExpose({
-  start,
-  end
-});
+const { fullscreenLoading } = storeToRefs(useHttpLoading())
 </script>
+
 <template>
-  <view v-if="loading"
-    class="w100vw h100vh fixed left-0 top-0 z-999999 bg-white flex flex-col items-center justify-center">
-    <image :src="loadingGif" class="w240rpx h240rpx mb-32rpx" />
-    <text class="text-[#999] text-24rpx leading-36rpx">{{ tip }}</text>
+  <view
+    v-show="fullscreenLoading"
+    class="w100vw h100vh fixed left-0 top-0 z-999999 bg-white flex flex-col items-center justify-center"
+  >
+    <image :src="loadingGif" class="w140rpx h140rpx mb-32rpx" />
+    <text class="text-[#999] text-24rpx leading-36rpx">
+      {{ tip }}
+    </text>
   </view>
 </template>