beer-network 1.1.1-alpha.2 → 1.1.1-alpha.20

package/api.d.ts

@@ -16,25 +16,144 @@ export type RequestData<T> = {
     total: number;
     success: boolean;
 };
+/**
+ * 其它菜单.
+ */
+export type Option = {
+    /**
+     * 中止信号量.
+     */
+    signal?: AbortSignal;
+    /**
+     * Next 缓存.
+     */
+    next?: {
+        revalidate: number;
+    };
+};
 export default class Fetch {
     /**
      * 请求地址.
      */
     private readonly pathPrefix;
     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 路径.
      * @param params 参数.
      * @param body 内容体.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    postBody<T>(path: string, params?: any, body?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
+    /**
+     * 发送POST/Form 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param form Form参数.
+     * @param header 头部.
+     * @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 选项.
      */
-    post<T>(path: string, params?: any, body?: any): Promise<JsonResponse<T>>;
+    deleteFormData<T>(path: string, params?: any, formData?: FormData, header?: any, option?: Option): Promise<JsonResponse<T>>;
     /**
      * 发送Get 请求.
      * @param path 路径.
      * @param params 参数.
+     * @param header 头部.
+     * @param option 选项.
      */
-    get<T>(path: string, params?: any): Promise<JsonResponse<T>>;
+    get<T>(path: string, params?: any, header?: any, option?: Option): Promise<JsonResponse<T>>;
     /**
      * 缓存.
      * @param key 缓存Key.

package/api.js

@@ -1,51 +1,239 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const session_1 = require("./session");
-class Fetch {
+import { Session } from './session';
+export default class Fetch {
     constructor(pathPrefix) {
         this.pathPrefix = pathPrefix;
     }
-    /**
-     * 发送POST/JSON 请求.
-     * @param path 路径.
-     * @param params 参数.
-     * @param body 内容体.
-     */
-    async post(path, params, body) {
+    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',
+            method,
             headers: {
                 ...this.authorization(),
+                ...(header || {}),
                 'Content-Type': 'application/json'
             },
-            body: JSON.stringify(body || {})
+            body: JSON.stringify(body || {}),
+            signal: option?.signal || null,
+            next: option?.next
         });
         return this.responseJson(response);
     }
-    /**
-     * 发送Get 请求.
-     * @param path 路径.
-     * @param params 参数.
-     */
-    async get(path, params) {
+    async sendForm(method, path, params, form, header, option) {
+        const paramQuery = new URLSearchParams();
+        Object.keys(params || {})
+            .forEach(key => {
+            paramQuery.append(key, params[key]);
+        });
+        const formData = new FormData();
+        const appendFormData = (data, parentKey = '') => {
+            for (const key of data) {
+                const currentKey = parentKey ? `${parentKey}[${key}]` : key;
+                if (typeof data[key] === 'object' && data[key] !== null) {
+                    appendFormData(data[key], currentKey);
+                }
+                else if (Array.isArray(data[key])) {
+                    data[key].forEach((item, index) => {
+                        const arrayKey = `${currentKey}[${index}]`;
+                        appendFormData({ [arrayKey]: item });
+                    });
+                }
+                else {
+                    formData.append(currentKey, data[key]);
+                }
+            }
+        };
+        appendFormData(form);
+        const response = await fetch(this.pathPrefix + path + (paramQuery.toString() === '' ? '' : '?') + paramQuery.toString(), {
+            method,
+            headers: {
+                ...this.authorization(),
+                ...(header || {}),
+                'Content-Type': 'application/x-www-form-urlencoded'
+            },
+            body: formData,
+            signal: option?.signal || null,
+            next: option?.next
+        });
+        return this.responseJson(response);
+    }
+    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() === '' ? '' : '?') + paramQuery.toString(), {
+            method,
+            headers: {
+                ...this.authorization(),
+                ...(header || {})
+            },
+            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.pathPrefix + path + '?' + paramQuery.toString(), {
-            method: 'GET',
+            method,
             headers: {
-                ...this.authorization()
-            }
+                ...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.
@@ -76,7 +264,7 @@ class Fetch {
      * 默认授权方式.
      */
     authorization() {
-        const bearer = session_1.Session.getBearer();
+        const bearer = Session.getBearer();
         if (bearer === undefined || bearer === '') {
             return {};
         }
@@ -88,8 +276,13 @@ 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;
@@ -117,4 +310,3 @@ class Fetch {
         });
     }
 }
-exports.default = Fetch;

package/elementUtils.d.ts

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

package/elementUtils.js

@@ -1,14 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ElementUtils = void 0;
-class ElementUtils {
+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', () => {
@@ -26,10 +25,9 @@ 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);
     }
 }
-exports.ElementUtils = ElementUtils;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "beer-network",
   "private": false,
-  "version": "1.1.1-alpha.2",
-  "type": "module",
+  "version": "1.1.1-alpha.20",
   "scripts": {
-    "pub-w": "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

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Session = void 0;
-class Session {
+export class Session {
     /**
      * 获取令牌.
      * <li>window.sessionKey 设置读取缓存用户信息的Key, 默认 login_user.</li>
@@ -9,11 +6,14 @@ class Session {
      * <li>window.accessToken 设置身份令牌, 直接返回.</li>
      */
     static getBearer() {
+        if (typeof window === 'undefined') {
+            return undefined;
+        }
         if (window.accessToken !== undefined && window.accessToken !== '') {
             return window.accessToken;
         }
         const key = window.sessionKey || 'login_user';
-        const loginUser = JSON.parse(localStorage.getItem(key) || '{}');
+        const loginUser = JSON.parse(localStorage.getItem(key) || sessionStorage.getItem(key) || '{}');
         if (window.accessTokenKey !== undefined && window.accessTokenKey !== '') {
             return loginUser[window.accessTokenKey];
         }
@@ -23,6 +23,9 @@ class Session {
      * 检查令牌是否存在.
      */
     static checkAccessTokenExist() {
+        if (typeof window === 'undefined') {
+            return false;
+        }
         const bearer = Session.getBearer();
         return !(bearer === undefined || bearer === '');
     }
@@ -31,10 +34,13 @@ 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;
         }
     }
 }
-exports.Session = Session;

package/utils.d.ts

@@ -0,0 +1,12 @@
+export default class Utils {
+    /**
+     * 获取URI 地址参数.
+     * @param key 参数名称.
+     */
+    static getParam(key: string): string | undefined;
+    /**
+     * 复制到剪切板.
+     * @param value 内容.
+     */
+    static copy(value: string): Promise<void>;
+}

package/utils.js

@@ -0,0 +1,36 @@
+export default class Utils {
+    /**
+     * 获取URI 地址参数.
+     * @param key 参数名称.
+     */
+    static getParam(key) {
+        const values = window.location.search.split('?');
+        if (values.length <= 1) {
+            return undefined;
+        }
+        const value = values[1];
+        if (value === undefined) {
+            return undefined;
+        }
+        for (const it of decodeURIComponent(value)
+            .split('&')) {
+            const args = it.trim()
+                .split('=');
+            if (args.length !== 2) {
+                continue;
+            }
+            if (args[0].toString()
+                .toLocaleLowerCase() === key.toLocaleLowerCase()) {
+                return args[1];
+            }
+        }
+        return undefined;
+    }
+    /**
+     * 复制到剪切板.
+     * @param value 内容.
+     */
+    static async copy(value) {
+        return navigator.clipboard.writeText(value);
+    }
+}