@ajaxjs/util 1.1.1 → 1.1.2

package/{dist/util/utils.js → src/core/utils.ts}

@@ -1,27 +1,28 @@
-"use strict";
 /**
  * 通用工具类
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyToClipboard = exports.throttle = exports.parallel = exports.dateFormat2 = exports.dateFormat = exports.isDev = exports.isDebug = void 0;
-const env = process.env.NODE_ENV;
+
+
+
 /**
  * 是否调试模式中
- *
+ * 
  * 打包成组件之后不能用
- *
- * @returns
+ * 
+ * @returns 
  */
-function isDebug() {
-    return env === 'development';
+export function isDebug(): boolean {
+    // @ts-ignore
+    return process.env.NODE_ENV === 'development';
 }
-exports.isDebug = isDebug;
-function isDev() {
-    let currentHostname = window.location.hostname;
+
+export function isDev(): boolean {
+    let currentHostname: string = window.location.hostname;
+
     // 判断主机名是否是内网地址
     return (currentHostname.startsWith('192.168.') || currentHostname.startsWith('10.') || currentHostname === 'localhost');
 }
-exports.isDev = isDev;
+
 /**
 * 日期格式化。详见博客文章：http://blog.csdn.net/zhangxin09/archive/2011/01/01/6111294.aspx
 * e.g: new Date().format("yyyy-MM-dd hh:mm:ss")
@@ -29,21 +30,23 @@ exports.isDev = isDev;
 * @param 	{String} format
 * @return	{String}
 */
-function dateFormat(format) {
-    let $1, o = {
-        "M+": this.getMonth() + 1,
-        "d+": this.getDate(),
-        "h+": this.getHours(),
-        "m+": this.getMinutes(),
-        "s+": this.getSeconds(),
+export function dateFormat(this: Date, format: string): string {
+    let $1, o: any = {
+        "M+": this.getMonth() + 1,		// 月份，从0开始算
+        "d+": this.getDate(),   		// 日期
+        "h+": this.getHours(),   		// 小时
+        "m+": this.getMinutes(), 		// 分钟
+        "s+": this.getSeconds(), 		// 秒钟
         // 季度 quarter
         "q+": Math.floor((this.getMonth() + 3) / 3),
-        "S": this.getMilliseconds() // 千秒
+        "S": this.getMilliseconds()	// 千秒
     };
-    if (/(y+)/.test(format)) {
+
+    if (/(y+)/.test(format))
+        // @ts-ignore
         $1 = RegExp.$1, format = format.replace($1, String(this.getFullYear()).substr(4 - $1));
-    }
-    let key, value;
+
+    let key: string, value: string;
     for (key in o) { // 如果没有指定该参数，则子字符串将延续到 stringvar 的最后。
         if (new RegExp("(" + key + ")").test(format)) {
             $1 = RegExp.$1,
@@ -52,9 +55,10 @@ function dateFormat(format) {
                 format = format.replace($1, value);
         }
     }
+
     return format;
 }
-exports.dateFormat = dateFormat;
+
 /**
  * 日期格式化
  * @author meizz
@@ -62,113 +66,114 @@ exports.dateFormat = dateFormat;
  * @param fmt   格式模板
  * @returns 格式化后的字符串
  */
-function dateFormat2(date, fmt) {
-    let o = {
-        "M+": date.getMonth() + 1,
-        "d+": date.getDate(),
-        "h+": date.getHours(),
-        "m+": date.getMinutes(),
-        "s+": date.getSeconds(),
-        "q+": Math.floor((date.getMonth() + 3) / 3),
-        "S": date.getMilliseconds() // 毫秒   
+export function dateFormat2(date: Date, fmt: string): string {
+    let o: { [key: string]: number } = {
+        "M+": date.getMonth() + 1,                  // 月份   
+        "d+": date.getDate(),                       // 日   
+        "h+": date.getHours(),                      // 小时   
+        "m+": date.getMinutes(),                    // 分   
+        "s+": date.getSeconds(),                    // 秒   
+        "q+": Math.floor((date.getMonth() + 3) / 3),// 季度   
+        "S": date.getMilliseconds()                 // 毫秒   
     };
+
     if (/(y+)/.test(fmt))
         fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+
     for (var k in o)
         if (new RegExp("(" + k + ")").test(fmt)) {
             let obj = (RegExp.$1.length == 1) ? o[k] : ("00" + o[k]).substr(("" + o[k]).length);
             // @ts-ignore
             fmt = fmt.replace(RegExp.$1, obj);
         }
+
     return fmt;
 }
-exports.dateFormat2 = dateFormat2;
+
 /**
- * 并行和串行任务
- *
+ * 并行和串行任务 
+ * 
  * @author https://segmentfault.com/a/1190000013265925
- * @param arr
- * @param finnaly
+ * @param arr 
+ * @param finnaly 
  */
-function parallel(arr, _finally) {
-    let fn, index = 0;
+export function parallel(arr: [], _finally: Function) {
+    let fn: Function, index: number = 0;
     // @ts-ignore
     let statusArr = Array(arr.length).fill().map(() => ({ isActive: false, data: null }));
+
     let isFinished = function () {
-        return statusArr.every((item) => item.isActive === true);
-    };
-    let resolve = function (index) {
-        return function (data) {
+        return statusArr.every((item: any) => item.isActive === true);
+    }
+
+    let resolve = function (index: number): Function {
+        return function (data: any) {
             statusArr[index].data = data;
             statusArr[index].isActive = true;
             let isFinish = isFinished();
+
             if (isFinish) {
-                let datas = statusArr.map((item) => item.data);
+                let datas = statusArr.map((item: any) => item.data);
+
                 _finally(datas);
             }
         };
     };
+
     // @ts-ignore
     while ((fn = arr.shift())) {
-        fn(resolve(index)); // 给 resolve 函数追加参数,可以使用 bind 函数实现,这里使用了柯里化
+        fn(resolve(index));// 给 resolve 函数追加参数,可以使用 bind 函数实现,这里使用了柯里化
         index++;
     }
 }
-exports.parallel = parallel;
+
 /**
  * 函数节流
- *
+ * 
  * @author https://www.cnblogs.com/moqiutao/p/6875955.html
- * @param fn
- * @param delay
- * @param mustRunDelay
+ * @param fn 
+ * @param delay 
+ * @param mustRunDelay 
  */
-function throttle(fn, delay, mustRunDelay) {
-    var timer, t_start;
+export function throttle(fn: Function, delay: number, mustRunDelay: number): Function {
+    var timer: number, t_start: number;
+
     return function () {
         var t_curr = +new Date();
         window.clearTimeout(timer);
+
         if (!t_start)
             t_start = t_curr;
+
         if (t_curr - t_start >= mustRunDelay) {
             // @ts-ignore
             fn.apply(this, arguments);
             t_start = t_curr;
-        }
-        else {
+        } else {
             var args = arguments;
             // @ts-ignore
             timer = window.setTimeout(() => fn.apply(this, args), delay);
         }
     };
 }
-exports.throttle = throttle;
+
 /**
 * 复制文字到剪切板
-*
-* @param {*} text
+* 
+* @param {string} text 
 */
-function copyToClipboard(text) {
-    if (navigator.clipboard) {
-        // clipboard api 复制
-        navigator.clipboard.writeText(text);
-    }
+export function copyToClipboard(text: string): void {
+    if (navigator.clipboard)
+        navigator.clipboard.writeText(text);      // clipboard api 复制
     else {
         let textarea = document.createElement('textarea');
-        document.body.appendChild(textarea);
-        // 隐藏此输入框
+        document.body.appendChild(textarea);        // 隐藏此输入框
         textarea.style.position = 'fixed';
         textarea.style.clip = 'rect(0 0 0 0)';
         textarea.style.top = '10px';
-        // 赋值
-        textarea.value = text;
-        // 选中
-        textarea.select();
-        // 复制
-        document.execCommand('copy', true);
-        // 移除输入框
-        document.body.removeChild(textarea);
+        textarea.value = text; // 赋值
+        textarea.select();     // 选中
+        document.execCommand('copy', true);        // 复制
+        document.body.removeChild(textarea);        // 移除输入框
     }
-}
-exports.copyToClipboard = copyToClipboard;
-//# sourceMappingURL=utils.js.map
+}

package/src/core/xhr-config.ts

@@ -0,0 +1,25 @@
+/**
+ * XHR 请求配置
+ */
+export interface XhrConfig {
+    /**
+     * 请求头里面的 Content-Type 字段
+     */
+    contentType?: string;
+
+    /**
+     * XHR 响应结果的类型
+     */
+    parseContentType?: 'text' | 'xml' | 'json';
+
+    /**
+     * 超时时间，单位是毫秒
+     * 设为 0 适合不控制超时
+     */
+    timeout?: number;
+
+    /**
+     * 是否跨域
+     */
+    withCredentials?: boolean;
+}

package/{dist/util/xhr.js → src/core/xhr.ts}

@@ -1,197 +1,229 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageList = exports.getQuery = exports.toParams = exports.xhr_put = exports.xhr_post = exports.xhr_del = exports.xhr_get = exports.xhr_post_upload = exports.setBaseHeadParams = void 0;
+import { XhrConfig } from './xhr-config';
+
 /**
  * 默认的请求配置
  */
-const DEFAULT_XHR_CFG = {
+const DEFAULT_XHR_CFG: XhrConfig = {
     timeout: 5000,
     withCredentials: false,
     parseContentType: 'json'
 };
+
+/**
+ * 处理响应的回调函数
+ */
+type XhrCallback = (json: {}, text: string) => void;
+
 /**
  * 全局请求的 head 参数
  */
-let BASE_HEAD_PARAMS = null;
+let BASE_HEAD_PARAMS: { [key: string]: any } | null = null;
+
 /**
  * 设置全局请求的 head 参数
- *
- * @param param
+ * 
+ * @param param 
  */
-function setBaseHeadParams(params) {
+export function setBaseHeadParams(params: any): void {
     if (BASE_HEAD_PARAMS === null)
         BASE_HEAD_PARAMS = {};
+
     Object.assign(BASE_HEAD_PARAMS, params);
 }
-exports.setBaseHeadParams = setBaseHeadParams;
+
 /**
- *
- * @param getOrDel
- * @param url
- * @param cb
- * @param params
- * @param cfg
+ * 
+ * @param getOrDel 
+ * @param url 
+ * @param cb 
+ * @param params 
+ * @param cfg 
  */
-function getOrDel(getOrDel, url, cb, params, cfg = DEFAULT_XHR_CFG) {
-    let xhr = initXhr(cfg);
+function getOrDel(getOrDel: 'get' | 'delete', url: string, cb: XhrCallback, params?: {}, cfg: XhrConfig = DEFAULT_XHR_CFG): void {
+    let xhr: XMLHttpRequest = initXhr(cfg);
+
     if (params != null) {
         if (url.indexOf('?') != -1)
             url += '&' + toParams(params);
         else
             url += '?' + toParams(params);
     }
+
     xhr.open(getOrDel.toUpperCase(), url, true);
     xhr.onreadystatechange = function () {
         responseHandle(this, cb, cfg);
-    };
-    if (BASE_HEAD_PARAMS) // 设置自定义请求头
+    }
+
+    if (BASE_HEAD_PARAMS)// 设置自定义请求头
         for (let key in BASE_HEAD_PARAMS)
             xhr.setRequestHeader(key, BASE_HEAD_PARAMS[key]);
+
     xhr.send();
 }
+
 /**
- *
- * @param method
- * @param url
- * @param cb
- * @param params
- * @param cfg
+ * 
+ * @param method 
+ * @param url 
+ * @param cb 
+ * @param params 
+ * @param cfg 
  */
-function postOrPut(method, url, cb, params, cfg = DEFAULT_XHR_CFG) {
-    let xhr = initXhr(cfg);
+function postOrPut(method: 'post' | 'put', url: string, cb: XhrCallback, params: string | {}, cfg: XhrConfig = DEFAULT_XHR_CFG): void {
+    let xhr: XMLHttpRequest = initXhr(cfg);
     xhr.open(method, url, true);
     xhr.onreadystatechange = function () {
         responseHandle(this, cb, cfg);
-    };
+    }
+
     if (BASE_HEAD_PARAMS) // 设置自定义请求头
         for (let key in BASE_HEAD_PARAMS)
             xhr.setRequestHeader(key, BASE_HEAD_PARAMS[key]);
+
     // 此方法必须在 open() 方法和 send() 之间调用
+
     if (!cfg.contentType) // 如未设置，默认为表单请求
         xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
     else
         xhr.setRequestHeader("Content-Type", cfg.contentType);
-    let _params = typeof params != 'string' ? toParams(params) : params;
+
+
+    let _params: string = typeof params != 'string' ? toParams(params) : <string>params;
+
     if (_params)
         xhr.send(_params);
     else
         xhr.send();
 }
+
 /**
- *
- * @param url
- * @param cb
- * @param params
- * @param cfg
+ * 
+ * @param url 
+ * @param cb 
+ * @param params 
+ * @param cfg 
  */
-function xhr_post_upload(url, cb, params, cfg = DEFAULT_XHR_CFG) {
-    let xhr = initXhr(cfg);
+export function xhr_post_upload(url: string, cb: XhrCallback, params: Document | XMLHttpRequestBodyInit, cfg: XhrConfig = DEFAULT_XHR_CFG): void {
+    let xhr: XMLHttpRequest = initXhr(cfg);
     xhr.open('post', url, true);
     xhr.onreadystatechange = function () {
         responseHandle(this, cb, cfg);
-    };
+    }
+
     if (BASE_HEAD_PARAMS) // 设置自定义请求头
         for (let key in BASE_HEAD_PARAMS)
             xhr.setRequestHeader(key, BASE_HEAD_PARAMS[key]);
+
     // 什么 Content-Type 都不设置
+
     xhr.send(params);
 }
-exports.xhr_post_upload = xhr_post_upload;
+
 /**
  * XHR GET 请求
- *
+ * 
  * @param url       请求地址
  * @param cb        回调函数 @example (json: {}, text: string) => void;
  * @param params    参数，必填，如无填空字符串 ""；参数类型是json；参数值会进行 URL 编码，最后附加到 QueryString 中
  * @param cfg       配置，可选的
  */
-function xhr_get(url, cb, params, cfg = DEFAULT_XHR_CFG) {
+export function xhr_get(url: string, cb: XhrCallback, params?: {}, cfg: XhrConfig = DEFAULT_XHR_CFG): void {
     getOrDel('get', url, cb, params, cfg);
 }
-exports.xhr_get = xhr_get;
+
 /**
  * XHR DELETE 请求
- *
+ * 
  * @param url       请求地址
  * @param cb        回调函数 @example (json: {}, text: string) => void;
  * @param params    参数，必填，如无填空字符串 ""；参数类型是json；参数值会进行 URL 编码，最后附加到 QueryString 中
  * @param cfg       配置，可选的
  */
-function xhr_del(url, cb, params, cfg = DEFAULT_XHR_CFG) {
+export function xhr_del(url: string, cb: XhrCallback, params?: {}, cfg: XhrConfig = DEFAULT_XHR_CFG): void {
     getOrDel('delete', url, cb, params, cfg);
 }
-exports.xhr_del = xhr_del;
+
 /**
  * XHR POST 请求
- *
+ * 
  * @param url       请求地址
  * @param cb        回调函数 @example (json: {}, text: string) => void;
  * @param params    参数，必填，如无填空字符串 ""；参数类型可以是字符串或 json；参数值会进行 URL 编码
  * @param cfg       配置，可选的
  */
-function xhr_post(url, cb, params, cfg = DEFAULT_XHR_CFG) {
+export function xhr_post(url: string, cb: XhrCallback, params: string | {}, cfg: XhrConfig = DEFAULT_XHR_CFG): void {
     postOrPut('post', url, cb, params, cfg);
 }
-exports.xhr_post = xhr_post;
+
 /**
  * XHR PUT 请求
- *
+ * 
  * @param url       请求地址
  * @param cb        回调函数 @example (json: {}, text: string) => void;
  * @param params    参数，必填，如无填空字符串 ""；参数类型可以是字符串或 json；参数值会进行 URL 编码
  * @param cfg       配置，可选的
  */
-function xhr_put(url, cb, params, cfg = DEFAULT_XHR_CFG) {
+export function xhr_put(url: string, cb: XhrCallback, params: string | {}, cfg: XhrConfig = DEFAULT_XHR_CFG): void {
     postOrPut('put', url, cb, params, cfg);
 }
-exports.xhr_put = xhr_put;
+
 /**
  * 初始化 XHR
- *
- * @param cfg
- * @returns
+ * 
+ * @param cfg 
+ * @returns 
  */
-function initXhr(cfg) {
-    let xhr = new XMLHttpRequest();
+function initXhr(cfg: XhrConfig): XMLHttpRequest {
+    let xhr: XMLHttpRequest = new XMLHttpRequest();
+
     if (cfg && cfg.timeout) {
         xhr.timeout = cfg.timeout;
-        xhr.ontimeout = (e) => console.error('系统异常，XHR 连接服务超时');
+        xhr.ontimeout = (e: ProgressEvent<EventTarget>) => console.error('系统异常，XHR 连接服务超时');
     }
+
     if (cfg && cfg.withCredentials)
         xhr.withCredentials = true;
+
     return xhr;
 }
+
 /**
- * 错误处理
- *
- * @param xhr
+ * 错误处理 
+ * 
+ * @param xhr 
  */
-function errHandle(xhr) {
-    let msg;
+function errHandle(xhr: XMLHttpRequest): void {
+    let msg: string;
+
     if (xhr.status <= 400)
         msg = '请求参数错误或者权限不足。';
     else if (xhr.status <= 500)
         msg = '服务端异常。';
     else
         msg = `未知异常，HTTP code:${xhr.status}。`;
+
     if (!xhr.responseText)
         msg += " 服务端返回空的字符串！";
+
     console.error(msg, xhr.responseText);
 }
+
 /**
  * 响应处理
- *
- * @param xhr
- * @param cb
- * @param cfg
+ * 
+ * @param xhr 
+ * @param cb 
+ * @param cfg 
  */
-function responseHandle(xhr, cb, cfg) {
+function responseHandle(xhr: XMLHttpRequest, cb: XhrCallback, cfg: XhrConfig): void {
     if (xhr.readyState == 4) {
         if ((xhr.status >= 200 && xhr.status < 300) || xhr.status == 304) {
-            let text = xhr.responseText;
-            let json;
+            let text: string = xhr.responseText;
+            let json: any;
+
             if (!text)
                 console.warn('服务端没有返回任何字符串');
+
             switch (cfg.parseContentType) {
                 case 'text':
                     break;
@@ -202,61 +234,63 @@ function responseHandle(xhr, cb, cfg) {
                 default:
                     try {
                         json = JSON.parse(text);
-                    }
-                    catch (e) {
+                    } catch (e) {
                         console.error('解析 JSON 时候发生错误，非法 JSON');
                         console.warn(e);
                     }
             }
+
             cb && cb(json, text);
-        }
-        else
-            errHandle(xhr);
+        } else errHandle(xhr);
     }
 }
+
 /**
  * 对象转换为 URL 参数列表，用 & 分隔
- *
- * @param {Object} param JSON 对象
+ * 
+ * @param {Object} param JSON 对象 
  * @returns URL 参数列表
  */
-function toParams(param) {
-    let result = "";
+export function toParams(param: any): string {
+    let result: string = "";
+
     for (let name in param) {
         if (typeof param[name] != "function")
             result += "&" + name + "=" + encodeURIComponent(param[name]);
     }
+
     return result.substring(1);
 }
-exports.toParams = toParams;
+
 /**
  * 获取 QueryString 的某个参数
- *
- * @param val
- * @returns
+ * 
+ * @param val 
+ * @returns 
 */
-function getQuery(val) {
-    const w = location.hash.indexOf('?');
-    const query = location.hash.substring(w + 1);
-    let vars = query.split('&');
+export function getQuery(val: string): string {
+    const w: number = location.hash.indexOf('?');
+    const query: string = location.hash.substring(w + 1);
+    let vars: string[] = query.split('&');
+
     for (let i = 0; i < vars.length; i++) {
         const pair = vars[i].split('=');
+
         if (pair[0] == val)
             return pair[1];
     }
+
     return '';
 }
-exports.getQuery = getQuery;
-function getPageList(self, listArray, callback) {
-    return (j) => {
+
+export function getPageList(self: any, listArray: any, callback?: Function): XhrCallback {
+    return (j: any) => {
         if (j.status) {
             listArray.total = j.total;
             listArray.data = j.data;
+
             callback && callback();
-        }
-        else
+        } else
             self.$Message.warning(j.message || '获取数据失败');
-    };
-}
-exports.getPageList = getPageList;
-//# sourceMappingURL=xhr.js.map
+    }
+}

package/src/index.ts

@@ -0,0 +1,6 @@
+import * as Cookies from './core/cookies';
+import * as Dom from './core/dom';
+import * as Utils from './core/utils';
+import * as Xhr from './core/xhr';
+
+export { Cookies, Dom, Utils, Xhr };