create-young-proj 0.6.1 → 0.8.0

package/template-uni-app/dist/dev/mp-weixin/utils/system.js

@@ -0,0 +1,27 @@
+"use strict";
+const common_vendor = require("../common/vendor.js");
+const store_system = require("../store/system.js");
+const store_local_index = require("../store/local/index.js");
+const getSystemInfo = () => {
+  const { systemInfo } = common_vendor.storeToRefs(store_system.useSystemInfo());
+  return new Promise((_resolve) => {
+    common_vendor.index.getSystemInfo({
+      success: (e) => {
+        console.log(e, "getSystemInfo");
+        systemInfo.value = e;
+        let statusBar = e.statusBarHeight || 0;
+        let customBar;
+        let menu = common_vendor.index.getMenuButtonBoundingClientRect();
+        customBar = menu.bottom + menu.top - statusBar;
+        const safeBottom = e.screenHeight - (e.safeArea ? e.safeArea.height + e.safeArea.top : 0);
+        store_local_index.setNavbarHeihgt({
+          statusBarH: statusBar,
+          customBarH: customBar,
+          safeBottom
+        });
+        _resolve(e);
+      }
+    });
+  });
+};
+exports.getSystemInfo = getSystemInfo;

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

@@ -1,30 +1,33 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 15:35:24
- * @LastEditTime: 2023-07-20 15:06:25
+ * @LastEditTime: 2023-08-25 16:42:53
  * @Description:
  */
 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 const getReqUrl = (): string =>
+  // @ts-ignore
+  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: {

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>
@@ -15,24 +15,17 @@ withDefaults(defineProps<{
    */
   tip?: string;
 }>(), {
-  loadingGif: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+  // @ts-ignore
+  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"
+  <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="w240rpx h240rpx mb-32rpx" />
+    <image :src="loadingGif" class="w140rpx h140rpx mb-32rpx" />
     <text class="text-[#999] text-24rpx leading-36rpx">{{ tip }}</text>
   </view>
 </template>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-20 14:48:35
- * @LastEditTime: 2023-07-20 15:09:28
+ * @LastEditTime: 2023-08-25 16:27:13
  * @Description:
 -->
 <script lang="ts" setup>
@@ -19,18 +19,11 @@ withDefaults(defineProps<{
   tip: '拼命加载中...'
 });
 
-const loading = ref(false);
+const { smallLoading } = storeToRefs(useHttpLoading());
 
-const start = () => loading.value = true;
-const end = () => loading.value = false;
-
-defineExpose({
-  start,
-  end
-});
 </script>
 <template>
-  <view v-if="loading"
+  <view v-show="smallLoading"
     class="w100vw h100vh fixed left-0 top-0 z-999998 bg-[#333] opacity-90 flex flex-col items-center justify-center">
     <image :src="loadingGif" class="w240rpx h240rpx mb-32rpx" />
     <text class="text-[#fff] text-24rpx leading-36rpx">{{ tip }}</text>

package/template-uni-app/src/layouts/default.vue

@@ -1,11 +1,10 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-20 10:55:54
- * @LastEditTime: 2023-07-20 15:40:22
+ * @LastEditTime: 2023-08-25 16:21:46
  * @Description: todo: 默认布局，按需调整
 -->
 <script lang="ts" setup>
-const { httpLoadingEl } = storeToRefs(useHttpLoading());
 const { pagesInfo } = storeToRefs(useSystemInfo());
 
 onLoad(() => {
@@ -19,6 +18,6 @@ onLoad(() => {
 </script>
 
 <template>
-  <young-loading-mini ref="httpLoadingEl" />
+  <young-loading-mini />
   <slot />
 </template>

package/template-uni-app/src/layouts/tabbar.vue

@@ -1,28 +1,35 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-20 11:00:42
- * @LastEditTime: 2023-07-20 15:09:18
+ * @LastEditTime: 2023-08-25 16:37:12
  * @Description: tabbar 页面的默认布局
 -->
 <script lang="ts" setup>
 const { customBarH, safeBottom } = getNavbarHeihgt();
-const loadingEl = ref();
 
-const { httpLoadingEl } = storeToRefs(useHttpLoading());
+const { pagesInfo } = storeToRefs(useSystemInfo());
 
-onMounted(() => {
-  setTimeout(() => {
-    loadingEl.value?.end();
-  }, 3e3);
+const showNavBar = ref(false);
+const navBarAttr = ref<ParamsObj>({});
+
+onLoad(() => {
+  const [page] = getCurrentPages();
+
+  const pageConf = pagesInfo.value.find((p) => p.path === page.route);
+
+  if (pageConf?.navbar) {
+    showNavBar.value = true;
+    navBarAttr.value = pageConf.navbar;
+  }
 });
 </script>
 <template>
-  <young-loading ref="loadingEl" />
-  <young-loading-mini ref="httpLoadingEl" />
-  <div class="flex flex-col" :style="{ height: `calc(100vh - ${customBarH}px - ${safeBottom}px - 44px)` }">
-    <scroll-view scroll-y class="flex-1 bg-transparent">
-      <slot></slot>
-    </scroll-view>
-    <young-tabbar :z="999" />
-  </div>
+  <young-navbar v-if="showNavBar" v-bind="navBarAttr" />
+  <young-loading />
+  <young-loading-mini />
+  <scroll-view scroll-y class="flex flex-col bg-transparent"
+    :style="{ height: `calc(100vh - ${customBarH}px - ${safeBottom}px - 44px)` }">
+    <slot></slot>
+  </scroll-view>
+  <young-tabbar :z="999" />
 </template>

package/template-uni-app/src/pages/index.vue

@@ -1,13 +1,16 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-18 11:23:36
- * @LastEditTime: 2023-07-20 15:24:46
+ * @LastEditTime: 2023-08-25 16:39:24
  * @Description:
 -->
 <route lang="json">
 {
   "needLogin": true,
-  "layout": "tabbar"
+  "layout": "tabbar",
+  "navbar": {
+    "isback": false
+  }
 }
 </route>
 
@@ -20,10 +23,16 @@ const testGet = async () => {
 const testPost = async () => {
   await apis.post.createRepo('BluesYoung-web');
 };
+
+const { fullscreenLoading } = storeToRefs(useHttpLoading());
+fullscreenLoading.value = true;
+
+setTimeout(() => {
+  fullscreenLoading.value = false;
+}, 3e3);
 </script>
 
 <template>
-  <young-navbar :isback="false" />
   <h1 class="text-32">我是页面</h1>
   <view class="uni-primary">主色</view>
   <view class="uni-success">成功色</view>

package/template-uni-app/src/pages/my.vue

@@ -1,25 +1,28 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-18 17:53:43
- * @LastEditTime: 2023-07-20 11:56:29
+ * @LastEditTime: 2023-08-25 16:39:28
  * @Description:
 -->
 <route lang="json">
 {
   "needLogin": true,
-  "layout": "tabbar"
+  "layout": "tabbar",
+  "navbar": {
+    "isback": false
+  }
 }
 </route>
 
+<script lang="ts" setup>
+const { fullscreenLoading } = storeToRefs(useHttpLoading());
+fullscreenLoading.value = true;
+
+setTimeout(() => {
+  fullscreenLoading.value = false;
+}, 3e3);
+</script>
+
 <template>
-  <uni-nav-bar status-bar :border="false" title="个人中心" />
-  <h1 class="text-32">我是页面</h1>
-  <view class="uni-primary">主色</view>
-  <view class="uni-success">成功色</view>
-  <view class="uni-warning">警告色</view>
-  <view class="uni-error">错误色</view>
-  <uni-card title="基础卡片" sub-title="副标题" extra="额外信息"
-    thumbnail="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png">
-    <text>这是一个带头像和双标题的基础卡片，此示例展示了一个完整的卡片。</text>
-  </uni-card>
+  <h1 class="text-32">我是个人中心</h1>
 </template>

package/template-uni-app/src/pages.json

@@ -5,13 +5,19 @@
       "path": "pages/index",
       "type": "home",
       "needLogin": true,
-      "layout": "tabbar"
+      "layout": "tabbar",
+      "navbar": {
+        "isback": false
+      }
     },
     {
       "path": "pages/my",
       "type": "page",
       "needLogin": true,
-      "layout": "tabbar"
+      "layout": "tabbar",
+      "navbar": {
+        "isback": false
+      }
     },
     {
       "path": "pages/demo/index",

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

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 15:20:04
- * @LastEditTime: 2023-07-20 15:00:01
+ * @LastEditTime: 2023-08-25 16:20:11
  * @Description:
  */
 import type { PageMetaDatum } from '@uni-helper/vite-plugin-uni-pages';
@@ -15,6 +15,7 @@ export const useSystemInfo = defineStore('useSystemInfo', () => {
 });
 
 export const useHttpLoading = defineStore('useHttpLoading', () => {
-  const httpLoadingEl = ref();
-  return { httpLoadingEl };
+  const fullscreenLoading = ref(false);
+  const smallLoading = ref(false);
+  return { smallLoading, fullscreenLoading };
 });

package/template-uni-app/src/typings/global.d.ts

@@ -0,0 +1,7 @@
+/*
+ * @Author: zhangyang
+ * @Date: 2023-08-25 16:36:22
+ * @LastEditTime: 2023-08-25 16:36:22
+ * @Description:
+ */
+type ParamsObj = Record<string, any>;

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

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 14:28:16
- * @LastEditTime: 2023-07-19 16:51:04
+ * @LastEditTime: 2023-08-29 10:22:48
  * @Description: 权限相关
  */
 /**
@@ -123,3 +123,73 @@ export const authLocation = async (cancelback = true, isShowModal = true) =>
       },
     });
   });
+
+/**
+ * 获取本机支持的生物认证信息
+ */
+export const getAuthInfo = async () => {
+  return new Promise<UniApp.CheckIsSupportSoterAuthenticationRes['supportMode'] | false>(
+    (resolve) => {
+      uni.checkIsSupportSoterAuthentication({
+        success(res) {
+          resolve(res.supportMode);
+        },
+        fail(err) {
+          console.log('🚀 ~ file: auth.ts:234 ~ fail ~ err:', err);
+          resolve(false);
+        },
+      });
+    },
+  );
+};
+
+/**
+ * 检查本机是否录入过指纹
+ */
+export const checkFingerPrint = async () => {
+  return new Promise<boolean>((resolve) => {
+    uni.checkIsSoterEnrolledInDevice({
+      checkAuthMode: 'fingerPrint',
+      success: () => resolve(true),
+      fail: () => resolve(false),
+    });
+  });
+};
+
+/**
+ * 指纹认证
+ */
+export const fingerPrintAuth = async (signStr: string, authContent = '请验证本机指纹') => {
+  return new Promise<boolean>(async (resolve) => {
+    const authMethods = await getAuthInfo();
+    if (authMethods && authMethods.includes('fingerPrint')) {
+      uni.checkIsSupportSoterAuthentication({
+        async success(res) {
+          if (res.supportMode.includes('fingerPrint') && (await checkFingerPrint())) {
+            uni.startSoterAuthentication({
+              requestAuthModes: ['fingerPrint'],
+              challenge: signStr,
+              authContent,
+              success(res) {
+                console.log('success', res);
+                resolve(true);
+              },
+              fail(err) {
+                console.log('fail', err);
+                resolve(false);
+              },
+            });
+          } else {
+            resolve(false);
+          }
+        },
+        fail(err) {
+          console.log('fail', err);
+          resolve(false);
+        },
+      });
+    } else {
+      resolve(false);
+    }
+  });
+};

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

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 14:12:25
- * @LastEditTime: 2023-07-18 14:24:22
+ * @LastEditTime: 2023-08-25 16:22:55
  * @Description: ui 交互，弹窗之类的
  */
 import { sleep } from '@bluesyoung/utils';
@@ -14,18 +14,41 @@ let loadingCount = 0;
  * @param title - 提示文本
  */
 export function showLoading(title = '加载中...', mask = true) {
+  const { fullscreenLoading, smallLoading } = storeToRefs(useHttpLoading());
+
+  if (fullscreenLoading.value) {
+    return;
+  }
+
   loadingCount++;
-  uni.showLoading({
-    mask,
-    title,
-  });
+
+  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();
+    }
+  }
 }
 
 /**
@@ -49,7 +72,7 @@ const modalPage = new Set<string>();
  */
 export async function showModal(options: UniApp.ShowModalOptions) {
   const page = getCurrentPages();
-  const route = page[page.length - 1].route || '';
+  const route = page[page.length - 1]?.route || '';
   if (modalPage.has(route)) {
     hasModel = true;
   } else {

package/template-vue-admin/src/views/system/menuList.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2022-05-30 16:28:37
- * @LastEditTime: 2023-01-06 11:35:16
+ * @LastEditTime: 2023-08-02 10:44:18
  * @Description: 菜单管理
 -->
 <route lang="yaml">
@@ -180,7 +180,7 @@ getList()
             <ElInput v-model="form.title" placeholder="请输入页面标题" />
           </ElFormItem>
           <ElFormItem label="排序">
-            <ElInput v-model.number="form.sort" />
+            <ElInputNumber v-model.number="form.sort" />
           </ElFormItem>
           <ElFormItem label="路径" prop="component" :rules="form.parentId === 0 ? {} :
             { message: '请输入合法的路径, eg: /path/page', trigger: 'blur', validator: (_: any, v: string) => v.trim() === '' || /\/(.*)\/(.*)/.test(v) }
@@ -191,4 +191,4 @@ getList()
       </template>
     </YoungDialog>
   </div>
-</template>
+</template>