create-young-proj 0.1.0 → 0.1.1

package/README.md

@@ -29,4 +29,4 @@
 
 ## template-admin-server
 
-基于 [midwayjs] 开发的后端服务程序
+基于 [midwayjs](https://www.midwayjs.org/) 开发的后端服务程序

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-young-proj",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "create project from template",
   "main": "index.mjs",
   "bin": {

package/template-vue-admin/build/custom-plugin.ts

@@ -0,0 +1,30 @@
+/*
+ * @Author: zhangyang
+ * @Date: 2023-01-10 14:43:13
+ * @LastEditTime: 2023-01-10 15:11:44
+ * @Description:
+ */
+import { networkInterfaces } from 'node:os';
+
+const virtualModuleId = 'virtual:local-server';
+const ips = networkInterfaces();
+export const localServer = `http://${ips['eth0'][0].address}:3000`;
+
+/**
+ * 获取本机 ip 地址，拼接开发时的服务地址
+ */
+export const serverPlugin = () => {
+  return {
+    name: 'local-server',
+    resolveId(id) {
+      if (id === virtualModuleId) {
+        return virtualModuleId;
+      }
+    },
+    load(id) {
+      if (id === virtualModuleId) {
+        return `export const server = '${localServer}';`;
+      }
+    },
+  };
+};

package/template-vue-admin/build/index.ts

@@ -0,0 +1,7 @@
+/*
+ * @Author: zhangyang
+ * @Date: 2023-01-10 14:46:42
+ * @LastEditTime: 2023-01-10 14:46:43
+ * @Description:
+ */
+export * from './plugins';

package/template-vue-admin/build/plugins.ts

@@ -0,0 +1,59 @@
+/*
+ * @Author: zhangyang
+ * @Date: 2023-01-10 14:26:01
+ * @LastEditTime: 2023-01-10 15:18:31
+ * @Description:
+ */
+import type { PluginOption } from 'vite';
+import { serverPlugin } from './custom-plugin';
+import vue from '@vitejs/plugin-vue';
+import vueJsx from '@vitejs/plugin-vue-jsx';
+import legacy from '@vitejs/plugin-legacy';
+import Unocss from 'unocss/vite';
+// 自动导入
+import AutoImport from 'unplugin-auto-import/vite';
+import AutoComopnents from 'unplugin-vue-components/vite';
+import { ElementPlusResolver } from 'unplugin-vue-components/resolvers';
+// 自动路由及布局
+import Pages from 'vite-plugin-pages';
+import Layouts from 'vite-plugin-vue-layouts';
+
+export { localServer } from './custom-plugin';
+
+export const usePlugins = () => {
+  return [
+    serverPlugin(),
+    vue(),
+    vueJsx(),
+    Pages({
+      extensions: ['vue', 'tsx'],
+      dirs: 'src/views',
+      exclude: ['**/components/*.{vue,tsx}', '_*'],
+    }),
+    Layouts({ defaultLayout: 'default/index' }),
+    AutoComopnents({
+      dirs: ['src/components'],
+      dts: './src/auto-components.d.ts',
+      extensions: ['vue', 'tsx'],
+      resolvers: [ElementPlusResolver()],
+    }),
+    AutoImport({
+      dts: './src/auto-imports.d.ts',
+      imports: [
+        'vue',
+        'vue-router',
+        '@vueuse/core',
+        'pinia',
+        {
+          'element-plus': ['ElMessage', 'ElMessageBox', 'ElLoadingService'],
+        },
+      ],
+    }),
+    Unocss(),
+    // 不生成同名 polyfill 文件，打包速度翻倍
+    // 如果出现兼容问题，可以删除此配置
+    legacy({
+      // renderLegacyChunks: false
+    }),
+  ] as PluginOption[];
+};

package/template-vue-admin/src/main.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-12-03 15:57:40
- * @LastEditTime: 2023-01-04 14:30:48
+ * @LastEditTime: 2023-01-10 15:09:29
  * @Description:
  */
 // polyfill
@@ -13,6 +13,7 @@ import 'uno.css';
 import 'element-plus/dist/index.css';
 
 import { createApp } from 'vue';
+import { server } from 'virtual:local-server';
 import App from './App.vue';
 
 (async () => {
@@ -23,9 +24,8 @@ import App from './App.vue';
     viteEnv = import.meta.env;
     console.log('🚀 ~ file: main.ts ~ line 19 ~ viteEnv', viteEnv);
   } else if (import.meta.env.DEV) {
-    // 开发环境，内网其他设备访问请切换为局域网 ip
-    // 端口号与环境变量的 SERVER_PORT 保持一致
-    viteEnv = await (await fetch(`http://127.0.0.1:3000/get/env`)).json();
+    // 开发环境，局域网 ip
+    viteEnv = await (await fetch(server + '/get/env')).json();
     console.log('🚀 ~ file: main.ts ~ line 24 ~ viteEnv', viteEnv);
   } else {
     // 部署环境，需要配合 nginx 使用

package/template-vue-admin/src/modules/4-auth.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-03-01 19:40:13
- * @LastEditTime: 2023-01-09 09:19:41
+ * @LastEditTime: 2023-01-11 10:32:35
  * @Description: 权限校验
  */
 import { router } from './1-router';
@@ -84,7 +84,6 @@ export const install: UserModule = (app) => {
       (await casdoorLogin(code, state)) as UserKey;
       getToken() && (await generateNavData());
       location.search = '';
-      changeTitle(to);
       return true;
     } else 
     */
@@ -99,12 +98,10 @@ export const install: UserModule = (app) => {
         await generateNavData();
         if (hasPermission(to.meta.authPath)) {
           // 拥有对应页面的权限
-          changeTitle(to);
           return true;
         }
         if (!hasPermission(to.meta.authPath)) {
           // 已登录，并且无权限
-          changeTitle(from);
           return '/403';
         }
       } else {
@@ -117,6 +114,13 @@ export const install: UserModule = (app) => {
 
   router.afterEach((to) => {
     const { addView } = useTagsStore();
+    const nav = FlatNavArr.value.find((item) => item.component === to.path);
+    if (nav && nav.title) {
+      // console.log('before: ', to.meta);
+      to.meta.title = nav.title as string;
+      // console.log('after: ', to.meta);
+    }
     addView(to);
+    changeTitle(to);
   });
 };

package/template-vue-admin/src/shims.d.ts

@@ -0,0 +1,12 @@
+/*
+ * @Author: zhangyang
+ * @Date: 2023-01-10 15:08:44
+ * @LastEditTime: 2023-01-10 15:08:44
+ * @Description: 
+ */
+declare module 'virtual:local-server' {
+  /**
+   * 本地服务地址
+   */
+  export const server: string;
+}

package/template-vue-admin/tsconfig.node.json

@@ -5,5 +5,5 @@
     "moduleResolution": "Node",
     "allowSyntheticDefaultImports": true
   },
-  "include": ["vite.config.ts"]
+  "include": ["vite.config.ts", "build/**/*.ts"]
 }

package/template-vue-admin/vite.config.ts

@@ -1,26 +1,13 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-12-03 15:57:40
- * @LastEditTime: 2023-01-05 14:14:02
+ * @LastEditTime: 2023-01-10 15:12:20
  * @Description:
  */
 import { fileURLToPath, URL } from 'node:url';
 import { defineConfig, loadEnv } from 'vite';
 import type { ConfigEnv, UserConfigExport } from 'vite';
-
-import vue from '@vitejs/plugin-vue';
-import vueJsx from '@vitejs/plugin-vue-jsx';
-import legacy from '@vitejs/plugin-legacy';
-import Unocss from 'unocss/vite';
-
-// 自动导入
-import AutoImport from 'unplugin-auto-import/vite';
-import AutoComopnents from 'unplugin-vue-components/vite';
-import { ElementPlusResolver } from 'unplugin-vue-components/resolvers';
-
-// 自动路由及布局
-import Pages from 'vite-plugin-pages';
-import Layouts from 'vite-plugin-vue-layouts';
+import { usePlugins, localServer } from './build';
 
 // https://vitejs.dev/config/
 export default ({ command, mode }: ConfigEnv): UserConfigExport => {
@@ -29,39 +16,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
   console.log('🚀 ~ file: vite.config.ts ~ line 36 ~ viteEnv', viteEnv);
   return defineConfig({
     base: './',
-    plugins: [
-      vue(),
-      vueJsx(),
-      Pages({
-        extensions: ['vue', 'tsx'],
-        dirs: 'src/views',
-        exclude: ['**/components/*.{vue,tsx}', '_*'],
-      }),
-      Layouts({ defaultLayout: 'default/index' }),
-      AutoComopnents({
-        dirs: ['src/components'],
-        dts: './src/auto-components.d.ts',
-        extensions: ['vue', 'tsx'],
-        resolvers: [ElementPlusResolver()],
-      }),
-      AutoImport({
-        dts: './src/auto-imports.d.ts',
-        imports: [
-          'vue',
-          'vue-router',
-          '@vueuse/core',
-          'pinia',
-          {
-            'element-plus': ['ElMessage', 'ElMessageBox', 'ElLoadingService'],
-          },
-        ],
-      }),
-      Unocss(),
-      legacy({
-        // 不生成同名 polyfill 文件，打包速度翻倍，如果出现兼容问题，可以删除此配置
-        // renderLegacyChunks: false
-      }),
-    ],
+    plugins: usePlugins(),
     resolve: {
       alias: {
         '@': fileURLToPath(new URL('./src', import.meta.url)),
@@ -70,7 +25,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
     server: {
       host: true,
       proxy: {
-        '/api': 'http://192.168.10.168:3000',
+        '/api': localServer,
       },
     },
   });