oipage 1.7.0 → 1.8.0-alpha.1

package/web/XMLHttpRequest/index.js

@@ -1,65 +1,65 @@
 /*!
-* XMLHttpRequest of OIPage v1.7.0
+* XMLHttpRequest of OIPage v1.8.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-export function XHRIntercept(callbackFactory) {
-
-    // 原生的请求方法
-    var { open, send } = window.XMLHttpRequest.prototype;
-
-    window.XMLHttpRequest.prototype.open = function (method, url) {
-        this.callback = callbackFactory();
-
-        // 响应
-        let { ontimeout, onerror, onloadend } = this;
-
-        this.onloadend = function () {
-            if (onloadend) { onloadend.apply(this, arguments); }
-
-
-            if (this.readyState == 4) {
-                let response = "";
-                try { response = JSON.parse(this.response); } catch (e) { response = this.response; }
-
-                this.callback("end", {
-                    url: this.responseURL,
-                    status: this.status,
-                    statusText: this.statusText,
-                    response: response,
-                    responseText: this.responseText
-                });
-            }
-        };
-
-        this.ontimeout = function () {
-            if (ontimeout) { ontimeout.apply(this, arguments); }
-            this.callback("timeout", {});
-        };
-
-        this.onerror = function () {
-            if (onerror) { onerror.apply(this, arguments); }
-            this.callback("error", {});
-        };
-
-        open.apply(this, arguments);
-        this.callback("open", {
-            method: method,
-            url: url
-        });
-    };
-
-    // 拦截发送
-    window.XMLHttpRequest.prototype.send = function (data) {
-        try {
-            send.apply(this, arguments);
-            this.callback("send", {
-                data: data
-            });
-        } catch (error) {
-            this.callback("send@error", {
-                error: error
-            });
-        }
-    }
+export function XHRIntercept(callbackFactory) {
+
+    // 原生的请求方法
+    var { open, send } = window.XMLHttpRequest.prototype;
+
+    window.XMLHttpRequest.prototype.open = function (method, url) {
+        this.callback = callbackFactory();
+
+        // 响应
+        let { ontimeout, onerror, onloadend } = this;
+
+        this.onloadend = function () {
+            if (onloadend) { onloadend.apply(this, arguments); }
+
+
+            if (this.readyState == 4) {
+                let response = "";
+                try { response = JSON.parse(this.response); } catch (e) { response = this.response; }
+
+                this.callback("end", {
+                    url: this.responseURL,
+                    status: this.status,
+                    statusText: this.statusText,
+                    response: response,
+                    responseText: this.responseText
+                });
+            }
+        };
+
+        this.ontimeout = function () {
+            if (ontimeout) { ontimeout.apply(this, arguments); }
+            this.callback("timeout", {});
+        };
+
+        this.onerror = function () {
+            if (onerror) { onerror.apply(this, arguments); }
+            this.callback("error", {});
+        };
+
+        open.apply(this, arguments);
+        this.callback("open", {
+            method: method,
+            url: url
+        });
+    };
+
+    // 拦截发送
+    window.XMLHttpRequest.prototype.send = function (data) {
+        try {
+            send.apply(this, arguments);
+            this.callback("send", {
+                data: data
+            });
+        } catch (error) {
+            this.callback("send@error", {
+                error: error
+            });
+        }
+    }
 }

package/web/animation/index.d.ts

@@ -1,20 +1,20 @@
-interface animationResult {
-
-    /**
-     * 一个函数，调用该函数，可以提前结束动画
-     */
-    stop(): void
-}
-
-interface animationFun {
-    (deep: number): void
-}
-
-/**
- * 轮询动画
- */
-export interface animationType {
-    (doback: animationFun, duration?: number, callback?: animationFun): animationResult
-}
-
+interface animationResult {
+
+    /**
+     * 一个函数，调用该函数，可以提前结束动画
+     */
+    stop(): void
+}
+
+interface animationFun {
+    (deep: number): void
+}
+
+/**
+ * 轮询动画
+ */
+export interface animationType {
+    (doback: animationFun, duration?: number, callback?: animationFun): animationResult
+}
+
 export let animation: animationType

package/web/animation/index.js

@@ -1,117 +1,125 @@
 /*!
-* animation of OIPage v1.7.0
+* animation of OIPage v1.8.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-//当前正在运动的动画的tick函数堆栈
-var $timers = [];
-//唯一定时器的定时间隔
-var $interval = 13;
-//定时器ID
-var $timerId;
-
-/**
- * 动画轮播
- * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
- * @param {number} duration 动画时长，可选
- * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
- *
- * @returns {object} 返回一个对象，包含一个stop方法，用于在动画结束前结束动画
- */
-export function animation(doback, duration, callback) {
-    if (arguments.length < 2) duration = 400;
-    if (arguments.length < 3) callback = function () { };
-
-    var clock = {
-        //把tick函数推入堆栈
-        "timer": function (tick, duration, callback) {
-            if (!tick) {
-                throw new Error('Tick is required!');
-            }
-            var id = new Date().valueOf() + "_" + (Math.random() * 1000).toFixed(0);
-            $timers.push({
-                "id": id,
-                "createTime": new Date(),
-                "tick": tick,
-                "duration": duration,
-                "callback": callback
-            });
-            clock.start();
-            return id;
-        },
-
-        //开启唯一的定时器timerId
-        "start": function () {
-            if (!$timerId) {
-                if (!globalThis.requestAnimationFrame) {
-                    $timerId = setInterval(clock.tick, $interval);
-                } else {
-                    $timerId = globalThis.requestAnimationFrame(function step() {
-                        clock.tick();
-                        if ($timerId) $timerId = globalThis.requestAnimationFrame(step);
-                    });
-                }
-            }
-        },
-
-        //被定时器调用，遍历timers堆栈
-        "tick": function () {
-            var createTime, flag, tick, callback, timer, duration, passTime, timers = $timers;
-
-            $timers = [];
-            $timers.length = 0;
-
-            for (flag = 0; flag < timers.length; flag++) {
-                //初始化数据
-                timer = timers[flag];
-                createTime = timer.createTime;
-                tick = timer.tick;
-                duration = timer.duration;
-                callback = timer.callback;
-
-                //执行
-                passTime = (+new Date().valueOf() - createTime.valueOf()) / duration;
-                passTime = passTime > 1 ? 1 : passTime;
-                tick(passTime);
-                if (passTime < 1 && timer.id) {
-                    //动画没有结束再添加
-                    $timers.push(timer);
-                } else {
-                    callback(passTime);
-                }
-            }
-            if ($timers.length <= 0) {
-                clock.stop();
-            }
-        },
-
-        //停止定时器，重置timerId=null
-        "stop": function () {
-            if ($timerId) {
-                if (!globalThis.requestAnimationFrame) clearInterval($timerId);
-                else globalThis.cancelAnimationFrame($timerId);
-                $timerId = null;
-            }
-        }
-    };
-
-    var id = clock.timer(function (deep) {
-        //其中deep为0-1，表示改变的程度
-        doback(deep);
-    }, duration, callback);
-
-    return {
-        // 一个函数
-        // 用于在动画结束前结束动画
-        stop: function () {
-            var i;
-            for (i in $timers) {
-                if ($timers[i].id == id) {
-                    $timers[i].id = void 0;
-                    return;
-                }
-            }
-        }
-    };
-
+//当前正在运动的动画的tick函数堆栈
+var $timers = [];
+//唯一定时器的定时间隔
+var $interval = 13;
+//定时器ID
+var $timerId;
+
+/**
+ * 动画轮播
+ * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
+ * @param {number} duration 动画时长，可选
+ * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
+ *
+ * @returns {object} 返回一个对象，包含一个stop方法，用于在动画结束前结束动画
+ */
+export function animation(doback, duration, callback) {
+    if (arguments.length < 2) duration = 400;
+    if (arguments.length < 3) callback = function () { };
+
+    var clock = {
+        //把tick函数推入堆栈
+        "timer": function (tick, duration, callback) {
+            if (!tick) {
+                throw new Error('Tick is required!');
+            }
+            var id = new Date().valueOf() + "_" + (Math.random() * 1000).toFixed(0);
+            $timers.push({
+                "id": id,
+                "createTime": new Date(),
+                "tick": tick,
+                "duration": duration,
+                "callback": callback
+            });
+            clock.start();
+            return id;
+        },
+
+        //开启唯一的定时器timerId
+        "start": function () {
+            if (!$timerId) {
+                try {
+                    if (globalThis && globalThis.requestAnimationFrame) {
+                        $timerId = globalThis.requestAnimationFrame(function step() {
+                            clock.tick();
+                            if ($timerId) $timerId = globalThis.requestAnimationFrame(step);
+                        });
+                    } else {
+                        $timerId = setInterval(clock.tick, $interval);
+                    }
+                } catch (e) {
+                    $timerId = setInterval(clock.tick, $interval);
+                }
+            }
+        },
+
+        //被定时器调用，遍历timers堆栈
+        "tick": function () {
+            var createTime, flag, tick, callback, timer, duration, passTime, timers = $timers;
+
+            $timers = [];
+            $timers.length = 0;
+
+            for (flag = 0; flag < timers.length; flag++) {
+                //初始化数据
+                timer = timers[flag];
+                createTime = timer.createTime;
+                tick = timer.tick;
+                duration = timer.duration;
+                callback = timer.callback;
+
+                //执行
+                passTime = (+new Date().valueOf() - createTime.valueOf()) / duration;
+                passTime = passTime > 1 ? 1 : passTime;
+                tick(passTime);
+                if (passTime < 1 && timer.id) {
+                    //动画没有结束再添加
+                    $timers.push(timer);
+                } else {
+                    callback(passTime);
+                }
+            }
+            if ($timers.length <= 0) {
+                clock.stop();
+            }
+        },
+
+        //停止定时器，重置timerId=null
+        "stop": function () {
+            if ($timerId) {
+                try {
+                    if (globalThis && globalThis.requestAnimationFrame) globalThis.cancelAnimationFrame($timerId);
+                    else clearInterval($timerId);
+                } catch (e) {
+                    clearInterval($timerId);
+                }
+                $timerId = null;
+            }
+        }
+    };
+
+    var id = clock.timer(function (deep) {
+        //其中deep为0-1，表示改变的程度
+        doback(deep);
+    }, duration, callback);
+
+    return {
+        // 一个函数
+        // 用于在动画结束前结束动画
+        stop: function () {
+            var i;
+            for (i in $timers) {
+                if ($timers[i].id == id) {
+                    $timers[i].id = void 0;
+                    return;
+                }
+            }
+        }
+    };
+
 }

package/web/format/index.d.ts

@@ -1,29 +1,29 @@
-/**
- * 数字格式化
- */
-export interface numberFormatType {
-    (input: number | string): string
-}
-
-export let numberFormat: numberFormatType
-
-/**
- * 日期格式化
- */
-export interface dateFormatType {
-    (input?: string | Date, option?: {
-
-        /**
-         * 输入格式
-         */
-        inputFormat?: string
-
-        /**
-         * 输出格式
-         */
-        format?: string
-    }): string
-}
-
-export let dateFormat: dateFormatType
-
+/**
+ * 数字格式化
+ */
+export interface numberFormatType {
+    (input: number | string): string
+}
+
+export let numberFormat: numberFormatType
+
+/**
+ * 日期格式化
+ */
+export interface dateFormatType {
+    (input?: string | Date, option?: {
+
+        /**
+         * 输入格式
+         */
+        inputFormat?: string
+
+        /**
+         * 输出格式
+         */
+        format?: string
+    }): string
+}
+
+export let dateFormat: dateFormatType
+