create-young-proj 0.5.0 → 0.6.1

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

@@ -0,0 +1,38 @@
+<!--
+ * @Author: zhangyang
+ * @Date: 2023-07-20 14:48:35
+ * @LastEditTime: 2023-07-20 15:09:28
+ * @Description:
+-->
+<script lang="ts" setup>
+withDefaults(defineProps<{
+  /**
+   * 加载中的动图
+   */
+  loadingGif?: string;
+  /**
+   * 文本提示
+   */
+  tip?: string;
+}>(), {
+  loadingGif: 'https://api.iconify.design/eos-icons:bubble-loading.svg?color=%23e80d19',
+  tip: '拼命加载中...'
+});
+
+const loading = ref(false);
+
+const start = () => loading.value = true;
+const end = () => loading.value = false;
+
+defineExpose({
+  start,
+  end
+});
+</script>
+<template>
+  <view v-if="loading"
+    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>
+  </view>
+</template>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-19 09:03:51
- * @LastEditTime: 2023-07-19 16:47:55
+ * @LastEditTime: 2023-07-20 15:18:33
  * @Description:
 -->
 <script lang="ts" setup>
@@ -98,8 +98,8 @@ const handleLeftClick = () => {
             <slot name="back" />
           </template>
           <template v-else>
-            <!-- <image v-if="pagesCount === 1" src="../static/home.png" class="w20px h20px"></image>
-            <image v-else src="../static/back.png" class="w20px h20px"></image> -->
+            <image v-if="pagesCount === 1" src="@/static/h.png" class="w20px h20px"></image>
+            <image v-else src="@/static/back.png" class="w20px h20px"></image>
           </template>
           <slot name="backText" />
         </view>

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

@@ -1,12 +1,16 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-18 17:44:06
- * @LastEditTime: 2023-07-19 10:34:41
+ * @LastEditTime: 2023-07-20 12:03:39
  * @Description:
 -->
 <script lang="ts" setup>
 import { Pages } from '@/config';
-import { isHttpUrl } from '@bluesyoung/utils';
+import home from '@/static/home.png';
+import home_active from '@/static/home_active.png';
+import my from '@/static/my.png';
+import my_active from '@/static/my_active.png';
+
 type Tabbar = {
   selectedIconPath: string;
   iconPath: string;
@@ -19,14 +23,14 @@ withDefaults(defineProps<{ z?: number }>(), { z: 99 });
 const list = ref<Tabbar[]>([
   {
     text: '首页',
-    iconPath: 'home',
-    selectedIconPath: 'home-filled',
+    iconPath: home,
+    selectedIconPath: home_active,
     pagePath: Pages.首页
   },
   {
     text: '我的',
-    iconPath: 'contact',
-    selectedIconPath: 'contact-filled',
+    iconPath: my,
+    selectedIconPath: my_active,
     pagePath: Pages.个人中心
   }
 ]);
@@ -43,7 +47,9 @@ const tabChange = (index: number) => {
     return;
   }
   tabbar(list.value[index].pagePath);
-}
+};
+
+uni.hideTabBar();
 </script>
 
 <template>
@@ -51,9 +57,7 @@ const tabChange = (index: number) => {
     <view @click="tabChange(index)" v-for="(item, index) in list" :key="index" class="t-tabbar__item"
       :class="{ 't-bar__item_on': index === current }">
       <view style="position: relative;display:inline-block;">
-        <image v-if="isHttpUrl(item.selectedIconPath)" :src="current === index ? item.selectedIconPath : item.iconPath"
-          class="t-tabbar__icon"></image>
-        <uni-icons :type="current === index ? item.selectedIconPath : item.iconPath" />
+        <image :src="current === index ? item.selectedIconPath : item.iconPath" class="t-tabbar__icon"></image>
       </view>
       <view class="t-tabbar__label">{{ item.text }}</view>
     </view>

package/template-uni-app/src/config/enum.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 14:51:02
- * @LastEditTime: 2023-07-19 12:17:58
+ * @LastEditTime: 2023-07-20 15:35:06
  * @Description:
  */
 
@@ -37,10 +37,11 @@ export enum YoungStorageKeys {
 export enum Pages {
   首页 = '/pages/index',
   个人中心 = '/pages/my',
+  测试子页面 = '/pages/demo/index',
 }
 /**
  * tabbar 页面
  */
-export const TabbarArr = [Pages.首页, Pages.个人中心] as const;
+export const TabbarArr = [Pages.首页, Pages.个人中心];
 
-export enum UIEvents { }
+export enum UIEvents {}

package/template-uni-app/src/env.d.ts

@@ -1,11 +1,11 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-19 08:41:05
- * @LastEditTime: 2023-07-19 15:46:37
+ * @LastEditTime: 2023-07-20 15:05:15
  * @Description:
  */
 /// <reference types="vite/client" />
-
+/// <reference types="@uni-helper/vite-plugin-uni-pages/client" />
 declare module '*.vue' {
   import { DefineComponent } from 'vue'
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
@@ -19,9 +19,10 @@ declare module '*.vue' {
  */
 declare interface ImportMetaEnv {
   /**
-   * 公共配置
+   * 接口是否使用自定义 loading
+   * src/components/young-loading-mini/young-loading-mini.vue
    */
-  VITE_COMMON: string;
+  VITE_CUSTOM_LOADING: boolean;
 
   /**
    * 微信小程序 appid

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

@@ -0,0 +1,24 @@
+<!--
+ * @Author: zhangyang
+ * @Date: 2023-07-20 10:55:54
+ * @LastEditTime: 2023-07-20 15:40:22
+ * @Description: todo: 默认布局，按需调整
+-->
+<script lang="ts" setup>
+const { httpLoadingEl } = storeToRefs(useHttpLoading());
+const { pagesInfo } = storeToRefs(useSystemInfo());
+
+onLoad(() => {
+  const [page] = getCurrentPages();
+
+  const pageConf = pagesInfo.value.find((p) => p.path === page.route);
+  if (pageConf && pageConf.needLogin) {
+    console.log('todo: 这个页面需要登录，进行登录条件判断');
+  }
+});
+</script>
+
+<template>
+  <young-loading-mini ref="httpLoadingEl" />
+  <slot />
+</template>

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

@@ -0,0 +1,28 @@
+<!--
+ * @Author: zhangyang
+ * @Date: 2023-07-20 11:00:42
+ * @LastEditTime: 2023-07-20 15:09:18
+ * @Description: tabbar 页面的默认布局
+-->
+<script lang="ts" setup>
+const { customBarH, safeBottom } = getNavbarHeihgt();
+const loadingEl = ref();
+
+const { httpLoadingEl } = storeToRefs(useHttpLoading());
+
+onMounted(() => {
+  setTimeout(() => {
+    loadingEl.value?.end();
+  }, 3e3);
+});
+</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>
+</template>

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

@@ -5,7 +5,6 @@
   "versionName": "1.0.0",
   "versionCode": "100",
   "transformPx": false,
-  /* 5+App特有相关 */
   "app-plus": {
     "usingComponents": true,
     "nvueStyleCompiler": "uni-app",
@@ -16,11 +15,8 @@
       "autoclose": true,
       "delay": 0
     },
-    /* 模块配置 */
     "modules": {},
-    /* 应用发布信息 */
     "distribute": {
-      /* android打包配置 */
       "android": {
         "permissions": [
           "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
@@ -40,15 +36,11 @@
           "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
         ]
       },
-      /* ios打包配置 */
       "ios": {},
-      /* SDK配置 */
       "sdkConfigs": {}
     }
   },
-  /* 快应用特有相关 */
   "quickapp": {},
-  /* 小程序特有相关 */
   "mp-weixin": {
     "appid": "",
     "setting": {
@@ -80,4 +72,4 @@
     "enable": false
   },
   "vueVersion": "3"
-}
+}

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

@@ -0,0 +1,24 @@
+<!--
+ * @Author: zhangyang
+ * @Date: 2023-07-20 15:13:57
+ * @LastEditTime: 2023-07-20 15:20:26
+ * @Description:
+-->
+<script lang="ts" setup>
+const testGet = async () => {
+  const res = await apis.get.getByUserName('BluesYoung-web');
+  console.log("🚀 ~ file: index.vue:12 ~ test ~ res:", res);
+};
+
+const testPost = async () => {
+  await apis.post.createRepo('BluesYoung-web');
+};
+</script>
+
+<template>
+  <young-navbar />
+  <h1 class="text-32">我是子页面 demo</h1>
+
+  <button @click="testGet">点我测试 Get 请求</button>
+  <button @click="testPost">点我测试 Post 请求</button>
+</template>

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

@@ -1,9 +1,16 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-18 11:23:36
- * @LastEditTime: 2023-07-19 16:50:03
+ * @LastEditTime: 2023-07-20 15:24:46
  * @Description:
 -->
+<route lang="json">
+{
+  "needLogin": true,
+  "layout": "tabbar"
+}
+</route>
+
 <script lang="ts" setup>
 const testGet = async () => {
   const res = await apis.get.getByUserName('BluesYoung-web');
@@ -13,40 +20,21 @@ const testGet = async () => {
 const testPost = async () => {
   await apis.post.createRepo('BluesYoung-web');
 };
-const navBar = getNavbarHeihgt();
-
-const loadingEl = ref();
-
-onLoad(() => {
-  uni.hideTabBar();
-});
-
-onMounted(() => {
-  setTimeout(() => {
-    loadingEl.value?.stop();
-  }, 3e3);
-});
 </script>
 
 <template>
-  <div>
-    <young-navbar isback />
-    <young-tabbar-layout :top="navBar.customBarH" bg="#F0F0F0">
-      <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>
-
-      <button @click="testGet">点我测试 Get 请求</button>
-      <button @click="testPost">点我测试 Post 请求</button>
-
-      <uni-card title="基础卡片" sub-title="副标题" extra="额外信息"
-        thumbnail="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png">
-        <text>这是一个带头像和双标题的基础卡片，此示例展示了一个完整的卡片。</text>
-      </uni-card>
-    </young-tabbar-layout>
-
-    <young-loading ref="loadingEl" />"
-  </div>
+  <young-navbar :isback="false" />
+  <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>
+
+  <button @click="testGet">点我测试 Get 请求</button>
+  <button @click="testPost">点我测试 Post 请求</button>
+
+  <uni-card title="基础卡片" sub-title="副标题" extra="额外信息"
+    thumbnail="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png" @click="to(Pages.测试子页面)">
+    <text>这是一个带头像和双标题的基础卡片，此示例展示了一个完整的卡片。</text>
+  </uni-card>
 </template>

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

@@ -1,29 +1,25 @@
 <!--
  * @Author: zhangyang
  * @Date: 2023-07-18 17:53:43
- * @LastEditTime: 2023-07-19 11:56:45
+ * @LastEditTime: 2023-07-20 11:56:29
  * @Description:
 -->
-<script lang="ts" setup>
-onLoad(() => {
-  uni.hideTabBar();
-});
-</script>
-<template>
-  <div>
-    <uni-nav-bar status-bar :border="false" title="个人中心" />
-    <young-tabbar-layout>
-      <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>
-
+<route lang="json">
+{
+  "needLogin": true,
+  "layout": "tabbar"
+}
+</route>
 
-      <uni-card title="基础卡片" sub-title="副标题" extra="额外信息"
-        thumbnail="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png">
-        <text>这是一个带头像和双标题的基础卡片，此示例展示了一个完整的卡片。</text>
-      </uni-card>
-    </young-tabbar-layout>
-  </div>
+<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>
 </template>

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

@@ -3,36 +3,39 @@
   "pages": [
     {
       "path": "pages/index",
-      "style": {
-        "navigationBarTitleText": "demo",
-        "navigationBarBackgroundColor": "#E60012",
-        "navigationBarTextStyle": "white",
-        "navigationStyle": "custom"
-      }
+      "type": "home",
+      "needLogin": true,
+      "layout": "tabbar"
     },
     {
       "path": "pages/my",
-      "style": {
-        "navigationBarTitleText": "demo",
-        "navigationBarBackgroundColor": "#E60012",
-        "navigationBarTextStyle": "white",
-        "navigationStyle": "custom"
-      }
+      "type": "page",
+      "needLogin": true,
+      "layout": "tabbar"
+    },
+    {
+      "path": "pages/demo/index",
+      "type": "page"
     }
   ],
   "tabBar": {
-    "color": "#7A7E83",
-    "selectedColor": "#3cc51f",
-    "borderStyle": "black",
+    "color": "#666",
+    "selectedColor": "#333",
+    "borderStyle": "white",
     "backgroundColor": "#ffffff",
+    "fontSize": "22rpx",
     "list": [
       {
         "pagePath": "pages/index",
-        "text": "首页"
+        "text": "首页",
+        "iconPath": "static/home.png",
+        "selectedIconPath": "static/home_active.png"
       },
       {
         "pagePath": "pages/my",
-        "text": "我的"
+        "text": "我的",
+        "iconPath": "static/my.png",
+        "selectedIconPath": "static/my_active.png"
       }
     ]
   },
@@ -41,6 +44,7 @@
     "navigationBarTitleText": "demo",
     "navigationBarTextStyle": "white",
     "navigationBarBackgroundColor": "#0D0D0D",
+    "navigationStyle": "custom",
     "backgroundColor": "#F2EAE0",
     "backgroundColorTop": "#F2EAE0",
     "backgroundColorBottom": "#F4F5F6",
@@ -59,5 +63,6 @@
       "^young-(.*)": "@/components/young-$1/young-$1.vue",
       "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
     }
-  }
+  },
+  "subPackages": []
 }

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

@@ -1,12 +1,20 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 15:20:04
- * @LastEditTime: 2023-07-18 15:20:04
+ * @LastEditTime: 2023-07-20 15:00:01
  * @Description:
  */
+import type { PageMetaDatum } from '@uni-helper/vite-plugin-uni-pages';
 import { defineStore } from 'pinia';
 
 export const useSystemInfo = defineStore('useSystemInfo', () => {
   const systemInfo = ref<UniApp.GetSystemInfoResult>();
-  return { systemInfo };
+  const pagesInfo = ref<PageMetaDatum[]>([]);
+
+  return { systemInfo, pagesInfo };
+});
+
+export const useHttpLoading = defineStore('useHttpLoading', () => {
+  const httpLoadingEl = ref();
+  return { httpLoadingEl };
 });

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

@@ -41,8 +41,9 @@ export const searchLoaction = (args: TxLocationSearch) => {
 
   return new Promise<TxLocationSearchRes[]>((resolve, reject): void => {
     uni.request({
-      url: `https://apis.map.qq.com/ws/place/v1/search?boundary=nearby(${latitude},${longitude},1000)${keyword ? `&keyword=${keyword}` : ''
-        }&page_size=${page_size}&page_index=${page_index}&key=${getMapApiKey()}`,
+      url: `https://apis.map.qq.com/ws/place/v1/search?boundary=nearby(${latitude},${longitude},1000)${
+        keyword ? `&keyword=${keyword}` : ''
+      }&page_size=${page_size}&page_index=${page_index}&key=${getMapApiKey()}`,
       success: (res) => {
         resolve((res.data as unknown as { data: TxLocationSearchRes[] }).data);
       },

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

@@ -52,12 +52,12 @@ export const getSystemInfo = () => {
         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
+          safeBottom,
         });
         _resolve(e);
       },

package/template-uni-app/tsconfig.json

@@ -7,7 +7,10 @@
 			"@/*": ["./src/*"]
 		},
 		"lib": ["esnext", "dom"],
-		"types": ["@dcloudio/types"]
+		"types": ["@dcloudio/types", "@uni-helper/uni-app-types", "@uni-helper/uni-ui-types"]
 	},
-	"include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "custom-plugins/*.ts", "auto-imports.d.ts", "components.d.ts"]
+  "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"]
 }

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

@@ -1,29 +1,26 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-18 11:03:01
- * @LastEditTime: 2023-07-19 17:50:15
+ * @LastEditTime: 2023-07-20 14:10:56
  * @Description:
  */
 import { resolve } from 'node:path';
 import { defineConfig } from 'vite';
-import type { ConfigEnv, UserConfigExport } from 'vite';
-import uni from '@dcloudio/vite-plugin-uni';
+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';
 
-/**
- * 大驼峰转中划线
- */
-function camel2kebab(str: string) {
-  return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-};
-
 // 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: {
@@ -36,16 +33,15 @@ export default ({ command, mode }: ConfigEnv) => {
       AutoComponents({
         dts: true,
         globs: ['src/components/**/*.vue'],
-        resolvers: [
-          (componentName) => {
-            if (componentName.startsWith('Uni')) {
-              const pkgName = camel2kebab(componentName);
-              return { name: 'default', from: `@dcloudio/uni-ui/lib/${pkgName}/${pkgName}.vue` };
-            }
-          }
-        ]
       }),
-      uni(),
+
+      // https://uni-helper.js.org/vite-plugin-uni-pages
+      UniPages(),
+      // https://uni-helper.js.org/vite-plugin-uni-layouts
+      UniLayouts(),
+      // https://uni-helper.js.org/vite-plugin-uni-manifest
+      UniManifest(),
+      Uni(),
       // https://github.com/antfu/unocss
       Unocss(),
 
@@ -59,10 +55,10 @@ export default ({ command, mode }: ConfigEnv) => {
           resolve(__dirname, 'src/config/**'),
           resolve(__dirname, 'src/store/**'),
           resolve(__dirname, 'src/utils/**'),
-        ]
+        ],
       }),
 
-      multiConf(mode)
+      multiConf(mode),
     ],
   });
-}
+};

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

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