create-meadminjs 1.0.1 → 1.0.2

package/template/meadmin/src/configuration.ts

@@ -1,107 +1,107 @@
-import { App, Configuration, ILogger, IMidwayApplication, IMidwayContainer, Init, Inject, Logger, MidwayDecoratorService } from '@midwayjs/core';
-import * as info from '@midwayjs/info';
-import * as koa from '@midwayjs/koa';
-import * as validate from '@midwayjs/validate';
-import './helper/dotenv.js';
-// import { ReportMiddleware } from './middleware/report.middleware.js';
-import DefaultConfig from '@/config/config.default.js';
-import UnittestConfig from '@/config/config.unittest.js';
-import * as meadmin from '@meadmin/core';
-import * as viteView from '@meadmin/midway-vite-view'; //引入view组件
-import * as busboy from '@midwayjs/busboy';
-import * as cacheManager from '@midwayjs/cache-manager';
-import * as captcha from '@midwayjs/captcha';
-import * as i18n from '@midwayjs/i18n';
-import * as redis from '@midwayjs/redis';
-import * as staticFile from '@midwayjs/static-file';
-import * as swagger from '@midwayjs/swagger';
-import { RegistreDecorators } from './decorators/index.js';
-import { filters } from './filter/index.js';
-import { initLogger } from './logger.js';
-
-const registreDecorators = new RegistreDecorators();
-
-@Configuration({
-  imports: [
-    koa,
-    i18n,
-    meadmin, //必须放在swagger之前引入
-    validate,
-    {
-      component: info,
-      enabledEnvironment: ['local'],
-    },
-    {
-      component: swagger,
-      enabledEnvironment: ['local', 'dev'],
-    },
-    staticFile,
-    viteView,
-    redis,
-    cacheManager,
-    captcha,
-    busboy,
-  ],
-  importConfigs: [
-    {
-      default: DefaultConfig,
-      unittest: UnittestConfig,
-    },
-  ],
-})
-export class MainConfiguration {
-  @App('koa')
-  app: koa.Application;
-
-  @Inject()
-  decoratorService: MidwayDecoratorService;
-
-  @Logger()
-  appLogger: ILogger;
-
-  @Logger('coreLogger')
-  coreLogger: ILogger;
-
-  @Init()
-  async init() {
-    registreDecorators.decoratorService = this.decoratorService;
-    registreDecorators.init();
-  }
-
-  /**
-   * 在应用配置加载后执行
-   */
-  async onConfigLoad?(container: IMidwayContainer, app: IMidwayApplication) {
-    registreDecorators.onConfigLoad(container, app);
-  }
-
-  /**
-   * 在依赖注入容器 ready 的时候执行
-   */
-  async onReady?(container: IMidwayContainer, app: IMidwayApplication) {
-    initLogger(this.appLogger, this.coreLogger);
-    this.app.useFilter(filters);
-    registreDecorators.onReady(container, app);
-  }
-
-  /**
-   * 在应用服务启动后执行
-   */
-  async onServerReady?(container: IMidwayContainer, app: IMidwayApplication) {
-    registreDecorators.onServerReady(container, app);
-  }
-
-  /**
-   * 在应用停止的时候执行
-   */
-  async onStop?(container: IMidwayContainer, app: IMidwayApplication) {
-    registreDecorators.onStop(container, app);
-  }
-
-  /**
-   * 在健康检查时执行
-   */
-  async onHealthCheck?(container: IMidwayContainer) {
-    registreDecorators.onHealthCheck(container);
-  }
-}
+import { App, Configuration, ILogger, IMidwayApplication, IMidwayContainer, Init, Inject, Logger, MidwayDecoratorService } from '@midwayjs/core';
+import * as info from '@midwayjs/info';
+import * as koa from '@midwayjs/koa';
+import * as validate from '@midwayjs/validate';
+import './helper/dotenv.js';
+// import { ReportMiddleware } from './middleware/report.middleware.js';
+import DefaultConfig from '@/config/config.default.js';
+import UnittestConfig from '@/config/config.unittest.js';
+import * as meadmin from '@meadmin/core';
+import * as viteView from '@meadmin/midway-vite-view'; //引入view组件
+import * as busboy from '@midwayjs/busboy';
+import * as cacheManager from '@midwayjs/cache-manager';
+import * as captcha from '@midwayjs/captcha';
+import * as i18n from '@midwayjs/i18n';
+import * as redis from '@midwayjs/redis';
+import * as staticFile from '@midwayjs/static-file';
+import * as swagger from '@midwayjs/swagger';
+import { RegistreDecorators } from './decorators/index.js';
+import { filters } from './filter/index.js';
+import { initLogger } from './logger.js';
+
+const registreDecorators = new RegistreDecorators();
+
+@Configuration({
+  imports: [
+    koa,
+    i18n,
+    meadmin, //必须放在swagger之前引入
+    validate,
+    {
+      component: info,
+      enabledEnvironment: ['local'],
+    },
+    {
+      component: swagger,
+      enabledEnvironment: ['local', 'dev'],
+    },
+    staticFile,
+    viteView,
+    redis,
+    cacheManager,
+    captcha,
+    busboy,
+  ],
+  importConfigs: [
+    {
+      default: DefaultConfig,
+      unittest: UnittestConfig,
+    },
+  ],
+})
+export class MainConfiguration {
+  @App('koa')
+  app: koa.Application;
+
+  @Inject()
+  decoratorService: MidwayDecoratorService;
+
+  @Logger()
+  appLogger: ILogger;
+
+  @Logger('coreLogger')
+  coreLogger: ILogger;
+
+  @Init()
+  async init() {
+    registreDecorators.decoratorService = this.decoratorService;
+    registreDecorators.init();
+  }
+
+  /**
+   * 在应用配置加载后执行
+   */
+  async onConfigLoad?(container: IMidwayContainer, app: IMidwayApplication) {
+    registreDecorators.onConfigLoad(container, app);
+  }
+
+  /**
+   * 在依赖注入容器 ready 的时候执行
+   */
+  async onReady?(container: IMidwayContainer, app: IMidwayApplication) {
+    initLogger(this.appLogger, this.coreLogger);
+    this.app.useFilter(filters);
+    registreDecorators.onReady(container, app);
+  }
+
+  /**
+   * 在应用服务启动后执行
+   */
+  async onServerReady?(container: IMidwayContainer, app: IMidwayApplication) {
+    registreDecorators.onServerReady(container, app);
+  }
+
+  /**
+   * 在应用停止的时候执行
+   */
+  async onStop?(container: IMidwayContainer, app: IMidwayApplication) {
+    registreDecorators.onStop(container, app);
+  }
+
+  /**
+   * 在健康检查时执行
+   */
+  async onHealthCheck?(container: IMidwayContainer) {
+    registreDecorators.onHealthCheck(container);
+  }
+}

package/template/meadmin/src/entities/abstract/base.entity.ts

@@ -1,5 +1,5 @@
 import { ApiPropertyRule } from '@/decorators/index.js';
-import { ctx } from '@meadmin/core';
+import { getContext } from '@meadmin/core';
 import { BulkCreateOptions, InferAttributes, InferCreationAttributes, InstanceUpdateOptions, Model, ModelStatic, UpdateOptions } from '@sequelize/core';
 import { AfterBulkUpdate, Attribute, BeforeBulkCreate, BeforeCreate, BeforeUpdate, CreatedAt, Table, UpdatedAt } from '@sequelize/core/decorators-legacy';
 
@@ -18,6 +18,7 @@ export class BaseModel<M extends Model<any, any>> extends Model<InferAttributes<
 
   @BeforeCreate()
   static async setCreatedId(info: BaseModel<any>, options: InstanceUpdateOptions<BaseModel<any>>) {
+    const ctx = getContext();
     if (ctx?.adminInfo && info.modelDefinition.attributes.has('createdAdminId')) {
       //设置创建管理员Id
       (info as any).createdAdminId = ctx.adminInfo.id;
@@ -26,10 +27,19 @@ export class BaseModel<M extends Model<any, any>> extends Model<InferAttributes<
         (info as any).updatedAdminId = ctx.adminInfo.id;
       }
     }
+    if (ctx?.userInfo && info.modelDefinition.attributes.has('createdUserId')) {
+      //设置创建用户Id
+      (info as any).createdUserId = ctx.userInfo.id;
+      if (ctx?.userInfo && info.modelDefinition.attributes.has('updatedUserId')) {
+        //设置更新用户Id
+        (info as any).updatedUserId = ctx.userInfo.id;
+      }
+    }
   }
 
   @BeforeBulkCreate()
   static async setCreatedIdBulk(instances: BaseModel<any>[], options: BulkCreateOptions<BaseModel<any>> & { model: ModelStatic<BaseModel<any>> }) {
+    const ctx = getContext();
     if (ctx?.adminInfo && options.model.modelDefinition.attributes.has('createdAdminId')) {
       //设置创建管理员Id
       instances.forEach((instance) => {
@@ -42,18 +52,36 @@ export class BaseModel<M extends Model<any, any>> extends Model<InferAttributes<
         });
       }
     }
+    if (ctx?.userInfo && options.model.modelDefinition.attributes.has('createdUserId')) {
+      //设置创建用户Id
+      instances.forEach((instance) => {
+        (instance as any).createdUserId = ctx.userInfo.id;
+      });
+      if (options.model.modelDefinition.attributes.has('updatedUserId')) {
+        //设置更新用户Id
+        instances.forEach((instance) => {
+          (instance as any).updatedUserId = ctx.userInfo.id;
+        });
+      }
+    }
   }
 
   @BeforeUpdate()
   static async setUpdatedId(info: BaseModel<any>, options: InstanceUpdateOptions<BaseModel<any>>) {
+    const ctx = getContext();
     if (ctx?.adminInfo && info.modelDefinition.attributes.has('updatedAdminId')) {
       //设置更新管理员Id
       (info as any).updatedAdminId = ctx.adminInfo.id;
     }
+    if (ctx?.userInfo && info.modelDefinition.attributes.has('updatedUserId')) {
+      //设置更新用户Id
+      (info as any).updatedUserId = ctx.userInfo.id;
+    }
   }
 
   @AfterBulkUpdate()
   static async setUpdatedIdBulk(options: UpdateOptions<BaseModel<any>> & { model: ModelStatic<BaseModel<any>> }) {
+    const ctx = getContext();
     if (ctx?.adminInfo && options.model.modelDefinition.attributes.has('updatedAdminId')) {
       //设置更新管理员Id
       await options.model.update(
@@ -65,5 +93,16 @@ export class BaseModel<M extends Model<any, any>> extends Model<InferAttributes<
         },
       );
     }
+    if (ctx?.userInfo && options.model.modelDefinition.attributes.has('updatedUserId')) {
+      //设置更新用户Id
+      await options.model.update(
+        { updatedUserId: ctx.userInfo.id },
+        {
+          where: options.where,
+          transaction: options.transaction,
+          hooks: false,
+        },
+      );
+    }
   }
 }

package/template/meadmin/src/fileManage/storage/local.ts

@@ -1,93 +1,93 @@
-import { UploadParam, UploadResult, UpStorageInterface } from '@/types/fileManage.js';
-import { app } from '@meadmin/core';
-import { UploadOptions, UploadStreamFileInfo } from '@midwayjs/busboy';
-import { appendFileSync, createReadStream, createWriteStream, existsSync, mkdirSync, renameSync, rmSync, statSync } from 'node:fs';
-import { relative, resolve } from 'node:path';
-import { BaseStorage } from './base.js';
-export class LocalStorage extends BaseStorage implements UpStorageInterface {
-  get path() {
-    return '/' + this.model + '/';
-  }
-  //保存文件
-  async saveFie({ filename, data }: UploadStreamFileInfo, md5: string, savePath: string, tmpPath: string) {
-    const suffix = filename.substring(filename.lastIndexOf('.')); //后缀带着.
-    const tmpFilePath = resolve(tmpPath, '__tmp__' + process.pid + '__' + md5 + suffix); //临时文件带上进程id防止重复
-    const saveFilePath = resolve(savePath, md5 + suffix);
-    const saveStat = statSync(saveFilePath, { throwIfNoEntry: false });
-    if (saveStat) {
-      return { size: saveStat.size, path: saveFilePath }; //已存在无需上传
-    }
-    return await new Promise<{ size: number; path: string }>((reslove, reject) => {
-      const stream = createWriteStream(tmpFilePath);
-      stream.on('close', () => {
-        renameSync(tmpFilePath, saveFilePath);
-        reslove({ size: statSync(saveFilePath, { throwIfNoEntry: true }).size, path: saveFilePath });
-      });
-      stream.on('error', (e) => {
-        reject(e);
-      });
-      data.pipe(stream);
-    });
-  }
-  async getFilePath(path: string) {
-    return resolve((app.getConfig('busboy') as UploadOptions).upDir + this.path, path);
-  }
-  async getFileReadSteam(path: string) {
-    return createReadStream(await this.getFilePath(path));
-  }
-  async upload(file: UploadStreamFileInfo, params: UploadParam) {
-    const fileUpconfig = app.getConfig('busboy') as UploadOptions;
-    const uploadResult = { storage: 'local' } as UploadResult;
-    uploadResult.md5 = params.md5;
-    //只处理1个文件上传
-    const { filename, mimeType } = file;
-    if (params.chunk !== '1') {
-      //非分片上传
-      const res = await this.saveFie(file, params.md5, fileUpconfig.upDir + this.path, fileUpconfig.tmpdir);
-      uploadResult.size = res.size;
-      uploadResult.path = relative(fileUpconfig.upDir + this.path, res.path);
-    } else {
-      //分片上传
-      const suffix = filename.substring(filename.lastIndexOf('.')); //后缀带着.
-      const saveFilePath = resolve(fileUpconfig.upDir + this.path, params.md5 + suffix);
-      const saveStat = statSync(saveFilePath, { throwIfNoEntry: false });
-      if (saveStat) {
-        //已存在无需上传
-        uploadResult.size = saveStat.size;
-        uploadResult.path = relative(fileUpconfig.upDir + this.path, saveFilePath);
-      } else {
-        if (params.start === undefined || params.over === undefined || params.chunkMd5 === undefined) {
-          throw new Error('分片上传时，start、over、chunkMd5必须有值');
-        }
-        const path = resolve(fileUpconfig.tmpdir, params.md5 + '/');
-        if (!existsSync(path)) {
-          mkdirSync(path);
-        }
-        const res = await this.saveFie(file, params.chunkMd5, path, path);
-        const tmpFilePath = resolve(fileUpconfig.tmpdir, '__tmp__chunk_all__' + process.pid + '__' + params.md5 + suffix); //临时文件带上进程id防止重复
-        appendFileSync(tmpFilePath, ''); //追加空串确保文件存在
-        await new Promise<void>((resolve, reject) => {
-          const fsStream = createWriteStream(tmpFilePath, { flags: 'r+', start: +params.start, autoClose: true });
-          fsStream.on('close', () => {
-            resolve();
-          });
-          fsStream.on('error', (e) => {
-            reject(e);
-          });
-          createReadStream(res.path).pipe(fsStream);
-        });
-        if (params.over !== '1') {
-          //未结束直接返回
-          return null;
-        }
-        renameSync(tmpFilePath, saveFilePath);
-        rmSync(path, { force: true, recursive: true });
-        uploadResult.size = statSync(saveFilePath, { throwIfNoEntry: true }).size;
-        uploadResult.path = relative(fileUpconfig.upDir + this.path, saveFilePath);
-      }
-    }
-    uploadResult.name = params.name || filename;
-    uploadResult.mimeType = mimeType;
-    return uploadResult;
-  }
-}
+import { UploadParam, UploadResult, UpStorageInterface } from '@/types/fileManage.js';
+import { app } from '@meadmin/core';
+import { UploadOptions, UploadStreamFileInfo } from '@midwayjs/busboy';
+import { appendFileSync, createReadStream, createWriteStream, existsSync, mkdirSync, renameSync, rmSync, statSync } from 'node:fs';
+import { relative, resolve } from 'node:path';
+import { BaseStorage } from './base.js';
+export class LocalStorage extends BaseStorage implements UpStorageInterface {
+  get path() {
+    return '/' + this.model + '/';
+  }
+  //保存文件
+  async saveFie({ filename, data }: UploadStreamFileInfo, md5: string, savePath: string, tmpPath: string) {
+    const suffix = filename.substring(filename.lastIndexOf('.')); //后缀带着.
+    const tmpFilePath = resolve(tmpPath, '__tmp__' + process.pid + '__' + md5 + suffix); //临时文件带上进程id防止重复
+    const saveFilePath = resolve(savePath, md5 + suffix);
+    const saveStat = statSync(saveFilePath, { throwIfNoEntry: false });
+    if (saveStat) {
+      return { size: saveStat.size, path: saveFilePath }; //已存在无需上传
+    }
+    return await new Promise<{ size: number; path: string }>((reslove, reject) => {
+      const stream = createWriteStream(tmpFilePath);
+      stream.on('close', () => {
+        renameSync(tmpFilePath, saveFilePath);
+        reslove({ size: statSync(saveFilePath, { throwIfNoEntry: true }).size, path: saveFilePath });
+      });
+      stream.on('error', (e) => {
+        reject(e);
+      });
+      data.pipe(stream);
+    });
+  }
+  async getFilePath(path: string) {
+    return resolve((app.getConfig('busboy') as UploadOptions).upDir + this.path, path);
+  }
+  async getFileReadSteam(path: string) {
+    return createReadStream(await this.getFilePath(path));
+  }
+  async upload(file: UploadStreamFileInfo, params: UploadParam) {
+    const fileUpconfig = app.getConfig('busboy') as UploadOptions;
+    const uploadResult = { storage: 'local' } as UploadResult;
+    uploadResult.md5 = params.md5;
+    //只处理1个文件上传
+    const { filename, mimeType } = file;
+    if (params.chunk !== '1') {
+      //非分片上传
+      const res = await this.saveFie(file, params.md5, fileUpconfig.upDir + this.path, fileUpconfig.tmpdir);
+      uploadResult.size = res.size;
+      uploadResult.path = relative(fileUpconfig.upDir + this.path, res.path);
+    } else {
+      //分片上传
+      const suffix = filename.substring(filename.lastIndexOf('.')); //后缀带着.
+      const saveFilePath = resolve(fileUpconfig.upDir + this.path, params.md5 + suffix);
+      const saveStat = statSync(saveFilePath, { throwIfNoEntry: false });
+      if (saveStat) {
+        //已存在无需上传
+        uploadResult.size = saveStat.size;
+        uploadResult.path = relative(fileUpconfig.upDir + this.path, saveFilePath);
+      } else {
+        if (params.start === undefined || params.over === undefined || params.chunkMd5 === undefined) {
+          throw new Error('分片上传时，start、over、chunkMd5必须有值');
+        }
+        const path = resolve(fileUpconfig.tmpdir, params.md5 + '/');
+        if (!existsSync(path)) {
+          mkdirSync(path);
+        }
+        const res = await this.saveFie(file, params.chunkMd5, path, path);
+        const tmpFilePath = resolve(fileUpconfig.tmpdir, '__tmp__chunk_all__' + process.pid + '__' + params.md5 + suffix); //临时文件带上进程id防止重复
+        appendFileSync(tmpFilePath, ''); //追加空串确保文件存在
+        await new Promise<void>((resolve, reject) => {
+          const fsStream = createWriteStream(tmpFilePath, { flags: 'r+', start: +params.start, autoClose: true });
+          fsStream.on('close', () => {
+            resolve();
+          });
+          fsStream.on('error', (e) => {
+            reject(e);
+          });
+          createReadStream(res.path).pipe(fsStream);
+        });
+        if (params.over !== '1') {
+          //未结束直接返回
+          return null;
+        }
+        renameSync(tmpFilePath, saveFilePath);
+        rmSync(path, { force: true, recursive: true });
+        uploadResult.size = statSync(saveFilePath, { throwIfNoEntry: true }).size;
+        uploadResult.path = relative(fileUpconfig.upDir + this.path, saveFilePath);
+      }
+    }
+    uploadResult.name = params.name || filename;
+    uploadResult.mimeType = mimeType;
+    return uploadResult;
+  }
+}

package/template/meadmin/view/admin/src/components/meVxeTable/index.vue

@@ -9,7 +9,7 @@
           <el-button v-if="vnodeProps?.onRefresh" @click="$emit('refresh')">
             <mel-icon-refresh />
           </el-button>
-          <el-button v-if="vnodeProps?.onAdd" type="primary" @click="$emit('add')">
+          <el-button v-if="onAdd" type="primary" @click="onAdd()">
             <mel-icon-plus />
           </el-button>
           <slot name="buttons"></slot>
@@ -126,11 +126,11 @@ const props = {
     type: Boolean,
     default: true,
   },
+  onAdd: Function as PropType<() => void>,
 };
 const emits = ['quickSearch', 'refresh', 'add', 'update:quickSearch'] as unknown as {
   quickSearch: (searchText: string) => void;
   refresh: () => void;
-  add: () => void;
   ['update:quickSearch']: (searchText: string) => void;
 } & Required<VxeTableListeners>;
 export default defineComponent({

package/template/meadmin/view/admin/src/config/login.ts

@@ -1,5 +1,5 @@
 export default {
   tokenName: 'auth-token', // cookie中存储的token key
-  tokenExpires: 7, // token 过期时间
+  tokenExpires: 6 / 24, // token 过期时间(天)
   tokenDomain: typeof window === 'undefined' ? '' : window.location.hostname, // token 存储cookie域名
 };

package/template/meadmin/view/admin/src/layout/components/header/components/topBar/components/right/components/user.vue

@@ -11,17 +11,12 @@
             {{ $t('首页') }}
           </el-dropdown-item>
         </router-link>
-        <a href="https://github.com/meadmin-cn/meadmin-template">
+        <a target="_blank" href="https://github.com/meadmin-cn/meadmin">
           <el-dropdown-item>
             {{ $t('Github') }}
           </el-dropdown-item>
         </a>
-        <a href="https://gitee.com/meadmin-cn/meadmin-template">
-          <el-dropdown-item>
-            {{ $t('Gitee') }}
-          </el-dropdown-item>
-        </a>
-        <a href="https://meadmin-cn.github.io/meadmin-template-doc/">
+        <a target="_blank" href="https://www.meadmin.cn/">
           <el-dropdown-item>
             {{ $t('文档') }}
           </el-dropdown-item>

package/template/meadmin/view/index/src/app.ts

@@ -1,39 +1,39 @@
-import '@/styles/index.scss';
-import nProgress from 'nprogress';
-import { App } from 'vue';
-import { initVxeTable } from './components/meVxeTable/install.js';
-import { event, mitter } from './event';
-import { installIcon } from './icons/index.js';
-import { setupRouterGuard } from './router/guard/index.js';
-import { installRoute } from './router/index.js';
-import { installStore } from './store/index.js';
-export const ssrVersionKey = Symbol('ssrVersionKey');
-export async function bootscrapt(app: App, ssrVersion: string = '') {
-  app.config.globalProperties.$start = true;
-  if (import.meta.env.SSR) {
-    app.config.globalProperties.$ssrVersion = ssrVersion;
-  } else {
-    app.config.globalProperties.$ssrVersion = window.__ssrVersion ?? '';
-  }
-  app.provide(ssrVersionKey, app.config.globalProperties.$ssrVersion);
-  const router = installRoute();
-  app.config.globalProperties.$router = router;
-  const store = await installStore(app);
-  app.use(router);
-  setupRouterGuard(router, store);
-  initVxeTable(app);
-  installIcon(app);
-  if (!import.meta.env.SSR) {
-    window.addEventListener('resize', () => mitter.emit(event.RESIZE));
-    // 进度条配置
-    nProgress.configure({
-      showSpinner: false,
-    });
-    if (window.__pinia) {
-      store.state.value = window.__pinia;
-    }
-  }
-  await Promise.allSettled(mitter.emit(event.START, app));
-  mitter.emit(event.READY, app);
-  return { router, store, app };
-}
+import '@/styles/index.scss';
+import nProgress from 'nprogress';
+import { App } from 'vue';
+import { initVxeTable } from './components/meVxeTable/install.js';
+import { event, mitter } from './event';
+import { installIcon } from './icons/index.js';
+import { setupRouterGuard } from './router/guard/index.js';
+import { installRoute } from './router/index.js';
+import { installStore } from './store/index.js';
+export const ssrVersionKey = Symbol('ssrVersionKey');
+export async function bootscrapt(app: App, ssrVersion: string = '') {
+  app.config.globalProperties.$start = true;
+  if (import.meta.env.SSR) {
+    app.config.globalProperties.$ssrVersion = ssrVersion;
+  } else {
+    app.config.globalProperties.$ssrVersion = window.__ssrVersion ?? '';
+  }
+  app.provide(ssrVersionKey, app.config.globalProperties.$ssrVersion);
+  const router = installRoute();
+  app.config.globalProperties.$router = router;
+  const store = await installStore(app);
+  app.use(router);
+  setupRouterGuard(router, store);
+  initVxeTable(app);
+  installIcon(app);
+  if (!import.meta.env.SSR) {
+    window.addEventListener('resize', () => mitter.emit(event.RESIZE));
+    // 进度条配置
+    nProgress.configure({
+      showSpinner: false,
+    });
+    if (window.__pinia) {
+      store.state.value = window.__pinia;
+    }
+  }
+  await Promise.allSettled(mitter.emit(event.START, app));
+  mitter.emit(event.READY, app);
+  return { router, store, app };
+}

package/template/meadmin/view/index/src/components/meDialog/index.vue

@@ -34,7 +34,9 @@ export default defineComponent({
       async () => {
         if (elDialogRef.value?.dialogContentRef && props.full) {
           await nextTick();
-          resetWH = minMax(elDialogRef.value!.dialogContentRef.$el)?.resetWH;
+          if (!import.meta.env.SSR) {
+            resetWH = minMax(elDialogRef.value!.dialogContentRef.$el)?.resetWH;
+          }
         }
       },
       { immediate: true },

package/template/meadmin/view/index/src/components/meVxeTable/index.vue

@@ -9,7 +9,7 @@
           <el-button v-if="vnodeProps?.onRefresh" @click="$emit('refresh')">
             <mel-icon-refresh />
           </el-button>
-          <el-button v-if="vnodeProps?.onAdd" type="primary" @click="$emit('add')">
+          <el-button v-if="onAdd" type="primary" @click="onAdd()">
             <mel-icon-plus />
           </el-button>
           <slot name="buttons"></slot>
@@ -125,11 +125,11 @@ const props = {
     type: Boolean,
     default: true,
   },
+  onAdd: Function as PropType<() => void>,
 };
 const emits = ['quickSearch', 'refresh', 'add', 'update:quickSearch'] as unknown as {
   quickSearch: (searchText: string) => void;
   refresh: () => void;
-  add: () => void;
   ['update:quickSearch']: (searchText: string) => void;
 } & Required<VxeTableListeners>;
 export default defineComponent({