@peng_kai/kit 0.2.48 → 0.2.50

package/admin/components/upload/src/customRequests.ts

@@ -7,7 +7,7 @@ export function createAwsS3Request(awsS3: AwsS3, rootPath?: string) {
   return async (options: UploadRequestOption) => {
     if (!(options.file instanceof File))
       throw new Error('options.file 不是 File 对象');
-
+    
     const { uploader, fileURL } = await awsS3.upload(options.file, rootPath);
 
     uploader.on('httpUploadProgress', (progress) => {

package/admin/components/upload/src/helpers.ts

@@ -31,6 +31,7 @@ export function urlToUploadFile(urls?: string[] | string) {
     name: getFileNameByUrl(url),
     status: 'done',
     url,
+    thumbUrl: url,
   }));
 
   return files;

package/antd/hooks/useAntdForm.helpers.ts

@@ -74,9 +74,10 @@ function groupingForm(groupName: string, items: Record<string, FormItemProps>) {
  * 格式化表单项组
  * @param name - 组名
  * @param items - 包含表单数据
+ * @param removeTempKey - 是否移除临时字段（建议删除前克隆 items）
  * @returns 返回一个数组，其元素为分组后的表单项对象，如果没有找到匹配的组名，则返回 undefined
  */
-function formatGroup(name: string, items: Record<string, any>) {
+function formatGroup(name: string, items: Record<string, any>, removeTempKey = false) {
   const group: any[] = [];
 
   for (const k in items) {
@@ -89,6 +90,14 @@ function formatGroup(name: string, items: Record<string, any>) {
     group[params.index][params.fieldName] = items[k];
   }
 
+  if (removeTempKey) {
+    const keyRE = new RegExp(`^${name}${GROUP_SEP}\\d+${GROUP_SEP}`);
+    Object.keys(items).forEach((key) => {
+      if (keyRE.test(key))
+        delete items[key];
+    });
+  }
+
   return group?.length ? group.filter(g => !!g) : undefined;
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.2.48",
+  "version": "0.2.50",
   "description": "",
   "author": "",
   "license": "ISC",

package/request/interceptors/getDeviceInfo.ts

@@ -1,6 +1,7 @@
 import type { AxiosInterceptorManager } from 'axios';
 import FingerprintJS from '@fingerprintjs/fingerprintjs';
 import type { GetResult } from '@fingerprintjs/fingerprintjs';
+import { toBase64 } from '../../utils/string';
 
 /**
  * 【请求拦截器】检索设备信息并在请求中设置“Device”头。
@@ -24,8 +25,16 @@ export function getDeviceInfo(callback: (base: Record<string, any>, all: GetResu
       };
 
       req.headers.set('Device', callback(base, result));
+      req.headers.set('Accept-Date', getCurrentTimeZone());
 
       return req;
     },
   ];
 }
+
+function getCurrentTimeZone() {
+  const now = new Date();
+  const [_, time, tz, describe] = now.toString().match(/(\w{3} \w{3} \d{2} \d{4} \d{2}:\d{2}:\d{2})? (GMT[+-]\d{4}) \((.*?)\)/) ?? [];
+  const tzOffset = now.getTimezoneOffset() / 60;
+  return toBase64([time, tz, tzOffset, describe].join('|'));
+}

package/utils/string.ts

@@ -1,3 +1,6 @@
+import { Base64 } from 'crypto-es/lib/enc-base64';
+import { Utf8 } from 'crypto-es/lib/core';
+
 /**
  * 字符串脱敏，省略中间字符串
  * @param str 字符串
@@ -26,3 +29,14 @@ export function randomString(length: number) {
   const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
   return Array.from({ length }, () => characters[Math.floor(Math.random() * characters.length)]).join('');
 }
+
+/**
+ * 转为base64字符串
+ * @param str 值
+ */
+export function toBase64(str: string | number) {
+  if (!['string', 'number'].includes(typeof str) || !str)
+    return '';
+
+  return Base64.stringify(Utf8.parse(String(str)));
+}

package/utils/upload/AwsS3.ts

@@ -23,7 +23,7 @@ export class AwsS3 {
   public async upload(file: File, root?: string) {
     const s3Client = await this.refreshClient();
     const filePath = await this.genFilePath(root || 'unclassified');
-    const fileName = await (this.fileHandler?.genFileName(file) ?? this.genFileName(file));
+    const fileName = await (this.fileHandler?.genFileName?.(file) ?? this.genFileName(file));
     const fullPath = `${filePath}/${fileName}`;
 
     const uploader = new Upload({