create-young-proj 0.7.0 → 0.9.0

package/template-uni-app/src/utils/modal.ts

@@ -1,12 +1,12 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 14:12:25
- * @LastEditTime: 2023-07-18 14:24:22
+ * @LastEditTime: 2023-09-06 19:42:19
  * @Description: ui 交互，弹窗之类的
  */
-import { sleep } from '@bluesyoung/utils';
+import { sleep } from '@bluesyoung/utils'
 
-let loadingCount = 0;
+let loadingCount = 0
 
 /**
  * 显示loading
@@ -14,79 +14,101 @@ let loadingCount = 0;
  * @param title - 提示文本
  */
 export function showLoading(title = '加载中...', mask = true) {
-  loadingCount++;
-  uni.showLoading({
-    mask,
-    title,
-  });
+  const { fullscreenLoading, smallLoading } = storeToRefs(useHttpLoading())
+
+  if (fullscreenLoading.value)
+    return
+
+  loadingCount++
+
+  if (import.meta.env.VITE_CUSTOM_LOADING) {
+    smallLoading.value = true
+  }
+  else {
+    uni.showLoading({
+      mask,
+      title,
+    })
+  }
 }
 
 /**
  * 隐藏loading
  */
 export function hideLoading() {
-  --loadingCount === 0 && uni.hideLoading();
+  const { smallLoading, fullscreenLoading } = storeToRefs(useHttpLoading())
+
+  if (fullscreenLoading.value)
+    return
+
+  if (--loadingCount === 0) {
+    if (import.meta.env.VITE_CUSTOM_LOADING)
+      smallLoading.value = false
+    else
+      uni.hideLoading()
+  }
 }
 
 /**
  * 展示 toast
  */
 export function showToast(options?: UniApp.ShowToastOptions) {
-  const { icon = 'none', mask = false } = options || {};
+  const { icon = 'none', mask = false } = options || {}
 
   uni.showToast({
     icon,
     mask,
     ...options,
-  });
+  })
 }
 
-let hasModel = false;
-const modalPage = new Set<string>();
+let hasModel = false
+const modalPage = new Set<string>()
 /**
  * 显示弹窗
  * ! 全局一次只展示一个弹窗，其他的往后排
  */
 export async function showModal(options: UniApp.ShowModalOptions) {
-  const page = getCurrentPages();
-  const route = page[page.length - 1].route || '';
+  const page = getCurrentPages()
+  const route = page[page.length - 1]?.route || ''
   if (modalPage.has(route)) {
-    hasModel = true;
-  } else {
-    hasModel = false;
-    modalPage.add(route);
+    hasModel = true
   }
-  const { title = '提示', showCancel = true, complete } = options;
-  while (hasModel) {
-    await sleep(0.5);
+  else {
+    hasModel = false
+    modalPage.add(route)
   }
+  const { title = '提示', showCancel = true, complete } = options
+  // eslint-disable-next-line no-unmodified-loop-condition
+  while (hasModel)
+    await sleep(0.5)
+
   return new Promise((resolve, reject) => {
-    hasModel = true;
+    hasModel = true
     uni.showModal({
       title,
       showCancel,
       success(res) {
-        hasModel = false;
-        modalPage.delete(route);
-        if (res.confirm) {
-          resolve(res);
-        } else if (res.cancel) {
-          reject(res);
-        }
+        hasModel = false
+        modalPage.delete(route)
+        if (res.confirm)
+          resolve(res)
+        else if (res.cancel)
+          reject(res)
       },
       fail(err) {
-        hasModel = false;
-        modalPage.delete(route);
-        reject(err);
+        hasModel = false
+        modalPage.delete(route)
+        reject(err)
       },
       ...options,
       complete: (res) => {
-        hasModel = false;
-        modalPage.delete(route);
-        complete?.(res);
+        hasModel = false
+        modalPage.delete(route)
+        complete?.(res)
       },
-    });
-  });
+    })
+  })
 }
 
 /**
@@ -94,5 +116,5 @@ export async function showModal(options: UniApp.ShowModalOptions) {
  * @param errMsg - 错误信息
  */
 export function showErrorModal(errMsg: string) {
-  return showModal({ content: errMsg, showCancel: false });
+  return showModal({ content: errMsg, showCancel: false })
 }

package/template-uni-app/src/utils/route.ts

@@ -4,30 +4,30 @@
  * @LastEditTime: 2023-07-19 16:51:49
  * @Description:
  */
-import type { Pages } from '@/config';
+import type { Pages } from '@/config'
 
 interface IRoute {
   /**
    * 路由类型
    */
-  type: ENUM_ROUTE_TYPE;
+  type: ENUM_ROUTE_TYPE
   /**
    * 路由路径
    */
-  url: string;
+  url: string
   /**
    * 路由参数
    */
-  params?: Record<string, any>;
+  params?: Record<string, any>
   /**
    * 回退的层数 uni.navigateBack
    * @default 1
    */
-  delta?: number;
+  delta?: number
   /**
    * 是否编码
    */
-  encode?: boolean;
+  encode?: boolean
 }
 
 /**
@@ -41,80 +41,81 @@ enum ENUM_ROUTE_TYPE {
   BACK = 'navigateBack',
 }
 
-const params2Url = (params: Record<string, any>, encode = false) => {
-  const arr = [];
-  for (const key in params) {
-    arr.push(`${key}=${encode ? encodeURIComponent(params[key]) : params[key]}`);
-  }
-  return arr.join('&');
-};
+function params2Url(params: Record<string, any>, encode = false) {
+  const arr = []
+  for (const key in params)
+    arr.push(`${key}=${encode ? encodeURIComponent(params[key]) : params[key]}`)
+
+  return arr.join('&')
+}
 
 /**
  * 路由跳转
  */
 export function route({ type, url, params, delta = 1, encode }: IRoute) {
-  if (type !== ENUM_ROUTE_TYPE.BACK && params) {
-    url = `${url}?${params2Url(params, encode)}`;
-  }
+  if (type !== ENUM_ROUTE_TYPE.BACK && params)
+    url = `${url}?${params2Url(params, encode)}`
 
   switch (type) {
     case ENUM_ROUTE_TYPE.TO:
       uni.navigateTo({
         url,
-      });
-      break;
+      })
+      break
 
     case ENUM_ROUTE_TYPE.REDIRECT:
       uni.redirectTo({
         url,
-      });
-      break;
+      })
+      break
 
     case ENUM_ROUTE_TYPE.TAB:
       uni.switchTab({
         url,
-      });
-      break;
+      })
+      break
 
     case ENUM_ROUTE_TYPE.RELAUNCH:
       uni.reLaunch({
         url,
-      });
-      break;
+      })
+      break
     case ENUM_ROUTE_TYPE.BACK:
       uni.navigateBack({
         delta,
-      });
-      break;
+      })
+      break
 
     default:
-      break;
+      break
   }
 }
 
 export function to(url: Pages, params?: Record<string, any>, encode?: boolean) {
   if (TabbarArr.includes(url)) {
-    tabbar(url, params, encode);
-  } else {
+    tabbar(url, params, encode)
+  }
+  else {
     route({
       type: ENUM_ROUTE_TYPE.TO,
       url,
       params,
       encode,
-    });
+    })
   }
 }
 
 export function redirect(url: Pages, params?: Record<string, any>, encode?: boolean) {
   if (TabbarArr.includes(url)) {
-    tabbar(url, params, encode);
-  } else {
+    tabbar(url, params, encode)
+  }
+  else {
     route({
       type: ENUM_ROUTE_TYPE.REDIRECT,
       url,
       params,
       encode,
-    });
+    })
   }
 }
 
@@ -125,9 +126,10 @@ export function tabbar(url: Pages, params?: Record<string, any>, encode?: boolea
       url,
       params,
       encode,
-    });
-  } else {
-    to(url, params, encode);
+    })
+  }
+  else {
+    to(url, params, encode)
   }
 }
 
@@ -137,7 +139,7 @@ export function relaunch(url: Pages, params?: Record<string, any>, encode?: bool
     url,
     params,
     encode,
-  });
+  })
 }
 
 export function back(delta?: number) {
@@ -145,5 +147,5 @@ export function back(delta?: number) {
     type: ENUM_ROUTE_TYPE.BACK,
     delta,
     url: '',
-  });
+  })
 }

package/template-uni-app/src/utils/system.ts

@@ -1,66 +1,67 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 14:24:35
- * @LastEditTime: 2023-07-19 16:51:57
+ * @LastEditTime: 2023-09-06 19:42:33
  * @Description:
  */
-import type { SubscribeMessage } from '@/config';
+import type { SubscribeMessage } from '@/config'
 
 /**
  * 订阅指定的消息
  */
-export const subscribeMessage = (tmplIds: SubscribeMessage[]) =>
-  new Promise((resolve) => {
+export function subscribeMessage(tmplIds: SubscribeMessage[]) {
+  return new Promise((resolve) => {
     uni.requestSubscribeMessage({
       tmplIds,
       success: (res) => {
-        console.log('消息订阅成功：', res);
+        console.log('消息订阅成功：', res)
       },
       fail: (err) => {
-        console.log('消息订阅失败：', err);
+        console.log('消息订阅失败：', err)
       },
       complete: () => resolve(true),
-    });
-  });
+    })
+  })
+}
 
 /**
  * 获取系统信息 设置导航栏高度
  */
-export const getSystemInfo = () => {
-  const { systemInfo } = storeToRefs(useSystemInfo());
+export function getSystemInfo() {
+  const { systemInfo } = storeToRefs(useSystemInfo())
   return new Promise<UniApp.GetSystemInfoResult>((_resolve) => {
     uni.getSystemInfo({
       success: (e) => {
-        console.log(e, 'getSystemInfo');
-        systemInfo.value = e;
+        console.log(e, 'getSystemInfo')
+        systemInfo.value = e
         // 获取手机状态栏高度
-        let statusBar = e.statusBarHeight || 0;
-        let customBar;
+        const statusBar = e.statusBarHeight || 0
+        let customBar
 
         // #ifndef MP
-        customBar = statusBar + (e.platform == 'android' ? 50 : 45);
+        customBar = statusBar + (e.platform === 'android' ? 50 : 45)
         // #endif
 
         // #ifdef MP-WEIXIN
         // 获取胶囊按钮的布局位置信息
-        let menu = uni.getMenuButtonBoundingClientRect();
+        const menu = uni.getMenuButtonBoundingClientRect()
         // 导航栏高度 = 胶囊下距离 + 胶囊上距离 - 状态栏高度
-        customBar = menu.bottom + menu.top - statusBar;
+        customBar = menu.bottom + menu.top - statusBar
         // #endif
 
         // #ifdef MP-ALIPAY
-        customBar = statusBar + (e.titleBarHeight || 0);
+        customBar = statusBar + (e.titleBarHeight || 0)
         // #endif
 
-        const safeBottom = e.screenHeight - (e.safeArea ? e.safeArea.height + e.safeArea.top : 0);
+        const safeBottom = e.screenHeight - (e.safeArea ? e.safeArea.height + e.safeArea.top : 0)
 
         setNavbarHeihgt({
           statusBarH: statusBar,
           customBarH: customBar,
           safeBottom,
-        });
-        _resolve(e);
+        })
+        _resolve(e)
       },
-    });
-  });
-};
+    })
+  })
+}

package/template-uni-app/tsconfig.json

@@ -1,16 +1,16 @@
 {
-	"extends": "@vue/tsconfig/tsconfig.json",
-	"compilerOptions": {
-		"sourceMap": true,
-		"baseUrl": ".",
-		"paths": {
-			"@/*": ["./src/*"]
-		},
-		"lib": ["esnext", "dom"],
-		"types": ["@dcloudio/types", "@uni-helper/uni-app-types", "@uni-helper/uni-ui-types"]
-	},
+  "extends": "@vue/tsconfig/tsconfig.json",
+  "compilerOptions": {
+    "sourceMap": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
+    },
+    "lib": ["esnext", "dom"],
+    "types": ["@dcloudio/types", "@uni-helper/uni-app-types", "@uni-helper/uni-ui-types"]
+  },
   "vueCompilerOptions": {
     "nativeTags": ["block", "component", "template", "slot"]
   },
-	"include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "custom-plugins/*.ts", "auto-imports.d.ts", "components.d.ts", "pages.config.ts"]
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "custom-plugins/*.ts", "auto-imports.d.ts", "components.d.ts", "pages.config.ts"]
 }

package/template-uni-app/unocss.config.ts

@@ -4,9 +4,9 @@
  * @LastEditTime: 2023-02-14 12:09:16
  * @Description:
  */
-import presetWeapp from 'unocss-preset-weapp';
-import { transformerAttributify, transformerClass } from 'unocss-preset-weapp/transformer';
-import { defineConfig, transformerDirectives } from 'unocss';
+import presetWeapp from 'unocss-preset-weapp'
+import { transformerAttributify, transformerClass } from 'unocss-preset-weapp/transformer'
+import { defineConfig, transformerDirectives } from 'unocss'
 
 export default defineConfig({
   presets: [
@@ -27,4 +27,4 @@ export default defineConfig({
     // https://github.com/MellowCo/unocss-preset-weapp/tree/main/src/transformer/transformerClass
     transformerClass(),
   ],
-});
+})

package/template-uni-app/vite.config.ts

@@ -4,23 +4,23 @@
  * @LastEditTime: 2023-07-20 14:10:56
  * @Description:
  */
-import { resolve } from 'node:path';
-import { defineConfig } from 'vite';
-import type { ConfigEnv } from 'vite';
-import Uni from '@dcloudio/vite-plugin-uni';
-import UniPages from '@uni-helper/vite-plugin-uni-pages';
-import UniLayouts from '@uni-helper/vite-plugin-uni-layouts';
-import UniManifest from '@uni-helper/vite-plugin-uni-manifest';
+import { resolve } from 'node:path'
+import { defineConfig } from 'vite'
+import type { ConfigEnv } from 'vite'
+import Uni from '@dcloudio/vite-plugin-uni'
+import UniPages from '@uni-helper/vite-plugin-uni-pages'
+import UniLayouts from '@uni-helper/vite-plugin-uni-layouts'
+import UniManifest from '@uni-helper/vite-plugin-uni-manifest'
 
-import Unocss from 'unocss/vite';
-import AutoImport from 'unplugin-auto-import/vite';
-import AutoComponents from 'unplugin-vue-components/vite';
-import { polyfillFormData, multiConf } from './custom-plugins';
+import Unocss from 'unocss/vite'
+import AutoImport from 'unplugin-auto-import/vite'
+import AutoComponents from 'unplugin-vue-components/vite'
+import { multiConf, polyfillFormData } from './custom-plugins'
 
 // https://vitejs.dev/config/
 export default ({ command, mode }: ConfigEnv) => {
-  console.log('🚀 ~ file: vite.config.ts:18 ~ mode:', mode);
-  console.log('🚀 ~ file: vite.config.ts:18 ~ command:', command);
+  console.log('🚀 ~ file: vite.config.ts:18 ~ mode:', mode)
+  console.log('🚀 ~ file: vite.config.ts:18 ~ command:', command)
   return defineConfig({
     resolve: {
       alias: {
@@ -60,5 +60,5 @@ export default ({ command, mode }: ConfigEnv) => {
 
       multiConf(mode),
     ],
-  });
-};
+  })
+}

package/template-uni-app/volar.config.js

@@ -1,6 +1,6 @@
 // volar.config.js
-const volarServiceUniPages = require('@uni-helper/volar-service-uni-pages');
+const volarServiceUniPages = require('@uni-helper/volar-service-uni-pages')
 
 module.exports = {
   services: [volarServiceUniPages()],
-};
+}