소스 검색

fix(order-module): 将AssetType和AssetFileType枚举从实体移到schema

- 将AssetType和AssetFileType枚举从order-person-asset.entity.ts移到order.schema.ts
- 更新order-management-ui从@d8d/allin-order-module/schemas导入枚举
- 修复前端构建错误,避免导入Node.js特定模块
- 确保UI包从schemas目录导入类型,而不是从模块根目录

🤖 Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
yourname 1 일 전
부모
커밋
dac84fc332

+ 1 - 1
allin-packages/order-management-ui/src/components/OrderPersonAssetAssociation.tsx

@@ -37,7 +37,7 @@ import { z } from 'zod';
 import { toast } from 'sonner';
 import { FileText, Trash2, Eye, User, Plus } from 'lucide-react';
 import { FileSelector } from '@d8d/file-management-ui/components';
-import { AssetType, AssetFileType } from '@d8d/allin-order-module';
+import { AssetType, AssetFileType } from '@d8d/allin-order-module/schemas';
 import { orderClient } from '../api/orderClient';
 
 // 资产关联表单Schema

+ 1 - 16
allin-packages/order-module/src/entities/order-person-asset.entity.ts

@@ -1,22 +1,7 @@
 import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm';
 import { EmploymentOrder } from './employment-order.entity';
 import { File } from '@d8d/file-module';
-
-// 资产类型枚举 - 模块内部枚举
-export enum AssetType {
-  TAX = 'tax',
-  SALARY = 'salary',
-  JOB_RESULT = 'job_result',
-  CONTRACT_SIGN = 'contract_sign',
-  DISABILITY_CERT = 'disability_cert',
-  OTHER = 'other',
-}
-
-// 资产文件类型枚举 - 模块内部枚举
-export enum AssetFileType {
-  IMAGE = 'image',
-  VIDEO = 'video',
-}
+import { AssetType, AssetFileType } from '../schemas/order.schema';
 
 @Entity('order_person_asset', { comment: '订单人员资产表' })
 export class OrderPersonAsset {

+ 1 - 1
allin-packages/order-module/src/index.ts

@@ -1,7 +1,7 @@
 // 显式导出以避免重复导出
 export { EmploymentOrder } from './entities/employment-order.entity';
 export { OrderPerson } from './entities/order-person.entity';
-export { OrderPersonAsset, AssetType, AssetFileType } from './entities/order-person-asset.entity';
+export { OrderPersonAsset } from './entities/order-person-asset.entity';
 export { OrderService } from './services/order.service';
 export * from './schemas/order.schema';
 export { orderRoutes } from './routes/order.routes';

+ 16 - 1
allin-packages/order-module/src/schemas/order.schema.ts

@@ -1,6 +1,21 @@
 import { z } from '@hono/zod-openapi';
 import { OrderStatus, WorkStatus } from '@d8d/allin-enums';
-import { AssetType, AssetFileType } from '../entities';
+
+// 资产类型枚举 - 从实体移到schema,供前端使用
+export enum AssetType {
+  TAX = 'tax',
+  SALARY = 'salary',
+  JOB_RESULT = 'job_result',
+  CONTRACT_SIGN = 'contract_sign',
+  DISABILITY_CERT = 'disability_cert',
+  OTHER = 'other',
+}
+
+// 资产文件类型枚举 - 从实体移到schema,供前端使用
+export enum AssetFileType {
+  IMAGE = 'image',
+  VIDEO = 'video',
+}
 
 // 用工订单实体Schema
 export const EmploymentOrderSchema = z.object({