beer-network 1.1.1-alpha.9 → 1.2.1

package/api.d.ts

@@ -24,13 +24,31 @@ export type Option = {
      * 中止信号量.
      */
     signal?: AbortSignal;
+    /**
+     * NextJS 缓存.
+     */
+    next?: {
+        revalidate: number;
+    };
 };
 export default class Fetch {
     /**
      * 请求地址.
      */
     private readonly pathPrefix;
-    constructor(pathPrefix: string);
+    constructor(pathPrefix?: string);
+    private sendBody;
+    private sendForm;
+    private sendFormData;
+    private send;
+    /**
+     * 发送POST 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    post<T>(path: string, params?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
     /**
      * 发送POST/JSON 请求.
      * @param path 路径.
@@ -39,7 +57,7 @@ export default class Fetch {
      * @param header 头部.
      * @param option 选项.
      */
-    post<T>(path: string, params?: any, body?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    postBody<T>(path: string, params?: any, body?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
     /**
      * 发送POST/Form 请求.
      * @param path 路径.
@@ -49,6 +67,85 @@ export default class Fetch {
      * @param option 选项.
      */
     postForm<T>(path: string, params?: any, form?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    /**
+     * 发送POST/FormData 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param formData Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    postFormData<T>(path: string, params?: any, formData?: FormData, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    /**
+     * 发送PUT 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    put<T>(path: string, params?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    /**
+     * 发送PUT/JSON 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param body 内容体.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    putBody<T>(path: string, params?: any, body?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    /**
+     * 发送PUT/Form 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param form Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    putForm<T>(path: string, params?: any, form?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    /**
+     * 发送PUT/FormData 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param formData Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    putFormData<T>(path: string, params?: any, formData?: FormData, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    /**
+     * 发送DELETE 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    delete<T>(path: string, params?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    /**
+     * 发送DELETE/JSON 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param body 内容体.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    deleteBody<T>(path: string, params?: any, body?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    /**
+     * 发送DELETE/Form 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param form Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    deleteForm<T>(path: string, params?: any, form?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    /**
+     * 发送DELETE/FormData 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param formData Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    deleteFormData<T>(path: string, params?: any, formData?: FormData, header?: any, option?: Option): Promise<JsonResponse<T>>;
     /**
      * 发送Get 请求.
      * @param path 路径.
@@ -74,6 +171,10 @@ export default class Fetch {
      * @param response 响应数据.
      */
     responseJson<T>(response: Response): Promise<JsonResponse<T>>;
+    /**
+     * 获取路径前缀.
+     */
+    getPathPrefix(): string;
     pageParams(params: any): any;
     pageTable<T>(response: JsonResponse<any>): Promise<Partial<RequestData<T>>>;
     sleep(value: number): Promise<unknown>;

package/api.js

@@ -1,43 +1,28 @@
 import { Session } from './session';
 export default class Fetch {
     constructor(pathPrefix) {
-        this.pathPrefix = pathPrefix;
+        this.pathPrefix = pathPrefix || '';
     }
-    /**
-     * 发送POST/JSON 请求.
-     * @param path 路径.
-     * @param params 参数.
-     * @param body 内容体.
-     * @param header 头部.
-     * @param option 选项.
-     */
-    async post(path, params, body, header, option) {
+    async sendBody(method, path, params, body, header, option) {
         const paramQuery = new URLSearchParams();
         Object.keys(params || {})
             .forEach(key => {
             paramQuery.append(key, params[key]);
         });
-        const response = await fetch(this.pathPrefix + path + (paramQuery.toString() === '' ? '' : '?') + paramQuery.toString(), {
-            method: 'POST',
+        const response = await fetch(this.getPathPrefix() + path + (paramQuery.toString() === '' ? '' : '?') + paramQuery.toString(), {
+            method,
             headers: {
                 ...this.authorization(),
                 ...(header || {}),
                 'Content-Type': 'application/json'
             },
             body: JSON.stringify(body || {}),
-            signal: option?.signal || null
+            signal: option?.signal || null,
+            next: option?.next
         });
         return this.responseJson(response);
     }
-    /**
-     * 发送POST/Form 请求.
-     * @param path 路径.
-     * @param params 参数.
-     * @param form Form参数.
-     * @param header 头部.
-     * @param option 选项.
-     */
-    async postForm(path, params, form, header, option) {
+    async sendForm(method, path, params, form, header, option) {
         const paramQuery = new URLSearchParams();
         Object.keys(params || {})
             .forEach(key => {
@@ -62,41 +47,193 @@ export default class Fetch {
             }
         };
         appendFormData(form);
-        const response = await fetch(this.pathPrefix + path + (paramQuery.toString() === '' ? '' : '?') + paramQuery.toString(), {
-            method: 'POST',
+        const response = await fetch(this.getPathPrefix() + path + (paramQuery.toString() === '' ? '' : '?') + paramQuery.toString(), {
+            method,
             headers: {
                 ...this.authorization(),
                 ...(header || {}),
                 'Content-Type': 'application/x-www-form-urlencoded'
             },
             body: formData,
-            signal: option?.signal || null
+            signal: option?.signal || null,
+            next: option?.next
         });
         return this.responseJson(response);
     }
-    /**
-     * 发送Get 请求.
-     * @param path 路径.
-     * @param params 参数.
-     * @param header 头部.
-     * @param option 选项.
-     */
-    async get(path, params, header, option) {
+    async sendFormData(method, path, params, formData, header, option) {
         const paramQuery = new URLSearchParams();
         Object.keys(params || {})
             .forEach(key => {
             paramQuery.append(key, params[key]);
         });
-        const response = await fetch(this.pathPrefix + path + '?' + paramQuery.toString(), {
-            method: 'GET',
+        const response = await fetch(this.getPathPrefix() + path + (paramQuery.toString() === '' ? '' : '?') + paramQuery.toString(), {
+            method,
             headers: {
                 ...this.authorization(),
                 ...(header || {})
             },
-            signal: option?.signal || null
+            body: formData,
+            signal: option?.signal || null,
+            next: option?.next
         });
         return this.responseJson(response);
     }
+    async send(method, path, params, header, option) {
+        const paramQuery = new URLSearchParams();
+        Object.keys(params || {})
+            .forEach(key => {
+            paramQuery.append(key, params[key]);
+        });
+        const response = await fetch(this.getPathPrefix() + path + '?' + paramQuery.toString(), {
+            method,
+            headers: {
+                ...this.authorization(),
+                ...(header || {})
+            },
+            signal: option?.signal || null,
+            next: option?.next
+        });
+        return this.responseJson(response);
+    }
+    /**
+     * 发送POST 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async post(path, params, header, option) {
+        return this.send('POST', path, params, header, option);
+    }
+    /**
+     * 发送POST/JSON 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param body 内容体.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async postBody(path, params, body, header, option) {
+        return this.sendBody('POST', path, params, body, header, option);
+    }
+    /**
+     * 发送POST/Form 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param form Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async postForm(path, params, form, header, option) {
+        return this.sendForm('POST', path, params, form, header, option);
+    }
+    /**
+     * 发送POST/FormData 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param formData Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async postFormData(path, params, formData, header, option) {
+        return this.sendFormData('POST', path, params, formData, header, option);
+    }
+    /**
+     * 发送PUT 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async put(path, params, header, option) {
+        return this.send('PUT', path, params, header, option);
+    }
+    /**
+     * 发送PUT/JSON 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param body 内容体.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async putBody(path, params, body, header, option) {
+        return this.sendBody('PUT', path, params, body, header, option);
+    }
+    /**
+     * 发送PUT/Form 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param form Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async putForm(path, params, form, header, option) {
+        return this.sendForm('PUT', path, params, form, header, option);
+    }
+    /**
+     * 发送PUT/FormData 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param formData Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async putFormData(path, params, formData, header, option) {
+        return this.sendFormData('PUT', path, params, formData, header, option);
+    }
+    /**
+     * 发送DELETE 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async delete(path, params, header, option) {
+        return this.send('DELETE', path, params, header, option);
+    }
+    /**
+     * 发送DELETE/JSON 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param body 内容体.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async deleteBody(path, params, body, header, option) {
+        return this.sendBody('DELETE', path, params, body, header, option);
+    }
+    /**
+     * 发送DELETE/Form 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param form Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async deleteForm(path, params, form, header, option) {
+        return this.sendForm('DELETE', path, params, form, header, option);
+    }
+    /**
+     * 发送DELETE/FormData 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param formData Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async deleteFormData(path, params, formData, header, option) {
+        return this.sendFormData('DELETE', path, params, formData, header, option);
+    }
+    /**
+     * 发送Get 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async get(path, params, header, option) {
+        return this.send('GET', path, params, header, option);
+    }
     /**
      * 缓存.
      * @param key 缓存Key.
@@ -139,12 +276,23 @@ export default class Fetch {
      */
     async responseJson(response) {
         const result = await response.json();
+        if (typeof window === 'undefined') {
+            return result;
+        }
+        const redirect = encodeURIComponent(window.location.href);
         if (result?.code === '401') {
-            setTimeout(() => window.location.replace('/auth/login'), 500);
+            const link = (window?.authLogin || '/auth/login') + '?redirect=' + redirect;
+            setTimeout(() => window.location.replace(link), 500);
             return result;
         }
         return result;
     }
+    /**
+     * 获取路径前缀.
+     */
+    getPathPrefix() {
+        return this.pathPrefix || '';
+    }
     pageParams(params) {
         return {
             ...params,

package/elementUtils.d.ts

@@ -1,12 +1,17 @@
 export default class ElementUtils {
     /**
      * 选择文件本地文件.
+     * @param multiple 是否多选.
      */
-    static selectFile(): Promise<FileList | null>;
+    static selectFile(multiple?: boolean | undefined): Promise<FileList | null>;
+    /**
+     * 选择文件夹.
+     */
+    static selectDirectory(): Promise<FileSystemDirectoryHandle | undefined>;
     /**
      * 下载文件.
      * @param url 文件下载地址.
      * @param fileName 文件名称.
      */
-    static download(url: string, fileName: string): void;
+    static download(url: string, fileName?: string): void;
 }

package/elementUtils.js

@@ -1,11 +1,13 @@
 export default class ElementUtils {
     /**
      * 选择文件本地文件.
+     * @param multiple 是否多选.
      */
-    static selectFile() {
+    static selectFile(multiple) {
         return new Promise((resolve) => {
             const fileInput = document.createElement('input');
             fileInput.type = 'file';
+            fileInput.multiple = multiple || false;
             fileInput.style.display = 'none';
             document.body.appendChild(fileInput);
             fileInput.addEventListener('change', () => {
@@ -15,6 +17,16 @@ export default class ElementUtils {
             fileInput.click();
         });
     }
+    /**
+     * 选择文件夹.
+     */
+    static async selectDirectory() {
+        if (!window.showDirectoryPicker) {
+            alert('您的浏览器不支持文件夹选择功能');
+            return undefined;
+        }
+        return await window.showDirectoryPicker();
+    }
     /**
      * 下载文件.
      * @param url 文件下载地址.
@@ -23,7 +35,7 @@ export default class ElementUtils {
     static download(url, fileName) {
         const link = document.createElement('a');
         link.href = url;
-        link.download = fileName;
+        link.download = fileName || '';
         document.body.appendChild(link);
         link.click();
         document.body.removeChild(link);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "beer-network",
   "private": false,
-  "version": "1.1.1-alpha.9",
-  "type": "module",
+  "version": "1.2.1",
   "scripts": {
-    "pub-w": "tsc && copy package.json .\\dist\\package.json && npm publish ./dist"
+    "pub-w": "tsc && copy package.json .\\dist\\package.json && npm publish ./dist",
+    "pub-m": "tsc && cp package.json ./dist/package.json && npm publish ./dist"
   },
   "dependencies": {
   },

package/session.js

@@ -6,6 +6,9 @@ export class Session {
      * <li>window.accessToken 设置身份令牌, 直接返回.</li>
      */
     static getBearer() {
+        if (typeof window === 'undefined') {
+            return undefined;
+        }
         if (window.accessToken !== undefined && window.accessToken !== '') {
             return window.accessToken;
         }
@@ -20,6 +23,9 @@ export class Session {
      * 检查令牌是否存在.
      */
     static checkAccessTokenExist() {
+        if (typeof window === 'undefined') {
+            return false;
+        }
         const bearer = Session.getBearer();
         return !(bearer === undefined || bearer === '');
     }
@@ -28,7 +34,11 @@ export class Session {
      * @param url 退出之后的地址.
      */
     static logout(url) {
-        localStorage.clear();
+        if (typeof window === 'undefined') {
+            return;
+        }
+        localStorage?.clear();
+        sessionStorage?.clear();
         if (url !== undefined && url !== '') {
             window.location.href = url;
         }