@haluo/util 2.0.22 → 2.0.23

package/dist/modules/upload/aliOss.d.ts

@@ -12,6 +12,7 @@
  *
  * // 创建上传实例，传入业务相关的API函数
  * const ossUploader = createAliOssUploader({
+ *   getSts: (params) => api.getSts(params),
  *   getAliyunSts: (params) => api.getAliyunSts(params),
  *   darkWaterUploadImage: (params) => api.darkWaterUploadImage(params),
  *   multiTransferImage: (params) => api.multiTransferImage(params),
@@ -54,18 +55,28 @@
  * 不同的businessType对应不同的OSS bucket和水印策略
  */
 export declare enum BusinessType {
-    NO_WATER = 0,
-    AVATAR = 1,
-    GIF = 4,
-    VIDEO = 6,
-    UNPROTECT = 8,
-    ARTICLE = 1000,
-    PRIVATE = 1199,
-    ENCRYPTED = 1299,
-    DEFAULT = 1500
+    CREDIT = 130541736,
+    CONTENT = 101300784,
+    AVATAR = 134539448,
+    USED_CAR = 171978237,
+    MALL = 115259415,
+    HOOP = 155669648,
+    USER = 170244368,
+    CYCLING = 165103952,
+    MOTORCYCLE = 151637735,
+    RENTALCAR = 149095014,
+    SHOP = 172655993,
+    FINANCE = 188717541,
+    FEEDBACK = 182411383,
+    DRIVING_SCHOOL = 172137757,
+    REPLY = 195929698,
+    FACTORY = 118733601,
+    CYCLING_DATA = 148681294,
+    GIF = 191290831,
+    OTHER = 100694193
 }
 /**
- * 图片类型后缀枚举
+ * bucket 图片类型后缀枚举
  */
 export declare const SuffixEnum: {
     readonly nowater: "!nowater";
@@ -109,13 +120,12 @@ export interface UploadResult {
  */
 export interface UploadOption {
     file: File;
+    businessType?: BusinessType | number;
     imageType?: ImageType | string;
     quality?: number;
-    businessType?: BusinessType | number;
     batchTransfer?: boolean;
     notCompress?: boolean;
     idCard?: boolean;
-    imggeCarType?: any;
     isVideo?: boolean;
     isUnProtect?: boolean;
     isDocument?: boolean;
@@ -139,10 +149,16 @@ interface ApiResponse<T = any> {
  * 业务相关的API通过此接口传入，实现业务逻辑解耦
  */
 export interface AliOssApiConfig {
-    /** 获取阿里云STS临时凭证 - 必需 */
+    /** 获取STS，POST V4签名独有的表单元素- 必需 */
+    /** businessType: 业务编码(必传), docType: 文件格式如png(必传)，size: _1024_567(可选) */
+    getSts: (params: {
+        businessType: BusinessType;
+        docType: string;
+        size?: string;
+    }) => Promise<ApiResponse<OSSClientParams>>;
+    /** 获取阿里云STS临时凭证 - 旧版非必需 */
     getAliyunSts: (params: {
         businessType: number;
-        imggeCarType?: any;
     }) => Promise<ApiResponse<OSSClientParams>>;
     /** 暗水印上传接口 - 可选，用于carport类型 */
     darkWaterUploadImage?: (params: {
@@ -183,19 +199,37 @@ export declare class AliOssClass {
     private apiConfig;
     private clientCache;
     constructor(apiConfig: AliOssApiConfig);
+    /**
+     * 通过V4签名上传
+     * @param file 上传的文件
+     * @param businessType 业务类型
+     * @param size 文件的尺寸
+     * @returns 上传图片结果
+     */
+    upload(file: any, businessType: BusinessType, size?: string): Promise<any>;
     /**
      * 创建OSS客户端
      * @param businessType 业务类型
-     * @param imggeCarType 车辆图片类型（可选，用于特定业务）
      * @returns OSS客户端实例
      */
-    createOssClient(businessType: number, imggeCarType?: any): Promise<any>;
+    createOssClient(businessType: number): Promise<any>;
+    /**
+     * 执行OSS上传
+     * @param client OSS客户端
+     * @param fileName 文件名
+     * @param file 文件对象
+     * @param year 年份
+     * @param mimeType MIME类型
+     * @param onProgress 进度回调
+     * @returns 上传结果
+     */
+    private performOssUpload;
     /**
      * 预加载图片获取尺寸
      * @param file 文件对象
      * @returns 图片对象
      */
-    imgUpload(file: File): Promise<HTMLImageElement>;
+    getImageInfo(file: File): Promise<HTMLImageElement>;
     /**
      * 生成文件名
      * @param imageType 图片类型
@@ -210,17 +244,6 @@ export declare class AliOssClass {
      * @returns 是否为长图
      */
     private isLongImage;
-    /**
-     * 执行OSS上传
-     * @param client OSS客户端
-     * @param fileName 文件名
-     * @param file 文件对象
-     * @param year 年份
-     * @param mimeType MIME类型
-     * @param onProgress 进度回调
-     * @returns 上传结果
-     */
-    private performOssUpload;
     /**
      * 确定业务类型
      * @param option 上传选项

package/dist/modules/upload/aliOss.js

@@ -12,6 +12,7 @@
  *
  * // 创建上传实例，传入业务相关的API函数
  * const ossUploader = createAliOssUploader({
+ *   getSts: (params) => api.getSts(params),
  *   getAliyunSts: (params) => api.getAliyunSts(params),
  *   darkWaterUploadImage: (params) => api.darkWaterUploadImage(params),
  *   multiTransferImage: (params) => api.multiTransferImage(params),
@@ -53,7 +54,12 @@ import OSS from 'ali-oss';
 import lrz from 'lrz';
 // ==================== 常量定义 ====================
 /** 支持的图片格式 */
-const SUPPORTED_IMAGE_TYPES = ['image/png', 'image/gif', 'image/jpg', 'image/jpeg'];
+const SUPPORTED_IMAGE_TYPES = [
+    'image/png',
+    'image/gif',
+    'image/jpg',
+    'image/jpeg',
+];
 /** 小图片阈值（KB） */
 const SMALL_IMAGE_THRESHOLD = 100;
 /** 长图宽高比阈值 */
@@ -79,18 +85,37 @@ const OSS_META_PEOPLE = 'x-oss-meta-motor';
  */
 export var BusinessType;
 (function (BusinessType) {
-    BusinessType[BusinessType["NO_WATER"] = 0] = "NO_WATER";
-    BusinessType[BusinessType["AVATAR"] = 1] = "AVATAR";
-    BusinessType[BusinessType["GIF"] = 4] = "GIF";
-    BusinessType[BusinessType["VIDEO"] = 6] = "VIDEO";
-    BusinessType[BusinessType["UNPROTECT"] = 8] = "UNPROTECT";
-    BusinessType[BusinessType["ARTICLE"] = 1000] = "ARTICLE";
-    BusinessType[BusinessType["PRIVATE"] = 1199] = "PRIVATE";
-    BusinessType[BusinessType["ENCRYPTED"] = 1299] = "ENCRYPTED";
-    BusinessType[BusinessType["DEFAULT"] = 1500] = "DEFAULT"; // 默认
+    // NO_WATER = 0,        // 不打水印
+    // AVATAR = 1,          // 头像
+    // GIF = 4,             // GIF图片
+    // VIDEO = 6,           // 视频
+    // UNPROTECT = 8,       // UnProtect（不受保护）
+    // ARTICLE = 1000,      // 文章图片
+    // PRIVATE = 1199,      // 私有
+    // ENCRYPTED = 1299,    // 加密
+    // DEFAULT = 1500,       // 默认
+    BusinessType[BusinessType["CREDIT"] = 130541736] = "CREDIT";
+    BusinessType[BusinessType["CONTENT"] = 101300784] = "CONTENT";
+    BusinessType[BusinessType["AVATAR"] = 134539448] = "AVATAR";
+    BusinessType[BusinessType["USED_CAR"] = 171978237] = "USED_CAR";
+    BusinessType[BusinessType["MALL"] = 115259415] = "MALL";
+    BusinessType[BusinessType["HOOP"] = 155669648] = "HOOP";
+    BusinessType[BusinessType["USER"] = 170244368] = "USER";
+    BusinessType[BusinessType["CYCLING"] = 165103952] = "CYCLING";
+    BusinessType[BusinessType["MOTORCYCLE"] = 151637735] = "MOTORCYCLE";
+    BusinessType[BusinessType["RENTALCAR"] = 149095014] = "RENTALCAR";
+    BusinessType[BusinessType["SHOP"] = 172655993] = "SHOP";
+    BusinessType[BusinessType["FINANCE"] = 188717541] = "FINANCE";
+    BusinessType[BusinessType["FEEDBACK"] = 182411383] = "FEEDBACK";
+    BusinessType[BusinessType["DRIVING_SCHOOL"] = 172137757] = "DRIVING_SCHOOL";
+    BusinessType[BusinessType["REPLY"] = 195929698] = "REPLY";
+    BusinessType[BusinessType["FACTORY"] = 118733601] = "FACTORY";
+    BusinessType[BusinessType["CYCLING_DATA"] = 148681294] = "CYCLING_DATA";
+    BusinessType[BusinessType["GIF"] = 191290831] = "GIF";
+    BusinessType[BusinessType["OTHER"] = 100694193] = "OTHER";
 })(BusinessType || (BusinessType = {}));
 /**
- * 图片类型后缀枚举
+ * bucket 图片类型后缀枚举
  */
 export const SuffixEnum = {
     nowater: '!nowater',
@@ -99,7 +124,7 @@ export const SuffixEnum = {
     forum: '!forum',
     avatar: '!avatar',
     square: '!square',
-    carport: '!carport' // 车库、经销商水印
+    carport: '!carport', // 车库、经销商水印
 };
 /** 不打水印的图片类型 */
 const NO_WATER_IMAGE_TYPES = ['nowater', 'forum'];
@@ -124,7 +149,7 @@ function randomString(length) {
  */
 function filterUndefined(obj) {
     const result = {};
-    Object.keys(obj).forEach(key => {
+    Object.keys(obj).forEach((key) => {
         if (obj[key] !== undefined) {
             result[key] = obj[key];
         }
@@ -175,19 +200,75 @@ export class AliOssClass {
         this.apiConfig = apiConfig;
         this.clientCache = new Map();
     }
+    /**
+     * 通过V4签名上传
+     * @param file 上传的文件
+     * @param businessType 业务类型
+     * @param size 文件的尺寸
+     * @returns 上传图片结果
+     */
+    async upload(file, businessType, size) {
+        try {
+            // -------------------------- 步骤 1：请求后端获取所有签名字段 --------------------------
+            const signResponse = await this.apiConfig.getSts({
+                businessType,
+                docType: file.type,
+                size, // _1024_567(可选)
+            });
+            if (signResponse.data.code !== 0) {
+                console.error(signResponse);
+                throw new Error(`获取签名失败：${signResponse.data.message}`);
+            }
+            const signData = await signResponse.data.data;
+            console.log('后端返回的签名字段：', signData);
+            // -------------------------- 步骤 2：构造 FormData（字段名必须和后端返回一致）--------------------------
+            const formData = new FormData();
+            formData.append('autherid', signData['autherid']); // 业务字段（原样传）
+            formData.append('uid', signData['uid']); // 业务字段（原样传）
+            formData.append('key', signData['key']);
+            formData.append('policy', signData['policy']);
+            formData.append('success_action_status', '200');
+            formData.append('x-oss-credential', signData['credential']);
+            formData.append('x-oss-date', signData['date']);
+            if (signData['securityToken']) {
+                formData.append('x-oss-security-token', signData['securityToken']);
+            }
+            formData.append('x-oss-signature', signData['signature']);
+            formData.append('x-oss-signature-version', signData['signatureVersion']);
+            formData.append('file', file);
+            // -------------------------- 步骤 3：发送 POST 请求到 OSS --------------------------
+            const uploadResponse = await fetch(signData.uploadUrl, {
+                method: 'POST',
+                body: formData,
+                // 重点：不要手动设置 Content-Type！浏览器会自动处理为 multipart/form-data 并带边界符
+                headers: { Accept: '*/*' },
+            });
+            // -------------------------- 步骤 4：处理上传结果 --------------------------
+            const responseText = await uploadResponse.text();
+            console.log('responseText', responseText);
+            if (uploadResponse.ok) {
+                console.log('上传成功，文件路径：', signData['key'], signData['fileUrl']);
+            }
+            else {
+                throw new Error(`上传失败（OSS 返回 ${uploadResponse.status}）：${responseText}`);
+            }
+        }
+        catch (err) {
+            console.error('详细错误：', err);
+        }
+    }
     /**
      * 创建OSS客户端
      * @param businessType 业务类型
-     * @param imggeCarType 车辆图片类型（可选，用于特定业务）
      * @returns OSS客户端实例
      */
-    async createOssClient(businessType, imggeCarType) {
-        const cacheKey = `${businessType}_${imggeCarType || 'default'}`;
+    async createOssClient(businessType) {
+        const cacheKey = `${businessType}`;
         // 注释：某些项目使用缓存，某些不使用。这里提供可选的缓存机制
         // if (this.clientCache.has(cacheKey)) {
         //   return this.clientCache.get(cacheKey)
         // }
-        const res = await this.apiConfig.getAliyunSts({ businessType, imggeCarType });
+        const res = await this.apiConfig.getAliyunSts({ businessType });
         if (res.data.code !== 0) {
             throw new Error('获取OSS配置失败');
         }
@@ -197,23 +278,42 @@ export class AliOssClass {
         const filteredParams = filterUndefined(clientParams);
         const client = new OSS({
             region: DEFAULT_OSS_REGION,
-            ...filteredParams
+            ...filteredParams,
         });
         // 保存客户端选项供后续使用
         client.options = {
             ...client.options,
             realmName: clientParams.realmName,
-            suffix: clientParams.suffix
+            suffix: clientParams.suffix,
         };
         this.clientCache.set(cacheKey, client);
         return client;
     }
+    /**
+     * 执行OSS上传
+     * @param client OSS客户端
+     * @param fileName 文件名
+     * @param file 文件对象
+     * @param year 年份
+     * @param mimeType MIME类型
+     * @param onProgress 进度回调
+     * @returns 上传结果
+     */
+    async performOssUpload(client, fileName, file, year, mimeType, onProgress) {
+        return await client.multipartUpload(fileName, file, {
+            progress: (p) => {
+                onProgress?.({ percent: Math.floor(p * 100) });
+            },
+            meta: { year, people: OSS_META_PEOPLE },
+            mime: mimeType,
+        });
+    }
     /**
      * 预加载图片获取尺寸
      * @param file 文件对象
      * @returns 图片对象
      */
-    imgUpload(file) {
+    getImageInfo(file) {
         return new Promise((resolve, reject) => {
             const URL = window.URL || window.webkitURL;
             const image = new Image();
@@ -255,25 +355,6 @@ export class AliOssClass {
         const minDimension = Math.min(width, height);
         return maxDimension / minDimension > LONG_IMAGE_RATIO;
     }
-    /**
-     * 执行OSS上传
-     * @param client OSS客户端
-     * @param fileName 文件名
-     * @param file 文件对象
-     * @param year 年份
-     * @param mimeType MIME类型
-     * @param onProgress 进度回调
-     * @returns 上传结果
-     */
-    async performOssUpload(client, fileName, file, year, mimeType, onProgress) {
-        return await client.multipartUpload(fileName, file, {
-            progress: (p) => {
-                onProgress?.({ percent: Math.floor(p * 100) });
-            },
-            meta: { year, people: OSS_META_PEOPLE },
-            mime: mimeType
-        });
-    }
     /**
      * 确定业务类型
      * @param option 上传选项
@@ -295,9 +376,9 @@ export class AliOssClass {
             return BusinessType.AVATAR;
         }
         if (isNoWaterImageType(imageType)) {
-            return BusinessType.NO_WATER;
+            return BusinessType.OTHER;
         }
-        return BusinessType.DEFAULT;
+        return BusinessType.OTHER;
     }
     /**
      * 加载图片并返回结果
@@ -368,7 +449,7 @@ export class AliOssClass {
         const callbacks = {
             onError: option.onError || (() => { }),
             onSuccess: option.onSuccess || (() => { }),
-            onProgress: option.onProgress || (() => { })
+            onProgress: option.onProgress || (() => { }),
         };
         option.onError = callbacks.onError;
         option.onSuccess = callbacks.onSuccess;
@@ -382,27 +463,28 @@ export class AliOssClass {
         return new Promise(async (resolve, reject) => {
             try {
                 const imageType = option.imageType || DEFAULT_IMAGE_TYPE;
-                const suffix = SuffixEnum[imageType] || SuffixEnum.official;
+                const suffix = SuffixEnum[imageType] ||
+                    SuffixEnum.official;
                 // 生成文件名
                 const extensionName = `.${file.name.split('.').pop()}`;
                 const { year, fileName } = this.generateFileName(imageType, extensionName);
                 // 注释：小图片（≤100KB）不压缩，quality设为1 (MAIN-2481)
                 const isSmallImage = getFileSizeInKB(file.size) <= SMALL_IMAGE_THRESHOLD;
-                let quality = isSmallImage ? 1 : (option.quality || DEFAULT_QUALITY);
+                let quality = isSmallImage ? 1 : option.quality || DEFAULT_QUALITY;
                 const isGif = file.type === 'image/gif';
                 const idCard = option.idCard || false;
                 // 确定业务类型
                 const businessType = this.determineBusinessType(option, isGif);
                 // 注释：特殊业务类型1299（加密）直接返回bucket路径，不加载图片
-                if (businessType === BusinessType.ENCRYPTED) {
-                    const client = await this.createOssClient(businessType, option.imggeCarType);
+                if (businessType === BusinessType.OTHER) {
+                    const client = await this.createOssClient(businessType);
                     const result = await this.performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress);
                     if (result.res.statusCode === 200) {
                         const val = {
                             ...result,
                             imgUrl: `${result.bucket}://${result.name}`,
                             imgOrgUrl: `${result.bucket}://${result.name}`,
-                            fileName: file.name
+                            fileName: file.name,
                         };
                         callbacks.onSuccess(val);
                         resolve(val);
@@ -424,7 +506,7 @@ export class AliOssClass {
                             option,
                             file,
                             resolve,
-                            reject
+                            reject,
                         });
                     }
                     else {
@@ -434,7 +516,8 @@ export class AliOssClass {
                     return;
                 }
                 // 注释：carport类型需要打暗水印
-                if (option.imageType === 'carport' && this.apiConfig.darkWaterUploadImage) {
+                if (option.imageType === 'carport' &&
+                    this.apiConfig.darkWaterUploadImage) {
                     const res = await this.apiConfig.darkWaterUploadImage({ file });
                     if (res.data.code === 0) {
                         this.loadImage({
@@ -444,7 +527,7 @@ export class AliOssClass {
                             option,
                             file,
                             resolve,
-                            reject
+                            reject,
                         });
                     }
                     else {
@@ -454,7 +537,7 @@ export class AliOssClass {
                     return;
                 }
                 // 预加载图片获取尺寸
-                const image = await this.imgUpload(file);
+                const image = await this.getImageInfo(file);
                 // 图片压缩
                 const rst = await lrz(file, { quality });
                 // 注释：长图压缩有问题，长宽比>2:1的图片不压缩
@@ -481,13 +564,12 @@ export class AliOssClass {
                 if (!postFile.name) {
                     Object.defineProperty(postFile, 'name', {
                         value: file.name,
-                        writable: false
+                        writable: false,
                     });
                 }
                 // 注释：根据不同场景选择不同的OSS客户端
                 // GIF -> UnProtect(8), idCard -> Private(1199), nowater/forum -> NoWater(0), 其他 -> 默认
-                const client = await this.createOssClient(businessType, option.imggeCarType);
-                // 执行上传
+                const client = await this.createOssClient(businessType);
                 const result = await this.performOssUpload(client, fileName, postFile, year, postFile.type, callbacks.onProgress);
                 if (result.res.statusCode !== 200) {
                     callbacks.onError('上传失败');
@@ -498,7 +580,7 @@ export class AliOssClass {
                 if (idCard && this.apiConfig.generatePrePresignedUrl) {
                     const res = await this.apiConfig.generatePrePresignedUrl({
                         objectId: result.name,
-                        expireMils: PRESIGNED_URL_EXPIRE_TIME
+                        expireMils: PRESIGNED_URL_EXPIRE_TIME,
                     });
                     if (res.data.code === 0) {
                         this.loadImageNew({
@@ -507,7 +589,7 @@ export class AliOssClass {
                             file: postFile,
                             option,
                             resolve,
-                            reject
+                            reject,
                         });
                     }
                     else {
@@ -520,7 +602,7 @@ export class AliOssClass {
                 if (imageType === 'avatar' && this.apiConfig.aliyunPersist) {
                     const res = await this.apiConfig.aliyunPersist({
                         object: `${result.bucket}://${result.name}`,
-                        businessType: BusinessType.AVATAR
+                        businessType: BusinessType.AVATAR,
                     });
                     if (res.data.code === 0) {
                         this.loadImageNew({
@@ -529,7 +611,7 @@ export class AliOssClass {
                             file: postFile,
                             option,
                             resolve,
-                            reject
+                            reject,
                         });
                     }
                     else {
@@ -549,7 +631,7 @@ export class AliOssClass {
                     option,
                     resolve,
                     reject,
-                    isGif
+                    isGif,
                 });
             }
             catch (error) {
@@ -574,7 +656,7 @@ export class AliOssClass {
         const callbacks = {
             onError: option.onError || (() => { }),
             onSuccess: option.onSuccess || (() => { }),
-            onProgress: option.onProgress || (() => { })
+            onProgress: option.onProgress || (() => { }),
         };
         option.onError = callbacks.onError;
         option.onSuccess = callbacks.onSuccess;
@@ -593,21 +675,20 @@ export class AliOssClass {
                 let businessType = option.businessType;
                 if (!businessType) {
                     if (isUnProtect) {
-                        businessType = BusinessType.UNPROTECT;
+                        businessType = BusinessType.OTHER;
                     }
                     else if (isVideo || isDocument) {
-                        businessType = BusinessType.VIDEO; // 视频和文档都使用6
+                        businessType = BusinessType.OTHER; // 视频和文档都使用6
                     }
                     else {
-                        businessType = BusinessType.DEFAULT;
+                        businessType = BusinessType.OTHER;
                     }
                 }
                 // 注释：文档上传可能需要先调用uploadConf获取配置
                 if (isDocument && this.apiConfig.uploadConf) {
                     await this.apiConfig.uploadConf(businessType);
                 }
-                const client = await this.createOssClient(businessType, option.imggeCarType);
-                // 执行上传
+                const client = await this.createOssClient(businessType);
                 const result = await this.performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress);
                 if (result.res.statusCode === 200) {
                     const clientParams = client.options;
@@ -615,7 +696,7 @@ export class AliOssClass {
                     const uploadResult = {
                         ...result,
                         url,
-                        fileName: file.name
+                        fileName: file.name,
                     };
                     callbacks.onSuccess(uploadResult);
                     resolve(uploadResult);
@@ -647,7 +728,7 @@ export class AliOssClass {
         const callbacks = {
             onError: option.onError || (() => { }),
             onSuccess: option.onSuccess || (() => { }),
-            onProgress: option.onProgress || (() => { })
+            onProgress: option.onProgress || (() => { }),
         };
         option.onError = callbacks.onError;
         option.onSuccess = callbacks.onSuccess;
@@ -668,15 +749,15 @@ export class AliOssClass {
                     return;
                 }
                 // 预加载图片（虽然不需要尺寸，但保持原有逻辑）
-                await this.imgUpload(file);
+                await this.getImageInfo(file);
                 const imageType = option.imageType || DEFAULT_IMAGE_TYPE;
-                const suffix = SuffixEnum[imageType] || SuffixEnum.official;
+                const suffix = SuffixEnum[imageType] ||
+                    SuffixEnum.official;
                 // 生成文件名
                 const extensionName = `.${file.name.split('.').pop()}`;
                 const { year, fileName } = this.generateFileName(imageType, extensionName);
                 // 使用NoWater客户端
-                const client = await this.createOssClient(BusinessType.NO_WATER, option.imggeCarType);
-                // 执行上传
+                const client = await this.createOssClient(BusinessType.OTHER);
                 const result = await this.performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress);
                 if (result.res.statusCode === 200) {
                     const clientParams = client.options;
@@ -688,7 +769,7 @@ export class AliOssClass {
                         file,
                         option,
                         resolve,
-                        reject
+                        reject,
                     });
                 }
                 else {
@@ -731,5 +812,5 @@ export function createAliOssUploader(apiConfig) {
 export default {
     createAliOssUploader,
     BusinessType,
-    SuffixEnum
+    SuffixEnum,
 };