@meadmin/cli 1.3.3 → 1.3.5

package/dist/commanders/addon.d.ts

@@ -1,2 +1,2 @@
 import { Command } from 'commander';
-export declare const addoonInit: (program: Command) => void;
+export declare const addonInit: (program: Command) => void;

package/dist/commanders/addon.js

@@ -68,7 +68,7 @@ const rmAddon = async (file, dbConfig, name, options) => {
         }
     }
 };
-export const addoonInit = (program) => {
+export const addonInit = (program) => {
     program
         .command('addon')
         .description('安装插件')
@@ -180,4 +180,4 @@ export const addoonInit = (program) => {
         }
     });
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"addon.js","sourceRoot":"","sources":["../../src/commanders/addon.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"addon.js","sourceRoot":"","sources":["../../src/commanders/addon.ts"],"names":[],"mappings":"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"}

package/dist/commanders/compress.d.ts

@@ -0,0 +1,2 @@
+import { Command } from 'commander';
+export declare const compressInit: (program: Command) => void;

package/dist/commanders/compress.js

@@ -0,0 +1,33 @@
+import dayjs from 'dayjs';
+import { mkdirSync, rmSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { copyFile, copyPath, zipFolderAsyncOptimized } from '../utils/file.js';
+import { Log } from '../utils/log.js';
+export const compressInit = (program) => {
+    program
+        .command('compress')
+        .description('归档部署文件')
+        .option('-c, --config <char>', '配置文件', 'compose.config.js')
+        .action(async (options) => {
+        const copyFiles = (await import(pathToFileURL(resolve(process.cwd(), options.config)).href)).default;
+        const name = 'dist_' + dayjs().format('YYYYMMDDHHmmss');
+        const fromPath = process.cwd();
+        const toPath = process.cwd() + '/' + name;
+        mkdirSync(toPath);
+        Log.log('正在从源文件夹复制文件到临时文件夹:' + toPath);
+        await Promise.all(Object.keys(copyFiles).map(async (key) => {
+            if (key.endsWith('/')) {
+                await copyPath(resolve(fromPath, key), resolve(toPath, key), '', copyFiles[key].ignore || [], copyFiles[key].fileSetFunction, false);
+            }
+            else {
+                await copyFile(resolve(fromPath, key), resolve(toPath, key), typeof copyFiles[key] === 'function' ? copyFiles[key] : undefined, false);
+            }
+        }));
+        Log.log('正在生成压缩文件....');
+        await zipFolderAsyncOptimized(toPath, toPath + '.zip');
+        rmSync(toPath, { recursive: true, force: true });
+        Log.success('部署文件归档完成，文件地址为：' + toPath + '.zip ');
+    });
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHJlc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZGVycy9jb21wcmVzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDMUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsTUFBTSxTQUFTLENBQUM7QUFDNUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNwQyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLHVCQUF1QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDL0UsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3RDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBRyxDQUFDLE9BQWdCLEVBQUUsRUFBRTtJQUMvQyxPQUFPO1NBQ0osT0FBTyxDQUFDLFVBQVUsQ0FBQztTQUNuQixXQUFXLENBQUMsUUFBUSxDQUFDO1NBQ3JCLE1BQU0sQ0FBQyxxQkFBcUIsRUFBRSxNQUFNLEVBQUUsbUJBQW1CLENBQUM7U0FDMUQsTUFBTSxDQUFDLEtBQUssRUFBRSxPQUEyQixFQUFFLEVBQUU7UUFDNUMsTUFBTSxTQUFTLEdBQUcsQ0FBQyxNQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQztRQUNyRyxNQUFNLElBQUksR0FBRyxPQUFPLEdBQUcsS0FBSyxFQUFFLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDeEQsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQy9CLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDO1FBQzFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNsQixHQUFHLENBQUMsR0FBRyxDQUFDLG9CQUFvQixHQUFHLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FDZixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEVBQUU7WUFDdkMsSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7Z0JBQ3RCLE1BQU0sUUFBUSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsR0FBRyxDQUFDLEVBQUUsT0FBTyxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sSUFBSSxFQUFFLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLGVBQWUsRUFBRSxLQUFLLENBQUMsQ0FBQztZQUN2SSxDQUFDO2lCQUFNLENBQUM7Z0JBQ04sTUFBTSxRQUFRLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsRUFBRSxPQUFPLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQU8sU0FBUyxDQUFDLEdBQUcsQ0FBQyxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDekksQ0FBQztRQUNILENBQUMsQ0FBQyxDQUNILENBQUM7UUFFRixHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQ3hCLE1BQU0sdUJBQXVCLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxNQUFNLENBQUMsQ0FBQztRQUN2RCxNQUFNLENBQUMsTUFBTSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUNqRCxHQUFHLENBQUMsT0FBTyxDQUFDLGlCQUFpQixHQUFHLE1BQU0sR0FBRyxPQUFPLENBQUMsQ0FBQztJQUNwRCxDQUFDLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQyJ9

package/dist/commanders/crud.js

@@ -211,9 +211,8 @@ function tableInfo(entityName, noBelongs = false) {
             }
         }
         const noSearchAttributes = [
-            ...Object.keys(modelDefinition.associations), //关联key
-            ...modelDefinition.virtualAttributeNames, //虚拟属性 
-            ...modelDefinition.readOnlyAttributeNames, //只读属性
+            ...Object.keys(modelDefinition.associations).filter((v) => !v.endsWith(modelDefinition.options.name.plural) && !v.endsWith(modelDefinition.options.name.singular)), //关联key
+            ...modelDefinition.virtualAttributeNames, //虚拟属性
         ]; //不需要搜索的字段
         tableInfos[entityName] = {
             entityName,
@@ -414,6 +413,7 @@ async function setMenu(model, namePath, sequelize) {
                 defaults: {
                     title: menuTitle,
                     menuType: 1, //目录
+                    icon: 'MelIconList',
                     orderNum: 99,
                     path: '/' + paths.join('/'),
                     parentId,
@@ -428,6 +428,7 @@ async function setMenu(model, namePath, sequelize) {
                 defaults: {
                     title: menuTitle,
                     menuType: 2, //菜单
+                    icon: 'MelIconList',
                     orderNum: 99,
                     path: '/' + paths.join('/'),
                     component: (replaceNames.addonsPath ? replaceNames.addonsPath + 'views/' + namePath : namePath) + '/index',
@@ -617,4 +618,4 @@ export const crudInit = (program) => {
         Log.success(entityFileName + ' crud创建完成');
     });
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"crud.js","sourceRoot":"","sources":["../../src/commanders/crud.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"crud.js","sourceRoot":"","sources":["../../src/commanders/crud.ts"],"names":[],"mappings":"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"}

package/dist/commanders/index.js

@@ -1,13 +1,15 @@
 import { setEnv } from '../utils/env.js';
-import { addoonInit } from './addon.js';
+import { addonInit } from './addon.js';
 import { crudInit } from './crud.js';
 import { syncInit } from './sync.js';
+import { compressInit } from './compress.js';
 export const init = (program) => {
     program.option('-m <char>', 'env环境变量').hook('preAction', (thisCommand) => {
         setEnv(thisCommand.opts().m);
     });
     syncInit(program);
     crudInit(program);
-    addoonInit(program);
+    addonInit(program);
+    compressInit(program);
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUN4QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDckMsTUFBTSxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsT0FBZ0IsRUFBRSxFQUFFO0lBQ3ZDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFXLEVBQUUsRUFBRTtRQUN2RSxNQUFNLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQy9CLENBQUMsQ0FBQyxDQUFDO0lBQ0gsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2xCLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNsQixVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDdEIsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUN2QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDckMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUM3QyxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQUcsQ0FBQyxPQUFnQixFQUFFLEVBQUU7SUFDdkMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFO1FBQ3ZFLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDL0IsQ0FBQyxDQUFDLENBQUM7SUFDSCxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbEIsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2xCLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNuQixZQUFZLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDeEIsQ0FBQyxDQUFDIn0=

package/dist/utils/file.d.ts

@@ -1,3 +1,4 @@
+import { type DeflateOptions } from 'fflate';
 import { WriteFileOptions } from 'node:fs';
 /**
  * 写入文件【当文件所在文件夹不存在时会递归创建】
@@ -26,7 +27,7 @@ export declare function encodePackageFileName(file: string, isEncodePackage: boo
  * @param isEncodeFileName
  * @returns
  */
-export declare function copyFile(fromFile: string, toFile: string, fileSetFunction?: (content: string) => string, isEncodePackage?: boolean): Promise<boolean | void>;
+export declare function copyFile(fromFile: string, toFile: string, fileSetFunction?: (content: string) => string | Promise<string>, isEncodePackage?: boolean): Promise<boolean | void>;
 /**
  * copy 文件夹
  * @param pathFile
@@ -37,7 +38,7 @@ export declare function copyFile(fromFile: string, toFile: string, fileSetFuncti
  * @param isEncodeFileName
  * @returns
  */
-export declare function copyPath(pathFile: string, toPath: string, relativePath?: string, ignoreFile?: Array<string | RegExp>, fileSetFunctions?: Record<string, (content: string) => string>, isEncodePackage?: boolean): Promise<(boolean | void)[] | undefined>;
+export declare function copyPath(pathFile: string, toPath: string, relativePath?: string, ignoreFile?: Array<string | RegExp>, fileSetFunctions?: Record<string, (content: string) => string | Promise<string>>, isEncodePackage?: boolean): Promise<(boolean | void)[] | undefined>;
 /**
  * 检测文件夹文件是否存在
  * @param pathFile
@@ -47,3 +48,17 @@ export declare function copyPath(pathFile: string, toPath: string, relativePath?
  * @returns
  */
 export declare function checkPathFile(pathFile: string, toPath: string, relativePath?: string, hasFiles?: string[]): string[];
+/**
+ * 异步地将指定文件夹压缩为 ZIP 文件，使用流式 API 以优化性能和内存使用。
+ *
+ * 此函数使用 fflate 库的 Zip 和 AsyncZipDeflate 类来流式构建 ZIP 归档。
+ * 它会启动一个后台线程池来并行压缩多个文件，从而提高效率，尤其是在处理多个大文件时。
+ * 文件内容通过流的方式读取和处理，避免一次性将所有文件加载到内存。
+ *
+ * @param {string} folderPath - 要压缩的源文件夹的路径。
+ * @param {string} outputPath - 输出 ZIP 文件的目标路径。
+ * @param {ZipOptions} [globalOptions={ level: 6 }] - 应用于所有文件的全局压缩选项。
+ * @returns {Promise<void>} 一个 Promise，当 ZIP 文件成功写入磁盘时 resolve，
+ *                          如果过程中发生错误则 reject。
+ */
+export declare function zipFolderAsyncOptimized(folderPath: string, outputPath: string, globalOptions?: DeflateOptions): Promise<void>;

package/dist/utils/file.js

@@ -1,5 +1,6 @@
-import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { AsyncZipDeflate, Zip } from 'fflate';
+import { cpSync, createReadStream, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs';
+import { dirname, join, relative, resolve } from 'node:path';
 /**
  * 写入文件【当文件所在文件夹不存在时会递归创建】
  * @param filePath
@@ -141,4 +142,114 @@ export function checkPathFile(pathFile, toPath, relativePath = '', hasFiles = []
     });
     return hasFiles;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9maWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxXQUFXLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ3BILE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNuRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxRQUFnQixFQUFFLE9BQWUsRUFBRSxPQUEwQjtJQUNsRyxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDL0IsU0FBUyxDQUFDLElBQUksRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ3JDLGFBQWEsQ0FBQyxRQUFRLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzFDLE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVEOzs7R0FHRztBQUNILE1BQU0sVUFBVSxXQUFXLENBQUMsUUFBZ0I7SUFDMUMsSUFBSSxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztRQUN6QixNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNyRCxDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLHFCQUFxQixDQUFDLElBQVksRUFBRSxlQUF3QjtJQUMxRSxJQUFJLGVBQWUsRUFBRSxDQUFDO1FBQ3BCLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsRUFBRSxDQUFDO1lBQ2xDLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUUsc0JB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
+/**
+ * 异步地将指定文件夹压缩为 ZIP 文件，使用流式 API 以优化性能和内存使用。
+ *
+ * 此函数使用 fflate 库的 Zip 和 AsyncZipDeflate 类来流式构建 ZIP 归档。
+ * 它会启动一个后台线程池来并行压缩多个文件，从而提高效率，尤其是在处理多个大文件时。
+ * 文件内容通过流的方式读取和处理，避免一次性将所有文件加载到内存。
+ *
+ * @param {string} folderPath - 要压缩的源文件夹的路径。
+ * @param {string} outputPath - 输出 ZIP 文件的目标路径。
+ * @param {ZipOptions} [globalOptions={ level: 6 }] - 应用于所有文件的全局压缩选项。
+ * @returns {Promise<void>} 一个 Promise，当 ZIP 文件成功写入磁盘时 resolve，
+ *                          如果过程中发生错误则 reject。
+ */
+export async function zipFolderAsyncOptimized(folderPath, outputPath, globalOptions = { level: 6 }) {
+    //开始优化压缩文件夹: ${folderPath} -> ${outputPath}`;
+    // 获取文件列表的辅助函数
+    function getAllFiles(dirPath, arrayOfFiles = []) {
+        const files = readdirSync(dirPath);
+        files.forEach((file) => {
+            const filePath = join(dirPath, file);
+            if (statSync(filePath).isDirectory()) {
+                getAllFiles(filePath, arrayOfFiles);
+            }
+            else {
+                arrayOfFiles.push(filePath);
+            }
+        });
+        return arrayOfFiles;
+    }
+    const filePaths = getAllFiles(folderPath);
+    // console.log(`找到 ${filePaths.length} 个文件进行压缩。`);
+    return new Promise((resolve, reject) => {
+        // 1. 创建主 ZIP 流实例
+        const zipStream = new Zip();
+        // 用于收集最终 ZIP 文件数据的数组
+        const zipChunks = [];
+        // 2. 设置 ZIP 流的数据处理函数
+        zipStream.ondata = (err, chunk, final) => {
+            if (err) {
+                // console.error("ZIP 流处理出错:", err);
+                // 如果出现错误，终止 ZIP 流并拒绝 Promise
+                zipStream.terminate();
+                reject(err);
+                return;
+            }
+            // 将接收到的数据块添加到数组中
+            zipChunks.push(chunk);
+            if (final) {
+                // 当收到最后一个数据块时，合并所有块并写入文件
+                // console.log("所有 ZIP 数据块接收完毕，正在写入文件...");
+                try {
+                    const fullZipData = new Uint8Array(zipChunks.reduce((acc, chunk) => acc + chunk.length, 0));
+                    let offset = 0;
+                    for (const chunk of zipChunks) {
+                        fullZipData.set(chunk, offset);
+                        offset += chunk.length;
+                    }
+                    writeFileSync(outputPath, fullZipData);
+                    resolve(); // 压缩成功
+                }
+                catch (writeErr) {
+                    reject(writeErr instanceof Error ? writeErr : new Error(String(writeErr)));
+                }
+            }
+        };
+        // 3. 遍历文件，为每个文件创建 AsyncZipDeflate 流并添加到主 ZIP 流
+        const addPromises = filePaths.map((filePath) => {
+            return new Promise((fileResolve, fileReject) => {
+                const relativePath = relative(folderPath, filePath).replace(/\\/g, '/');
+                // 3a. 创建针对单个文件的压缩流
+                // 使用 ZipOptions 作为构造函数的选项类型
+                const fileDeflater = new AsyncZipDeflate(relativePath, globalOptions);
+                zipStream.add(fileDeflater);
+                // 3c. 开始读取文件并推送到压缩流
+                const fileReadStream = createReadStream(relativePath);
+                fileReadStream.on('data', (buffer) => {
+                    // 将读取到的 Buffer 推送到 AsyncZipDeflate 流进行压缩
+                    // 注意：push 的第二个参数 'false' 表示这不是最后一个数据块
+                    fileDeflater.push(buffer, false);
+                });
+                fileReadStream.on('end', () => {
+                    // 文件读取完毕，向 AsyncZipDeflate 流推送最后一个数据块标记
+                    // 传入空的 Uint8Array 并标记 final=true
+                    fileDeflater.push(new Uint8Array(), true);
+                    fileResolve(); // 当前文件处理完成，继续下一个文件
+                });
+                fileReadStream.on('error', (err) => {
+                    console.error(`读取文件 ${filePath} 时出错:`, err);
+                    fileDeflater.terminate();
+                    zipStream.terminate(); // 终止整个 ZIP 过程
+                    fileReject(err);
+                });
+            });
+        });
+        // 4. 等待所有文件都处理完毕
+        Promise.all(addPromises)
+            .then(() => {
+            // 所有文件的读取和压缩流都已启动并标记结束
+            // 现在通知主 ZIP 流结束归档
+            // console.log('所有文件流已添加，正在结束 ZIP 归档...');
+            zipStream.end();
+        })
+            .catch((err) => {
+            // 如果任何一个文件处理失败，则整个过程失败
+            // console.error('处理某个文件时失败，终止 ZIP 流:', err);
+            zipStream.terminate();
+            reject(err);
+        });
+    });
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/utils/file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,GAAG,EAAuB,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAoB,aAAa,EAAE,MAAM,SAAS,CAAC;AACxJ,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE7D;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAgB,EAAE,OAAe,EAAE,OAA0B;IAClG,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/B,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrC,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,QAAgB;IAC1C,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAY,EAAE,eAAwB;IAC1E,IAAI,eAAe,EAAE,CAAC;QACpB,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;SAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;QACjD,OAAO,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,QAAgB,EAAE,MAAc,EAAE,eAA+D,EAAE,eAAe,GAAG,IAAI;IACtJ,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,OAAO;IACT,CAAC;IACD,IAAI,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9C,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QACzC,OAAO,sBAAsB,CAAC,qBAAqB,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,OAAO,CAAC,CAAC;IACzF,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC,QAAQ,EAAE,qBAAqB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,QAAgB,EAAE,MAAc,EAAE,YAAY,GAAG,EAAE,EAAE,aAAa,EAA4B,EAAE,gBAAgF,EAAE,eAAe,GAAG,IAAI;IACrO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,OAAO;IACT,CAAC;IACD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACvC,OAAO,OAAO,CAAC,GAAG,CAChB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC1B,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACxE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,IAAI,YAAY,MAAM,EAAE,CAAC;gBAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBAChC,OAAO;gBACT,CAAC;YACH,CAAC;iBAAM,IAAI,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBACrC,OAAO;YACT,CAAC;QACH,CAAC;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,SAAS;YACT,MAAM,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC;QACnG,CAAC;aAAM,CAAC;YACN,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACtC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,gBAAgB,EAAE,CAAC;wBAClC,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;oBACtF,CAAC;gBACH,CAAC;YACH,CAAC;YACD,MAAM,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,QAAgB,EAAE,MAAc,EAAE,YAAY,GAAG,EAAE,EAAE,WAAW,EAAc;IAC1G,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACvC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,SAAS;YACT,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,UAAkB,EAAE,UAAkB,EAAE,gBAAgC,EAAE,KAAK,EAAE,CAAC,EAAE;IAChI,6CAA6C;IAE7C,cAAc;IACd,SAAS,WAAW,CAAC,OAAe,EAAE,eAAyB,EAAE;QAC/D,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QACnC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACrC,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBACrC,WAAW,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACN,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1C,kDAAkD;IAElD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,iBAAiB;QACjB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAE5B,qBAAqB;QACrB,MAAM,SAAS,GAAiB,EAAE,CAAC;QAEnC,qBAAqB;QACrB,SAAS,CAAC,MAAM,GAAG,CAAC,GAAiB,EAAE,KAAiB,EAAE,KAAc,EAAE,EAAE;YAC1E,IAAI,GAAG,EAAE,CAAC;gBACR,oCAAoC;gBACpC,6BAA6B;gBAC7B,SAAS,CAAC,SAAS,EAAE,CAAC;gBACtB,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACT,CAAC;YACD,iBAAiB;YACjB,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEtB,IAAI,KAAK,EAAE,CAAC;gBACV,yBAAyB;gBACzB,2CAA2C;gBAC3C,IAAI,CAAC;oBACH,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;oBAC5F,IAAI,MAAM,GAAG,CAAC,CAAC;oBACf,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;wBAC9B,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;wBAC/B,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;oBACzB,CAAC;oBACD,aAAa,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;oBACvC,OAAO,EAAE,CAAC,CAAC,OAAO;gBACpB,CAAC;gBAAC,OAAO,QAAQ,EAAE,CAAC;oBAClB,MAAM,CAAC,QAAQ,YAAY,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAC7E,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,+CAA+C;QAC/C,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC7C,OAAO,IAAI,OAAO,CAAO,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE;gBACnD,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;gBACxE,mBAAmB;gBACnB,4BAA4B;gBAC5B,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;gBACtE,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC5B,oBAAoB;gBACpB,MAAM,cAAc,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBACtD,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAwC,EAAE,EAAE;oBACrE,yCAAyC;oBACzC,sCAAsC;oBACtC,YAAY,CAAC,IAAI,CAAC,MAAiC,EAAE,KAAK,CAAC,CAAC;gBAC9D,CAAC,CAAC,CAAC;gBACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBAC5B,wCAAwC;oBACxC,iCAAiC;oBACjC,YAAY,CAAC,IAAI,CAAC,IAAI,UAAU,EAAE,EAAE,IAAI,CAAC,CAAC;oBAC1C,WAAW,EAAE,CAAC,CAAC,mBAAmB;gBACpC,CAAC,CAAC,CAAC;gBACH,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;oBACxC,OAAO,CAAC,KAAK,CAAC,QAAQ,QAAQ,OAAO,EAAE,GAAG,CAAC,CAAC;oBAC5C,YAAY,CAAC,SAAS,EAAE,CAAC;oBACzB,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,cAAc;oBACrC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAClB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,iBAAiB;QACjB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;aACrB,IAAI,CAAC,GAAG,EAAE;YACT,uBAAuB;YACvB,kBAAkB;YAClB,0CAA0C;YAC1C,SAAS,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,uBAAuB;YACvB,6CAA6C;YAC7C,SAAS,CAAC,SAAS,EAAE,CAAC;YACtB,MAAM,CAAC,GAAY,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meadmin/cli",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "meadmin cli",
   "type": "module",
   "main": "dist/index.js",
@@ -35,10 +35,12 @@
   "dependencies": {
     "art-template": "4.13.2",
     "commander": "^14.0.0",
+    "dayjs": "^1.11.21",
     "dotenv": "^16.6.1",
-    "swagger-client": "^3.35.6",
+    "fflate": "^0.8.3",
     "prettier": "3.8.1",
-    "prettier-plugin-organize-imports": "^4.3.0"
+    "prettier-plugin-organize-imports": "^4.3.0",
+    "swagger-client": "^3.35.6"
   },
   "peerDependencies": {
     "@sequelize/cli": "7.x || >=7.0.0-alpha.46",

package/template/crud/server/dto/query.dto.ts.art

@@ -11,7 +11,7 @@ export class {{@ replaceNames.QueryDto}} extends IntersectionType(
   PartialType(
     OmitDtoType(
       {{@ replaceNames.Name}} as new () => InferAttributesLoose<{{@ replaceNames.Name}}>,
-      ['{{@ entity.noSearchAttributes.join("','")}}'], //排除关联字段、虚拟属性、自动生成的属性(如果想更加简洁可以省略OmitDtoType，用InferAttributes替换InferAttributesLoose，不过需注意对应字段不创建rule，否则会行为不一致)
+      ['{{@ entity.noSearchAttributes.join("','")}}'], //排除关联字段、虚拟属性(如果想更加简洁可以省略OmitDtoType，用InferAttributes替换InferAttributesLoose，不过需注意对应字段不创建rule，否则会行为不一致)
     )
   )
 ) {

package/template/crud/server/service/service.ts.art

@@ -11,6 +11,7 @@ import { WhereAttributeHash } from '@sequelize/core/_non-semver-use-at-your-own-
 import { InferAttributes, Op, WhereOperators } from '@sequelize/core';{{each $imports.objectKeys(entity.belongsToEntity)}}<% const valueEntity = entity.belongsToEntity[$value]; %>{{if ['File'].includes(valueEntity.entityName)}}<% return; %>{{/if}}
 import { {{@ valueEntity.entityName}} } from '{{@ paths.entityPath.replace(replaceNames.name,valueEntity.entityFileName)}}';{{/each}}{{each $imports.objectKeys(entity.belongsToManyEntity)}}<% const valueEntity = entity.belongsToManyEntity[$value]; %>{{if ['File'].includes(valueEntity.entityName)}}<% return; %>{{/if}}
 import { {{@ valueEntity.entityName}} } from '{{@ paths.entityPath.replace(replaceNames.name,valueEntity.entityFileName)}}';{{/each}}
+import { NormalWhereOptions } from '@meadmin/core/types/entity';
 
 {{if entity.pk.length > 1}}type PK = {
   {{each entity.pk}}
@@ -38,7 +39,7 @@ export class {{@ replaceNames.Service}} {
    */
   @Transaction()
   async get{{@ valueEntity.entityName}}(page:number,pageSize:number,{{@ valueEntity.pk[0]}}:{{@ swaggerSchemas[valueEntity.entityName]?.properties?.[entity.pk[0]]?.type || 'string'}}{{if valueEntity.nameKeys.length}},{{@ valueEntity.nameKeys[0]}}: string = '', {{/if}}) {
-    const where = {};
+    const where = {} as NormalWhereOptions<InferAttributes<{{@ valueEntity.entityName}}>>;
     if({{@ valueEntity.pk[0]}}){
       where['{{@ valueEntity.pk[0]}}'] = {{@ valueEntity.pk[0]}};
     }
@@ -70,7 +71,7 @@ export class {{@ replaceNames.Service}} {
    */
   @Transaction()
   async get{{@ valueEntity.entityName}}(page:number,pageSize:number,{{@ valueEntity.pk[0]}}:{{@ swaggerSchemas[valueEntity.entityName]?.properties?.[entity.pk[0]]?.type || 'string'}}{{if valueEntity.nameKeys.length}},{{@ valueEntity.nameKeys[0]}}: string = '', {{/if}}) {
-    const where = {};
+    const where = {} as NormalWhereOptions<InferAttributes<{{@ valueEntity.entityName}}>>;
     if({{@ valueEntity.pk[0]}}){
       where['{{@ valueEntity.pk[0]}}'] = {{@ valueEntity.pk[0]}};
     }
@@ -118,7 +119,7 @@ export class {{@ replaceNames.Service}} {
    */
   @Transaction()
   async list(queryDto: {{@ replaceNames.QueryDto}}) {
-    const where = {} as WhereAttributeHash<InferAttributes<{{@ replaceNames.Name}}, { omit: never }>>;
+    const where = {} as NormalWhereOptions<InferAttributes<{{@ replaceNames.Name}}>>;
     (Object.keys(queryDto) as Array<keyof {{@ replaceNames.QueryDto}}>).forEach((key) => {
       if ('page' === key || 'pageSize' === key) {
         return;

package/template/crud/view/views/components/addOrUp.vue.art

@@ -12,9 +12,9 @@
 </template>
 
 <script setup lang="ts" name="AddOrUp{{@ replaceNames.Name}}">
-import { {{@ replaceNames.Name}}, {{@ replaceNames.Name}}Info, add{{@ replaceNames.Name}}Api, update{{@ replaceNames.Name}}Api, {{@ replaceNames.name}}InfoApi } from '@/{{@ replaceNames.addonsPath}}api/{{@ replaceNames.namePath}}';
-import { useLocalesI18n } from '@/locales/i18n';
-import { resetObj<% if($imports.objectValues(entitySchema.properties).some(v=>v.enum || v.description.includes(':'))){%>, formatterStr<%}%> } from '@/utils/helper';
+import { {{@ replaceNames.Name}}, type {{@ replaceNames.Name}}Info, add{{@ replaceNames.Name}}Api, update{{@ replaceNames.Name}}Api, {{@ replaceNames.name}}InfoApi } from '@/{{@ replaceNames.addonsPath}}api/{{@ replaceNames.namePath}}';
+import { useLocalesI18n } from '@/locales/i18n';<% if($imports.objectValues(entitySchema.properties).some(v=>v.enum || v.description.includes(':'))){%>
+import { formatterStr } from '@/utils/helper';<%}%>
 import type { FormInstance, FormRules } from 'element-plus';
 {{if $imports.objectValues(entitySchema.properties).some(value=>value.rule?._rules.some(v=>v.name==='mobile'))}}import { isMobile } from '@/utils/validate.js';{{/if}}
 //接口需要现在setup顶层初始化（如果是异步setup需要在异步调用之前初始化），否则会有unMounted，非法调用警告，因为vueRequest使用了unMounted
@@ -62,14 +62,14 @@ const emit = defineEmits<{
 
 
 
-const info = reactive(new {{@ replaceNames.Name}}());
+const info = ref<{{@ replaceNames.Name}}|{{@ replaceNames.Name}}Info>(new {{@ replaceNames.Name}}());
 const loading = ref(false);
 watch(
   () => {{if entity.pk.length===1}}props.{{@ entity.pk[0]}}{{else}}[props.{{@ entity.pk.join(', props.')}}]{{/if}},
   async ({{@ entity.pk.map(v=>`${v}?:${entitySchema.properties[v].type}`).join(', ')}}) => {
     if ({{@ entity.pk[0]}}) {
       loading.value = true;
-      resetObj(info, await infoRunAsync({{@ entity.pk.join(', ')}}));
+      info.value = await infoRunAsync({{@ entity.pk.join(', ')}});
       loading.value = false;
     }
   },
@@ -86,9 +86,9 @@ const submit = async () => {
     return formEl.value!.scrollToField(Object.keys(invalidFields!)[0]);
   }
   if (props.{{@ entity.pk[0]}}) {
-    await updateRunAsync(props.{{@ entity.pk.join(', props.')}}, info);
+    await updateRunAsync(props.{{@ entity.pk.join(', props.')}}, info.value);
   } else {
-    await addRunAsync(info);
+    await addRunAsync(info.value);
   }
   show.value = false;
   emit('success');

package/template/crud/view/views/index.vue.art

@@ -45,7 +45,7 @@
 </template>
 
 <script setup lang="ts" name="{{@ replaceNames.Name}}">
-import type { {{@ replaceNames.Name}}Info} from '@/{{@ replaceNames.addonsPath}}api/{{replaceNames.namePath}};
+import type { {{@ replaceNames.Name}}Info} from '@/{{@ replaceNames.addonsPath}}api/{{replaceNames.namePath}}';
 import { {{@ replaceNames.name}}ListApi, {{@ replaceNames.Name}}ListParam, del{{@ replaceNames.Name}}Api } from '@/{{@ replaceNames.addonsPath}}api/{{replaceNames.namePath}}';
 import { useLocalesI18n } from '@/locales/i18n';
 import Info from './components/info.vue';