beer-network 1.1.1-alpha.1 → 1.1.1-alpha.10

package/api.d.ts

@@ -16,6 +16,15 @@ export type RequestData<T> = {
     total: number;
     success: boolean;
 };
+/**
+ * 其它菜单.
+ */
+export type Option = {
+    /**
+     * 中止信号量.
+     */
+    signal?: AbortSignal;
+};
 export default class Fetch {
     /**
      * 请求地址.
@@ -27,21 +36,44 @@ export default class Fetch {
      * @param path 路径.
      * @param params 参数.
      * @param body 内容体.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    post<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 选项.
      */
-    post<T>(path: string, params?: any, body?: any): Promise<JsonResponse<T>>;
+    postFormData<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.
      * @param callback 数据回执函数.
      * @param minute 缓存时间 (分钟).
+     * @param isCache 是否开启缓存.
      */
-    cache<T>(key: string, callback: () => Promise<T>, minute: number): Promise<T>;
+    cache<T>(key: string, callback: () => Promise<T>, minute: number, isCache: boolean): Promise<T>;
     /**
      * 默认授权方式.
      */

package/api.js

@@ -1,7 +1,5 @@
-"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;
     }
@@ -10,8 +8,10 @@ class Fetch {
      * @param path 路径.
      * @param params 参数.
      * @param body 内容体.
+     * @param header 头部.
+     * @param option 选项.
      */
-    async post(path, params, body) {
+    async post(path, params, body, header, option) {
         const paramQuery = new URLSearchParams();
         Object.keys(params || {})
             .forEach(key => {
@@ -21,9 +21,82 @@ class Fetch {
             method: 'POST',
             headers: {
                 ...this.authorization(),
+                ...(header || {}),
                 'Content-Type': 'application/json'
             },
-            body: JSON.stringify(body || {})
+            body: JSON.stringify(body || {}),
+            signal: option?.signal || null
+        });
+        return this.responseJson(response);
+    }
+    /**
+     * 发送POST/Form 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param form Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async postForm(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: 'POST',
+            headers: {
+                ...this.authorization(),
+                ...(header || {}),
+                'Content-Type': 'application/x-www-form-urlencoded'
+            },
+            body: formData,
+            signal: option?.signal || null
+        });
+        return this.responseJson(response);
+    }
+    /**
+     * 发送POST/FormData 请求.
+     * @param path 路径.
+     * @param params 参数.
+     * @param formData Form参数.
+     * @param header 头部.
+     * @param option 选项.
+     */
+    async postFormData(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: 'POST',
+            headers: {
+                ...this.authorization(),
+                ...(header || {}),
+                'Content-Type': 'multipart/form-data'
+            },
+            body: formData,
+            signal: option?.signal || null
         });
         return this.responseJson(response);
     }
@@ -31,8 +104,10 @@ class Fetch {
      * 发送Get 请求.
      * @param path 路径.
      * @param params 参数.
+     * @param header 头部.
+     * @param option 选项.
      */
-    async get(path, params) {
+    async get(path, params, header, option) {
         const paramQuery = new URLSearchParams();
         Object.keys(params || {})
             .forEach(key => {
@@ -41,8 +116,10 @@ class Fetch {
         const response = await fetch(this.pathPrefix + path + '?' + paramQuery.toString(), {
             method: 'GET',
             headers: {
-                ...this.authorization()
-            }
+                ...this.authorization(),
+                ...(header || {})
+            },
+            signal: option?.signal || null
         });
         return this.responseJson(response);
     }
@@ -51,15 +128,18 @@ class Fetch {
      * @param key 缓存Key.
      * @param callback 数据回执函数.
      * @param minute 缓存时间 (分钟).
+     * @param isCache 是否开启缓存.
      */
-    async cache(key, callback, minute) {
+    async cache(key, callback, minute, isCache) {
         const cacheKey = 'CACHE_' + key;
-        const cacheValue = localStorage.getItem(cacheKey);
-        if (cacheValue !== null) {
-            const result = JSON.parse(cacheValue);
-            const { expireTime } = result;
-            if (expireTime !== undefined && expireTime >= new Date().getTime()) {
-                return result;
+        if (isCache) {
+            const cacheValue = localStorage.getItem(cacheKey);
+            if (cacheValue !== null) {
+                const result = JSON.parse(cacheValue);
+                const { expireTime } = result;
+                if (expireTime !== undefined && expireTime >= new Date().getTime()) {
+                    return result;
+                }
             }
         }
         const response = await callback();
@@ -73,7 +153,7 @@ class Fetch {
      * 默认授权方式.
      */
     authorization() {
-        const bearer = session_1.Session.getBearer();
+        const bearer = Session.getBearer();
         if (bearer === undefined || bearer === '') {
             return {};
         }
@@ -114,4 +194,3 @@ class Fetch {
         });
     }
 }
-exports.default = Fetch;

package/elementUtils.d.ts

@@ -1,4 +1,4 @@
-export declare class ElementUtils {
+export default class ElementUtils {
     /**
      * 选择文件本地文件.
      */

package/elementUtils.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ElementUtils = void 0;
-class ElementUtils {
+export default class ElementUtils {
     /**
      * 选择文件本地文件.
      */
@@ -32,4 +29,3 @@ class ElementUtils {
         document.body.removeChild(link);
     }
 }
-exports.ElementUtils = ElementUtils;

package/package.json

@@ -1,24 +1,24 @@
-{
-  "name": "beer-network",
-  "private": false,
-  "version": "1.1.1-alpha.1",
-  "type": "module",
-  "scripts": {
-    "publish": "cd dist && npm publish && cd -"
-  },
-  "dependencies": {
-  },
-  "devDependencies": {
-    "typescript": "^5.0.2",
-    "@babel/eslint-parser": "^7.22.15",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "eslint": "^8.45.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-ali": "^14.0.2",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.3"
-  }
-}
+{
+  "name": "beer-network",
+  "private": false,
+  "version": "1.1.1-alpha.10",
+  "type": "module",
+  "scripts": {
+    "pub-w": "tsc && copy package.json .\\dist\\package.json && npm publish ./dist"
+  },
+  "dependencies": {
+  },
+  "devDependencies": {
+    "typescript": "^5.0.2",
+    "@babel/eslint-parser": "^7.22.15",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
+    "eslint": "^8.45.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-ali": "^14.0.2",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.3"
+  }
+}

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,12 +6,12 @@ class Session {
      * <li>window.accessToken 设置身份令牌, 直接返回.</li>
      */
     static getBearer() {
-        if (window.accessToken != undefined && window.accessToken !== '') {
+        if (window.accessToken !== undefined && window.accessToken !== '') {
             return window.accessToken;
         }
         const key = window.sessionKey || 'login_user';
-        const loginUser = JSON.parse(localStorage.getItem(key) || '{}');
-        if (window.accessTokenKey != undefined && window.accessTokenKey !== '') {
+        const loginUser = JSON.parse(localStorage.getItem(key) || sessionStorage.getItem(key) || '{}');
+        if (window.accessTokenKey !== undefined && window.accessTokenKey !== '') {
             return loginUser[window.accessTokenKey];
         }
         return loginUser.accessToken || loginUser.token || undefined;
@@ -37,4 +34,3 @@ class Session {
         }
     }
 }
-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);
+    }
+}